Merge branch 'next' into v4.x

2026-10-18 08:14:35 +00:00 · 2025-09-16 14:13:50 +03:00
commit ea30c4798a
@@ -99,12 +99,8 @@ class StartClickhouse
        $docker_compose = generateCustomDockerRunOptionsForDatabases($docker_run_options, $docker_compose, $container_name, $this->database->destination->network);

        $docker_compose = Yaml::dump($docker_compose, 10);
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $docker_compose,
-                'destination' => "$this->configuration_dir/docker-compose.yml",
-            ],
-        ];
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
        $readme = generate_readme_file($this->database->name, now());
        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
        $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -52,9 +52,8 @@ class StartDatabaseProxy
        }

        $configuration_dir = database_proxy_dir($database->uuid);
-        $volume_configuration_dir = $configuration_dir;
        if (isDev()) {
-            $volume_configuration_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/databases/'.$database->uuid.'/proxy';
+            $configuration_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/databases/'.$database->uuid.'/proxy';
        }
        $nginxconf = <<<EOF
    user  nginx;
@@ -87,7 +86,7 @@ class StartDatabaseProxy
                    'volumes' => [
                        [
                            'type' => 'bind',
-                            'source' => "$volume_configuration_dir/nginx.conf",
+                            'source' => "$configuration_dir/nginx.conf",
                            'target' => '/etc/nginx/nginx.conf',
                        ],
                    ],
@@ -116,18 +115,8 @@ class StartDatabaseProxy
        instant_remote_process(["docker rm -f $proxyContainerName"], $server, false);
        instant_remote_process([
            "mkdir -p $configuration_dir",
-            [
-                'transfer_file' => [
-                    'content' => base64_decode($nginxconf_base64),
-                    'destination' => "$configuration_dir/nginx.conf",
-                ],
-            ],
-            [
-                'transfer_file' => [
-                    'content' => base64_decode($dockercompose_base64),
-                    'destination' => "$configuration_dir/docker-compose.yaml",
-                ],
-            ],
+            "echo '{$nginxconf_base64}' | base64 -d | tee $configuration_dir/nginx.conf > /dev/null",
+            "echo '{$dockercompose_base64}' | base64 -d | tee $configuration_dir/docker-compose.yaml > /dev/null",
            "docker compose --project-directory {$configuration_dir} pull",
            "docker compose --project-directory {$configuration_dir} up -d",
        ], $server);
@@ -183,12 +183,8 @@ class StartDragonfly
        $docker_compose = generateCustomDockerRunOptionsForDatabases($docker_run_options, $docker_compose, $container_name, $this->database->destination->network);

        $docker_compose = Yaml::dump($docker_compose, 10);
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $docker_compose,
-                'destination' => "$this->configuration_dir/docker-compose.yml",
-            ],
-        ];
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
        $readme = generate_readme_file($this->database->name, now());
        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
        $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -199,12 +199,8 @@ class StartKeydb
        $docker_run_options = convertDockerRunToCompose($this->database->custom_docker_run_options);
        $docker_compose = generateCustomDockerRunOptionsForDatabases($docker_run_options, $docker_compose, $container_name, $this->database->destination->network);
        $docker_compose = Yaml::dump($docker_compose, 10);
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $docker_compose,
-                'destination' => "$this->configuration_dir/docker-compose.yml",
-            ],
-        ];
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
        $readme = generate_readme_file($this->database->name, now());
        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
        $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -203,12 +203,8 @@ class StartMariadb
        }

        $docker_compose = Yaml::dump($docker_compose, 10);
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $docker_compose,
-                'destination' => "$this->configuration_dir/docker-compose.yml",
-            ],
-        ];
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
        $readme = generate_readme_file($this->database->name, now());
        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
        $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -288,11 +284,7 @@ class StartMariadb
        }
        $filename = 'custom-config.cnf';
        $content = $this->database->mariadb_conf;
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $content,
-                'destination' => "$this->configuration_dir/{$filename}",
-            ],
-        ];
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null";
    }
 }
@@ -28,6 +28,9 @@ class StartMongodb

        $container_name = $this->database->uuid;
        $this->configuration_dir = database_configuration_dir().'/'.$container_name;
+        if (isDev()) {
+            $this->configuration_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/databases/'.$container_name;
+        }

        $this->commands = [
            "echo 'Starting database.'",
@@ -251,12 +254,8 @@ class StartMongodb
        }

        $docker_compose = Yaml::dump($docker_compose, 10);
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $docker_compose,
-                'destination' => "$this->configuration_dir/docker-compose.yml",
-            ],
-        ];
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
        $readme = generate_readme_file($this->database->name, now());
        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
        $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -333,22 +332,15 @@ class StartMongodb
        }
        $filename = 'mongod.conf';
        $content = $this->database->mongo_conf;
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $content,
-                'destination' => "$this->configuration_dir/{$filename}",
-            ],
-        ];
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null";
    }

    private function add_default_database()
    {
        $content = "db = db.getSiblingDB(\"{$this->database->mongo_initdb_database}\");db.createCollection('init_collection');db.createUser({user: \"{$this->database->mongo_initdb_root_username}\", pwd: \"{$this->database->mongo_initdb_root_password}\",roles: [{role:\"readWrite\",db:\"{$this->database->mongo_initdb_database}\"}]});";
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $content,
-                'destination' => "$this->configuration_dir/docker-entrypoint-initdb.d/01-default-database.js",
-            ],
-        ];
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d";
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/docker-entrypoint-initdb.d/01-default-database.js > /dev/null";
    }
 }
@@ -204,12 +204,8 @@ class StartMysql
        }

        $docker_compose = Yaml::dump($docker_compose, 10);
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $docker_compose,
-                'destination' => "$this->configuration_dir/docker-compose.yml",
-            ],
-        ];
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
        $readme = generate_readme_file($this->database->name, now());
        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
        $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -291,11 +287,7 @@ class StartMysql
        }
        $filename = 'custom-config.cnf';
        $content = $this->database->mysql_conf;
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $content,
-                'destination' => "$this->configuration_dir/{$filename}",
-            ],
-        ];
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null";
    }
 }
@@ -27,6 +27,9 @@ class StartPostgresql
        $this->database = $database;
        $container_name = $this->database->uuid;
        $this->configuration_dir = database_configuration_dir().'/'.$container_name;
+        if (isDev()) {
+            $this->configuration_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/databases/'.$container_name;
+        }

        $this->commands = [
            "echo 'Starting database.'",
@@ -214,12 +217,8 @@ class StartPostgresql
        }

        $docker_compose = Yaml::dump($docker_compose, 10);
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $docker_compose,
-                'destination' => "$this->configuration_dir/docker-compose.yml",
-            ],
-        ];
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
        $readme = generate_readme_file($this->database->name, now());
        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
        $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -305,12 +304,8 @@ class StartPostgresql
        foreach ($this->database->init_scripts as $init_script) {
            $filename = data_get($init_script, 'filename');
            $content = data_get($init_script, 'content');
-            $this->commands[] = [
-                'transfer_file' => [
-                    'content' => $content,
-                    'destination' => "$this->configuration_dir/docker-entrypoint-initdb.d/{$filename}",
-                ],
-            ];
+            $content_base64 = base64_encode($content);
+            $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/docker-entrypoint-initdb.d/{$filename} > /dev/null";
            $this->init_scripts[] = "$this->configuration_dir/docker-entrypoint-initdb.d/{$filename}";
        }
    }
@@ -332,11 +327,7 @@ class StartPostgresql
            $this->database->postgres_conf = $content;
            $this->database->save();
        }
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $content,
-                'destination' => $config_file_path,
-            ],
-        ];
+        $content_base64 = base64_encode($content);
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $config_file_path > /dev/null";
    }
 }
@@ -196,12 +196,8 @@ class StartRedis
        $docker_compose = generateCustomDockerRunOptionsForDatabases($docker_run_options, $docker_compose, $container_name, $this->database->destination->network);

        $docker_compose = Yaml::dump($docker_compose, 10);
-        $this->commands[] = [
-            'transfer_file' => [
-                'content' => $docker_compose,
-                'destination' => "$this->configuration_dir/docker-compose.yml",
-            ],
-        ];
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
        $readme = generate_readme_file($this->database->name, now());
        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
        $this->commands[] = "echo 'Pulling {$database->image} image.'";
@@ -26,6 +26,8 @@ class GetContainersStatus

    public $server;

+    protected ?Collection $applicationContainerStatuses;
+
    public function handle(Server $server, ?Collection $containers = null, ?Collection $containerReplicates = null)
    {
        $this->containers = $containers;
@@ -119,11 +121,16 @@ class GetContainersStatus
                    $application = $this->applications->where('id', $applicationId)->first();
                    if ($application) {
                        $foundApplications[] = $application->id;
-                        $statusFromDb = $application->status;
-                        if ($statusFromDb !== $containerStatus) {
-                            $application->update(['status' => $containerStatus]);
-                        } else {
-                            $application->update(['last_online_at' => now()]);
+                        // Store container status for aggregation
+                        if (! isset($this->applicationContainerStatuses)) {
+                            $this->applicationContainerStatuses = collect();
+                        }
+                        if (! $this->applicationContainerStatuses->has($applicationId)) {
+                            $this->applicationContainerStatuses->put($applicationId, collect());
+                        }
+                        $containerName = data_get($labels, 'com.docker.compose.service');
+                        if ($containerName) {
+                            $this->applicationContainerStatuses->get($applicationId)->put($containerName, $containerStatus);
                        }
                    } else {
                        // Notify user that this container should not be there.
@@ -320,6 +327,83 @@ class GetContainersStatus
            }
            // $this->server->team?->notify(new ContainerStopped($containerName, $this->server, $url));
        }
+
+        // Aggregate multi-container application statuses
+        if (isset($this->applicationContainerStatuses) && $this->applicationContainerStatuses->isNotEmpty()) {
+            foreach ($this->applicationContainerStatuses as $applicationId => $containerStatuses) {
+                $application = $this->applications->where('id', $applicationId)->first();
+                if (! $application) {
+                    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()]);
+                    }
+                }
+            }
+        }
+
        ServiceChecked::dispatch($this->server->team->id);
    }
+
+    private function aggregateApplicationStatus($application, Collection $containerStatuses): ?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
+            }
+        }
+
+        // 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 ($relevantStatuses->isEmpty()) {
+            return null;
+        }
+
+        // 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;
+                }
+            }
+        }
+
+        if ($hasRunning) {
+            return $hasUnhealthy ? 'running (unhealthy)' : 'running (healthy)';
+        }
+
+        // All containers are exited
+        return 'exited (unhealthy)';
+    }
 }
@@ -21,12 +21,7 @@ class SaveProxyConfiguration
        // Transfer the configuration file to the server
        instant_remote_process([
            "mkdir -p $proxy_path",
-            [
-                'transfer_file' => [
-                    'content' => base64_decode($docker_compose_yml_base64),
-                    'destination' => "$proxy_path/docker-compose.yml",
-                ],
-            ],
+            "echo '$docker_compose_yml_base64' | base64 -d | tee $proxy_path/docker-compose.yml > /dev/null",
        ], $server);
    }
 }
@@ -40,12 +40,7 @@ class ConfigureCloudflared
            $commands = collect([
                'mkdir -p /tmp/cloudflared',
                'cd /tmp/cloudflared',
-                [
-                    'transfer_file' => [
-                        'content' => base64_decode($docker_compose_yml_base64),
-                        'destination' => '/tmp/cloudflared/docker-compose.yml',
-                    ],
-                ],
+                "echo '$docker_compose_yml_base64' | base64 -d | tee docker-compose.yml > /dev/null",
                'echo Pulling latest Cloudflare Tunnel image.',
                'docker compose pull',
                'echo Stopping existing Cloudflare Tunnel container.',
@@ -14,7 +14,6 @@ class InstallDocker

    public function handle(Server $server)
    {
-        ray('install docker');
        $dockerVersion = config('constants.docker.minimum_required_version');
        $supported_os_type = $server->validateOS();
        if (! $supported_os_type) {
@@ -104,15 +103,8 @@ class InstallDocker
                "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh || curl https://get.docker.com | sh -s -- --version {$dockerVersion}",
                "echo 'Configuring Docker Engine (merging existing configuration with the required)...'",
                'test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json "/etc/docker/daemon.json.original-$(date +"%Y%m%d-%H%M%S")"',
-                [
-                    'transfer_file' => [
-                        'content' => base64_decode($config),
-                        'destination' => '/tmp/daemon.json.new',
-                    ],
-                ],
-                'test ! -s /etc/docker/daemon.json && cp /tmp/daemon.json.new /etc/docker/daemon.json',
-                'cp /tmp/daemon.json.new /etc/docker/daemon.json.coolify',
-                'rm -f /tmp/daemon.json.new',
+                "test ! -s /etc/docker/daemon.json && echo '{$config}' | base64 -d | tee /etc/docker/daemon.json > /dev/null",
+                "echo '{$config}' | base64 -d | tee /etc/docker/daemon.json.coolify > /dev/null",
                'jq . /etc/docker/daemon.json.coolify | tee /etc/docker/daemon.json.coolify.pretty > /dev/null',
                'mv /etc/docker/daemon.json.coolify.pretty /etc/docker/daemon.json.coolify',
                "jq -s '.[0] * .[1]' /etc/docker/daemon.json.coolify /etc/docker/daemon.json | tee /etc/docker/daemon.json.appended > /dev/null",
@@ -1,268 +0,0 @@
-<?php
-
-namespace App\Actions\Server;
-
-use App\Actions\Database\StartDatabaseProxy;
-use App\Actions\Proxy\CheckProxy;
-use App\Actions\Proxy\StartProxy;
-use App\Jobs\CheckAndStartSentinelJob;
-use App\Jobs\ServerStorageCheckJob;
-use App\Models\Application;
-use App\Models\ApplicationPreview;
-use App\Models\Server;
-use App\Models\Service;
-use App\Models\ServiceApplication;
-use App\Models\ServiceDatabase;
-use App\Notifications\Container\ContainerRestarted;
-use Illuminate\Support\Arr;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class ServerCheck
-{
-    use AsAction;
-
-    public Server $server;
-
-    public bool $isSentinel = false;
-
-    public $containers;
-
-    public $databases;
-
-    public function handle(Server $server, $data = null)
-    {
-        $this->server = $server;
-        try {
-            if ($this->server->isFunctional() === false) {
-                return 'Server is not functional.';
-            }
-
-            if (! $this->server->isSwarmWorker() && ! $this->server->isBuildServer()) {
-
-                if (isset($data)) {
-                    $data = collect($data);
-
-                    $this->server->sentinelHeartbeat();
-
-                    $this->containers = collect(data_get($data, 'containers'));
-
-                    $filesystemUsageRoot = data_get($data, 'filesystem_usage_root.used_percentage');
-                    ServerStorageCheckJob::dispatch($this->server, $filesystemUsageRoot);
-
-                    $containerReplicates = null;
-                    $this->isSentinel = true;
-                } else {
-                    ['containers' => $this->containers, 'containerReplicates' => $containerReplicates] = $this->server->getContainers();
-                    // ServerStorageCheckJob::dispatch($this->server);
-                }
-
-                if (is_null($this->containers)) {
-                    return 'No containers found.';
-                }
-
-                if (isset($containerReplicates)) {
-                    foreach ($containerReplicates as $containerReplica) {
-                        $name = data_get($containerReplica, 'Name');
-                        $this->containers = $this->containers->map(function ($container) use ($name, $containerReplica) {
-                            if (data_get($container, 'Spec.Name') === $name) {
-                                $replicas = data_get($containerReplica, 'Replicas');
-                                $running = str($replicas)->explode('/')[0];
-                                $total = str($replicas)->explode('/')[1];
-                                if ($running === $total) {
-                                    data_set($container, 'State.Status', 'running');
-                                    data_set($container, 'State.Health.Status', 'healthy');
-                                } else {
-                                    data_set($container, 'State.Status', 'starting');
-                                    data_set($container, 'State.Health.Status', 'unhealthy');
-                                }
-                            }
-
-                            return $container;
-                        });
-                    }
-                }
-                $this->checkContainers();
-
-                if ($this->server->isSentinelEnabled() && $this->isSentinel === false) {
-                    CheckAndStartSentinelJob::dispatch($this->server);
-                }
-
-                if ($this->server->isLogDrainEnabled()) {
-                    $this->checkLogDrainContainer();
-                }
-
-                if ($this->server->proxySet() && ! $this->server->proxy->force_stop) {
-                    $foundProxyContainer = $this->containers->filter(function ($value, $key) {
-                        if ($this->server->isSwarm()) {
-                            return data_get($value, 'Spec.Name') === 'coolify-proxy_traefik';
-                        } else {
-                            return data_get($value, 'Name') === '/coolify-proxy';
-                        }
-                    })->first();
-                    $proxyStatus = data_get($foundProxyContainer, 'State.Status', 'exited');
-                    if (! $foundProxyContainer || $proxyStatus !== 'running') {
-                        try {
-                            $shouldStart = CheckProxy::run($this->server);
-                            if ($shouldStart) {
-                                StartProxy::run($this->server, async: false);
-                                $this->server->team?->notify(new ContainerRestarted('coolify-proxy', $this->server));
-                            }
-                        } catch (\Throwable $e) {
-                        }
-                    } else {
-                        $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
-                        $this->server->save();
-                        $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
-                        instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
-                    }
-                }
-            }
-        } catch (\Throwable $e) {
-            return handleError($e);
-        }
-    }
-
-    private function checkLogDrainContainer()
-    {
-        $foundLogDrainContainer = $this->containers->filter(function ($value, $key) {
-            return data_get($value, 'Name') === '/coolify-log-drain';
-        })->first();
-        if ($foundLogDrainContainer) {
-            $status = data_get($foundLogDrainContainer, 'State.Status');
-            if ($status !== 'running') {
-                StartLogDrain::dispatch($this->server);
-            }
-        } else {
-            StartLogDrain::dispatch($this->server);
-        }
-    }
-
-    private function checkContainers()
-    {
-        foreach ($this->containers as $container) {
-            if ($this->isSentinel) {
-                $labels = Arr::undot(data_get($container, 'labels'));
-            } else {
-                if ($this->server->isSwarm()) {
-                    $labels = Arr::undot(data_get($container, 'Spec.Labels'));
-                } else {
-                    $labels = Arr::undot(data_get($container, 'Config.Labels'));
-                }
-            }
-            $managed = data_get($labels, 'coolify.managed');
-            if (! $managed) {
-                continue;
-            }
-            $uuid = data_get($labels, 'coolify.name');
-            if (! $uuid) {
-                $uuid = data_get($labels, 'com.docker.compose.service');
-            }
-
-            if ($this->isSentinel) {
-                $containerStatus = data_get($container, 'state');
-                $containerHealth = data_get($container, 'health_status');
-            } else {
-                $containerStatus = data_get($container, 'State.Status');
-                $containerHealth = data_get($container, 'State.Health.Status', 'unhealthy');
-            }
-            $containerStatus = "$containerStatus ($containerHealth)";
-
-            $applicationId = data_get($labels, 'coolify.applicationId');
-            $serviceId = data_get($labels, 'coolify.serviceId');
-            $databaseId = data_get($labels, 'coolify.databaseId');
-            $pullRequestId = data_get($labels, 'coolify.pullRequestId');
-
-            if ($applicationId) {
-                // Application
-                if ($pullRequestId != 0) {
-                    if (str($applicationId)->contains('-')) {
-                        $applicationId = str($applicationId)->before('-');
-                    }
-                    $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
-                    if ($preview) {
-                        $preview->update(['status' => $containerStatus]);
-                    }
-                } else {
-                    $application = Application::where('id', $applicationId)->first();
-                    if ($application) {
-                        $application->update([
-                            'status' => $containerStatus,
-                            'last_online_at' => now(),
-                        ]);
-                    }
-                }
-            } elseif (isset($serviceId)) {
-                // Service
-                $subType = data_get($labels, 'coolify.service.subType');
-                $subId = data_get($labels, 'coolify.service.subId');
-                $service = Service::where('id', $serviceId)->first();
-                if (! $service) {
-                    continue;
-                }
-                if ($subType === 'application') {
-                    $service = ServiceApplication::where('id', $subId)->first();
-                } else {
-                    $service = ServiceDatabase::where('id', $subId)->first();
-                }
-                if ($service) {
-                    $service->update([
-                        'status' => $containerStatus,
-                        'last_online_at' => now(),
-                    ]);
-                    if ($subType === 'database') {
-                        $isPublic = data_get($service, 'is_public');
-                        if ($isPublic) {
-                            $foundTcpProxy = $this->containers->filter(function ($value, $key) use ($uuid) {
-                                if ($this->isSentinel) {
-                                    return data_get($value, 'name') === $uuid.'-proxy';
-                                } else {
-
-                                    if ($this->server->isSwarm()) {
-                                        return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
-                                    } else {
-                                        return data_get($value, 'Name') === "/$uuid-proxy";
-                                    }
-                                }
-                            })->first();
-                            if (! $foundTcpProxy) {
-                                StartDatabaseProxy::run($service);
-                            }
-                        }
-                    }
-                }
-            } else {
-                // Database
-                if (is_null($this->databases)) {
-                    $this->databases = $this->server->databases();
-                }
-                $database = $this->databases->where('uuid', $uuid)->first();
-                if ($database) {
-                    $database->update([
-                        'status' => $containerStatus,
-                        'last_online_at' => now(),
-                    ]);
-
-                    $isPublic = data_get($database, 'is_public');
-                    if ($isPublic) {
-                        $foundTcpProxy = $this->containers->filter(function ($value, $key) use ($uuid) {
-                            if ($this->isSentinel) {
-                                return data_get($value, 'name') === $uuid.'-proxy';
-                            } else {
-                                if ($this->server->isSwarm()) {
-                                    return data_get($value, 'Spec.Name') === "coolify-proxy_$uuid";
-                                } else {
-
-                                    return data_get($value, 'Name') === "/$uuid-proxy";
-                                }
-                            }
-                        })->first();
-                        if (! $foundTcpProxy) {
-                            StartDatabaseProxy::run($database);
-                            // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for database", $this->server));
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
@@ -180,30 +180,10 @@ Files:
            $command = [
                "echo 'Saving configuration'",
                "mkdir -p $config_path",
-                [
-                    'transfer_file' => [
-                        'content' => base64_decode($parsers),
-                        'destination' => $parsers_config,
-                    ],
-                ],
-                [
-                    'transfer_file' => [
-                        'content' => base64_decode($config),
-                        'destination' => $fluent_bit_config,
-                    ],
-                ],
-                [
-                    'transfer_file' => [
-                        'content' => base64_decode($compose),
-                        'destination' => $compose_path,
-                    ],
-                ],
-                [
-                    'transfer_file' => [
-                        'content' => base64_decode($readme),
-                        'destination' => $readme_path,
-                    ],
-                ],
+                "echo '{$parsers}' | base64 -d | tee $parsers_config > /dev/null",
+                "echo '{$config}' | base64 -d | tee $fluent_bit_config > /dev/null",
+                "echo '{$compose}' | base64 -d | tee $compose_path > /dev/null",
+                "echo '{$readme}' | base64 -d | tee $readme_path > /dev/null",
                "test -f $config_path/.env && rm $config_path/.env",
            ];
            if ($type === 'newrelic') {
@@ -10,7 +10,7 @@ class StartSentinel
 {
    use AsAction;

-    public function handle(Server $server, bool $restart = false, ?string $latestVersion = null)
+    public function handle(Server $server, bool $restart = false, ?string $latestVersion = null, ?string $customImage = null)
    {
        if ($server->isSwarm() || $server->isBuildServer()) {
            return;
@@ -44,7 +44,9 @@ class StartSentinel
        ];
        if (isDev()) {
            // data_set($environments, 'DEBUG', 'true');
-            // $image = 'sentinel';
+            if ($customImage && ! empty($customImage)) {
+                $image = $customImage;
+            }
            $mountDir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/sentinel';
        }
        $dockerEnvironments = '-e "'.implode('" -e "', array_map(fn ($key, $value) => "$key=$value", array_keys($environments), $environments)).'"';
@@ -0,0 +1,151 @@
+<?php
+
+namespace App\Actions\Stripe;
+
+use App\Models\Subscription;
+use App\Models\User;
+use Illuminate\Support\Collection;
+use Stripe\StripeClient;
+
+class CancelSubscription
+{
+    private User $user;
+
+    private bool $isDryRun;
+
+    private ?StripeClient $stripe = null;
+
+    public function __construct(User $user, bool $isDryRun = false)
+    {
+        $this->user = $user;
+        $this->isDryRun = $isDryRun;
+
+        if (! $isDryRun && isCloud()) {
+            $this->stripe = new StripeClient(config('subscription.stripe_api_key'));
+        }
+    }
+
+    public function getSubscriptionsPreview(): Collection
+    {
+        $subscriptions = collect();
+
+        // Get all teams the user belongs to
+        $teams = $this->user->teams;
+
+        foreach ($teams as $team) {
+            // Only include subscriptions from teams where user is owner
+            $userRole = $team->pivot->role;
+            if ($userRole === 'owner' && $team->subscription) {
+                $subscription = $team->subscription;
+
+                // Only include active subscriptions
+                if ($subscription->stripe_subscription_id &&
+                    $subscription->stripe_invoice_paid) {
+                    $subscriptions->push($subscription);
+                }
+            }
+        }
+
+        return $subscriptions;
+    }
+
+    public function execute(): array
+    {
+        if ($this->isDryRun) {
+            return [
+                'cancelled' => 0,
+                'failed' => 0,
+                'errors' => [],
+            ];
+        }
+
+        $cancelledCount = 0;
+        $failedCount = 0;
+        $errors = [];
+
+        $subscriptions = $this->getSubscriptionsPreview();
+
+        foreach ($subscriptions as $subscription) {
+            try {
+                $this->cancelSingleSubscription($subscription);
+                $cancelledCount++;
+            } catch (\Exception $e) {
+                $failedCount++;
+                $errorMessage = "Failed to cancel subscription {$subscription->stripe_subscription_id}: ".$e->getMessage();
+                $errors[] = $errorMessage;
+                \Log::error($errorMessage);
+            }
+        }
+
+        return [
+            'cancelled' => $cancelledCount,
+            'failed' => $failedCount,
+            'errors' => $errors,
+        ];
+    }
+
+    private function cancelSingleSubscription(Subscription $subscription): void
+    {
+        if (! $this->stripe) {
+            throw new \Exception('Stripe client not initialized');
+        }
+
+        $subscriptionId = $subscription->stripe_subscription_id;
+
+        // Cancel the subscription immediately (not at period end)
+        $this->stripe->subscriptions->cancel($subscriptionId, []);
+
+        // Update local database
+        $subscription->update([
+            'stripe_cancel_at_period_end' => false,
+            'stripe_invoice_paid' => false,
+            'stripe_trial_already_ended' => false,
+            'stripe_past_due' => false,
+            'stripe_feedback' => 'User account deleted',
+            'stripe_comment' => 'Subscription cancelled due to user account deletion at '.now()->toDateTimeString(),
+        ]);
+
+        // Call the team's subscription ended method to handle cleanup
+        if ($subscription->team) {
+            $subscription->team->subscriptionEnded();
+        }
+
+        \Log::info("Cancelled Stripe subscription: {$subscriptionId} for team: {$subscription->team->name}");
+    }
+
+    /**
+     * Cancel a single subscription by ID (helper method for external use)
+     */
+    public static function cancelById(string $subscriptionId): bool
+    {
+        try {
+            if (! isCloud()) {
+                return false;
+            }
+
+            $stripe = new StripeClient(config('subscription.stripe_api_key'));
+            $stripe->subscriptions->cancel($subscriptionId, []);
+
+            // Update local record if exists
+            $subscription = Subscription::where('stripe_subscription_id', $subscriptionId)->first();
+            if ($subscription) {
+                $subscription->update([
+                    'stripe_cancel_at_period_end' => false,
+                    'stripe_invoice_paid' => false,
+                    'stripe_trial_already_ended' => false,
+                    'stripe_past_due' => false,
+                ]);
+
+                if ($subscription->team) {
+                    $subscription->team->subscriptionEnded();
+                }
+            }
+
+            return true;
+        } catch (\Exception $e) {
+            \Log::error("Failed to cancel subscription {$subscriptionId}: ".$e->getMessage());
+
+            return false;
+        }
+    }
+}
@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Actions\User;
+
+use App\Models\User;
+use Illuminate\Support\Collection;
+
+class DeleteUserResources
+{
+    private User $user;
+
+    private bool $isDryRun;
+
+    public function __construct(User $user, bool $isDryRun = false)
+    {
+        $this->user = $user;
+        $this->isDryRun = $isDryRun;
+    }
+
+    public function getResourcesPreview(): array
+    {
+        $applications = collect();
+        $databases = collect();
+        $services = collect();
+
+        // Get all teams the user belongs to
+        $teams = $this->user->teams;
+
+        foreach ($teams as $team) {
+            // Get all servers for this team
+            $servers = $team->servers;
+
+            foreach ($servers as $server) {
+                // Get applications
+                $serverApplications = $server->applications;
+                $applications = $applications->merge($serverApplications);
+
+                // Get databases
+                $serverDatabases = $this->getAllDatabasesForServer($server);
+                $databases = $databases->merge($serverDatabases);
+
+                // Get services
+                $serverServices = $server->services;
+                $services = $services->merge($serverServices);
+            }
+        }
+
+        return [
+            'applications' => $applications->unique('id'),
+            'databases' => $databases->unique('id'),
+            'services' => $services->unique('id'),
+        ];
+    }
+
+    public function execute(): array
+    {
+        if ($this->isDryRun) {
+            return [
+                'applications' => 0,
+                'databases' => 0,
+                'services' => 0,
+            ];
+        }
+
+        $deletedCounts = [
+            'applications' => 0,
+            'databases' => 0,
+            'services' => 0,
+        ];
+
+        $resources = $this->getResourcesPreview();
+
+        // Delete applications
+        foreach ($resources['applications'] as $application) {
+            try {
+                $application->forceDelete();
+                $deletedCounts['applications']++;
+            } catch (\Exception $e) {
+                \Log::error("Failed to delete application {$application->id}: ".$e->getMessage());
+                throw $e; // Re-throw to trigger rollback
+            }
+        }
+
+        // Delete databases
+        foreach ($resources['databases'] as $database) {
+            try {
+                $database->forceDelete();
+                $deletedCounts['databases']++;
+            } catch (\Exception $e) {
+                \Log::error("Failed to delete database {$database->id}: ".$e->getMessage());
+                throw $e; // Re-throw to trigger rollback
+            }
+        }
+
+        // Delete services
+        foreach ($resources['services'] as $service) {
+            try {
+                $service->forceDelete();
+                $deletedCounts['services']++;
+            } catch (\Exception $e) {
+                \Log::error("Failed to delete service {$service->id}: ".$e->getMessage());
+                throw $e; // Re-throw to trigger rollback
+            }
+        }
+
+        return $deletedCounts;
+    }
+
+    private function getAllDatabasesForServer($server): Collection
+    {
+        $databases = collect();
+
+        // Get all standalone database types
+        $databases = $databases->merge($server->postgresqls);
+        $databases = $databases->merge($server->mysqls);
+        $databases = $databases->merge($server->mariadbs);
+        $databases = $databases->merge($server->mongodbs);
+        $databases = $databases->merge($server->redis);
+        $databases = $databases->merge($server->keydbs);
+        $databases = $databases->merge($server->dragonflies);
+        $databases = $databases->merge($server->clickhouses);
+
+        return $databases;
+    }
+}
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Actions\User;
+
+use App\Models\Server;
+use App\Models\User;
+use Illuminate\Support\Collection;
+
+class DeleteUserServers
+{
+    private User $user;
+
+    private bool $isDryRun;
+
+    public function __construct(User $user, bool $isDryRun = false)
+    {
+        $this->user = $user;
+        $this->isDryRun = $isDryRun;
+    }
+
+    public function getServersPreview(): Collection
+    {
+        $servers = collect();
+
+        // Get all teams the user belongs to
+        $teams = $this->user->teams;
+
+        foreach ($teams as $team) {
+            // Only include servers from teams where user is owner or admin
+            $userRole = $team->pivot->role;
+            if ($userRole === 'owner' || $userRole === 'admin') {
+                $teamServers = $team->servers;
+                $servers = $servers->merge($teamServers);
+            }
+        }
+
+        // Return unique servers (in case same server is in multiple teams)
+        return $servers->unique('id');
+    }
+
+    public function execute(): array
+    {
+        if ($this->isDryRun) {
+            return [
+                'servers' => 0,
+            ];
+        }
+
+        $deletedCount = 0;
+
+        $servers = $this->getServersPreview();
+
+        foreach ($servers as $server) {
+            try {
+                // Skip the default server (ID 0) which is the Coolify host
+                if ($server->id === 0) {
+                    \Log::info('Skipping deletion of Coolify host server (ID: 0)');
+
+                    continue;
+                }
+
+                // The Server model's forceDeleting event will handle cleanup of:
+                // - destinations
+                // - settings
+                $server->forceDelete();
+                $deletedCount++;
+            } catch (\Exception $e) {
+                \Log::error("Failed to delete server {$server->id}: ".$e->getMessage());
+                throw $e; // Re-throw to trigger rollback
+            }
+        }
+
+        return [
+            'servers' => $deletedCount,
+        ];
+    }
+}
@@ -0,0 +1,202 @@
+<?php
+
+namespace App\Actions\User;
+
+use App\Models\Team;
+use App\Models\User;
+
+class DeleteUserTeams
+{
+    private User $user;
+
+    private bool $isDryRun;
+
+    public function __construct(User $user, bool $isDryRun = false)
+    {
+        $this->user = $user;
+        $this->isDryRun = $isDryRun;
+    }
+
+    public function getTeamsPreview(): array
+    {
+        $teamsToDelete = collect();
+        $teamsToTransfer = collect();
+        $teamsToLeave = collect();
+        $edgeCases = collect();
+
+        $teams = $this->user->teams;
+
+        foreach ($teams as $team) {
+            // Skip root team (ID 0)
+            if ($team->id === 0) {
+                continue;
+            }
+
+            $userRole = $team->pivot->role;
+            $memberCount = $team->members->count();
+
+            if ($memberCount === 1) {
+                // User is alone in the team - delete it
+                $teamsToDelete->push($team);
+            } elseif ($userRole === 'owner') {
+                // Check if there are other owners
+                $otherOwners = $team->members
+                    ->where('id', '!=', $this->user->id)
+                    ->filter(function ($member) {
+                        return $member->pivot->role === 'owner';
+                    });
+
+                if ($otherOwners->isNotEmpty()) {
+                    // There are other owners, but check if this user is paying for the subscription
+                    if ($this->isUserPayingForTeamSubscription($team)) {
+                        // User is paying for the subscription - this is an edge case
+                        $edgeCases->push([
+                            'team' => $team,
+                            'reason' => 'User is paying for the team\'s Stripe subscription but there are other owners. The subscription needs to be cancelled or transferred to another owner\'s payment method.',
+                        ]);
+                    } else {
+                        // There are other owners and user is not paying, just remove this user
+                        $teamsToLeave->push($team);
+                    }
+                } else {
+                    // User is the only owner, check for replacement
+                    $newOwner = $this->findNewOwner($team);
+                    if ($newOwner) {
+                        $teamsToTransfer->push([
+                            'team' => $team,
+                            'new_owner' => $newOwner,
+                        ]);
+                    } else {
+                        // No suitable replacement found - this is an edge case
+                        $edgeCases->push([
+                            'team' => $team,
+                            'reason' => 'No suitable owner replacement found. Team has only regular members without admin privileges.',
+                        ]);
+                    }
+                }
+            } else {
+                // User is just a member - remove them from the team
+                $teamsToLeave->push($team);
+            }
+        }
+
+        return [
+            'to_delete' => $teamsToDelete,
+            'to_transfer' => $teamsToTransfer,
+            'to_leave' => $teamsToLeave,
+            'edge_cases' => $edgeCases,
+        ];
+    }
+
+    public function execute(): array
+    {
+        if ($this->isDryRun) {
+            return [
+                'deleted' => 0,
+                'transferred' => 0,
+                'left' => 0,
+            ];
+        }
+
+        $counts = [
+            'deleted' => 0,
+            'transferred' => 0,
+            'left' => 0,
+        ];
+
+        $preview = $this->getTeamsPreview();
+
+        // Check for edge cases - should not happen here as we check earlier, but be safe
+        if ($preview['edge_cases']->isNotEmpty()) {
+            throw new \Exception('Edge cases detected during execution. This should not happen.');
+        }
+
+        // Delete teams where user is alone
+        foreach ($preview['to_delete'] as $team) {
+            try {
+                // The Team model's deleting event will handle cleanup of:
+                // - private keys
+                // - sources
+                // - tags
+                // - environment variables
+                // - s3 storages
+                // - notification settings
+                $team->delete();
+                $counts['deleted']++;
+            } catch (\Exception $e) {
+                \Log::error("Failed to delete team {$team->id}: ".$e->getMessage());
+                throw $e; // Re-throw to trigger rollback
+            }
+        }
+
+        // Transfer ownership for teams where user is owner but not alone
+        foreach ($preview['to_transfer'] as $item) {
+            try {
+                $team = $item['team'];
+                $newOwner = $item['new_owner'];
+
+                // Update the new owner's role to owner
+                $team->members()->updateExistingPivot($newOwner->id, ['role' => 'owner']);
+
+                // Remove the current user from the team
+                $team->members()->detach($this->user->id);
+
+                $counts['transferred']++;
+            } catch (\Exception $e) {
+                \Log::error("Failed to transfer ownership of team {$item['team']->id}: ".$e->getMessage());
+                throw $e; // Re-throw to trigger rollback
+            }
+        }
+
+        // Remove user from teams where they're just a member
+        foreach ($preview['to_leave'] as $team) {
+            try {
+                $team->members()->detach($this->user->id);
+                $counts['left']++;
+            } catch (\Exception $e) {
+                \Log::error("Failed to remove user from team {$team->id}: ".$e->getMessage());
+                throw $e; // Re-throw to trigger rollback
+            }
+        }
+
+        return $counts;
+    }
+
+    private function findNewOwner(Team $team): ?User
+    {
+        // Only look for admins as potential new owners
+        // We don't promote regular members automatically
+        $otherAdmin = $team->members
+            ->where('id', '!=', $this->user->id)
+            ->filter(function ($member) {
+                return $member->pivot->role === 'admin';
+            })
+            ->first();
+
+        return $otherAdmin;
+    }
+
+    private function isUserPayingForTeamSubscription(Team $team): bool
+    {
+        if (! $team->subscription || ! $team->subscription->stripe_customer_id) {
+            return false;
+        }
+
+        // In Stripe, we need to check if the customer email matches the user's email
+        // This would require a Stripe API call to get customer details
+        // For now, we'll check if the subscription was created by this user
+
+        // Alternative approach: Check if user is the one who initiated the subscription
+        // We could store this information when the subscription is created
+        // For safety, we'll assume if there's an active subscription and multiple owners,
+        // we should treat it as an edge case that needs manual review
+
+        if ($team->subscription->stripe_subscription_id &&
+            $team->subscription->stripe_invoice_paid) {
+            // Active subscription exists - we should be cautious
+            return true;
+        }
+
+        return false;
+    }
+}
@@ -0,0 +1,722 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Actions\Stripe\CancelSubscription;
+use App\Actions\User\DeleteUserResources;
+use App\Actions\User\DeleteUserServers;
+use App\Actions\User\DeleteUserTeams;
+use App\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class CloudDeleteUser extends Command
+{
+    protected $signature = 'cloud:delete-user {email} 
+                            {--dry-run : Preview what will be deleted without actually deleting}
+                            {--skip-stripe : Skip Stripe subscription cancellation}
+                            {--skip-resources : Skip resource deletion}';
+
+    protected $description = 'Delete a user from the cloud instance with phase-by-phase confirmation';
+
+    private bool $isDryRun = false;
+
+    private bool $skipStripe = false;
+
+    private bool $skipResources = false;
+
+    private User $user;
+
+    public function handle()
+    {
+        if (! isCloud()) {
+            $this->error('This command is only available on cloud instances.');
+
+            return 1;
+        }
+
+        $email = $this->argument('email');
+        $this->isDryRun = $this->option('dry-run');
+        $this->skipStripe = $this->option('skip-stripe');
+        $this->skipResources = $this->option('skip-resources');
+
+        if ($this->isDryRun) {
+            $this->info('🔍 DRY RUN MODE - No data will be deleted');
+            $this->newLine();
+        }
+
+        try {
+            $this->user = User::whereEmail($email)->firstOrFail();
+        } catch (\Exception $e) {
+            $this->error("User with email '{$email}' not found.");
+
+            return 1;
+        }
+
+        $this->logAction("Starting user deletion process for: {$email}");
+
+        // Phase 1: Show User Overview (outside transaction)
+        if (! $this->showUserOverview()) {
+            $this->info('User deletion cancelled.');
+
+            return 0;
+        }
+
+        // If not dry run, wrap everything in a transaction
+        if (! $this->isDryRun) {
+            try {
+                DB::beginTransaction();
+
+                // Phase 2: Delete Resources
+                if (! $this->skipResources) {
+                    if (! $this->deleteResources()) {
+                        DB::rollBack();
+                        $this->error('User deletion failed at resource deletion phase. All changes rolled back.');
+
+                        return 1;
+                    }
+                }
+
+                // Phase 3: Delete Servers
+                if (! $this->deleteServers()) {
+                    DB::rollBack();
+                    $this->error('User deletion failed at server deletion phase. All changes rolled back.');
+
+                    return 1;
+                }
+
+                // Phase 4: Handle Teams
+                if (! $this->handleTeams()) {
+                    DB::rollBack();
+                    $this->error('User deletion failed at team handling phase. All changes rolled back.');
+
+                    return 1;
+                }
+
+                // Phase 5: Cancel Stripe Subscriptions
+                if (! $this->skipStripe && isCloud()) {
+                    if (! $this->cancelStripeSubscriptions()) {
+                        DB::rollBack();
+                        $this->error('User deletion failed at Stripe cancellation phase. All changes rolled back.');
+
+                        return 1;
+                    }
+                }
+
+                // Phase 6: Delete User Profile
+                if (! $this->deleteUserProfile()) {
+                    DB::rollBack();
+                    $this->error('User deletion failed at final phase. All changes rolled back.');
+
+                    return 1;
+                }
+
+                // Commit the transaction
+                DB::commit();
+
+                $this->newLine();
+                $this->info('✅ User deletion completed successfully!');
+                $this->logAction("User deletion completed for: {$email}");
+
+            } catch (\Exception $e) {
+                DB::rollBack();
+                $this->error('An error occurred during user deletion: '.$e->getMessage());
+                $this->logAction("User deletion failed for {$email}: ".$e->getMessage());
+
+                return 1;
+            }
+        } else {
+            // Dry run mode - just run through the phases without transaction
+            // Phase 2: Delete Resources
+            if (! $this->skipResources) {
+                if (! $this->deleteResources()) {
+                    $this->info('User deletion would be cancelled at resource deletion phase.');
+
+                    return 0;
+                }
+            }
+
+            // Phase 3: Delete Servers
+            if (! $this->deleteServers()) {
+                $this->info('User deletion would be cancelled at server deletion phase.');
+
+                return 0;
+            }
+
+            // Phase 4: Handle Teams
+            if (! $this->handleTeams()) {
+                $this->info('User deletion would be cancelled at team handling phase.');
+
+                return 0;
+            }
+
+            // Phase 5: Cancel Stripe Subscriptions
+            if (! $this->skipStripe && isCloud()) {
+                if (! $this->cancelStripeSubscriptions()) {
+                    $this->info('User deletion would be cancelled at Stripe cancellation phase.');
+
+                    return 0;
+                }
+            }
+
+            // Phase 6: Delete User Profile
+            if (! $this->deleteUserProfile()) {
+                $this->info('User deletion would be cancelled at final phase.');
+
+                return 0;
+            }
+
+            $this->newLine();
+            $this->info('✅ DRY RUN completed successfully! No data was deleted.');
+        }
+
+        return 0;
+    }
+
+    private function showUserOverview(): bool
+    {
+        $this->info('═══════════════════════════════════════');
+        $this->info('PHASE 1: USER OVERVIEW');
+        $this->info('═══════════════════════════════════════');
+        $this->newLine();
+
+        $teams = $this->user->teams;
+        $ownedTeams = $teams->filter(fn ($team) => $team->pivot->role === 'owner');
+        $memberTeams = $teams->filter(fn ($team) => $team->pivot->role !== 'owner');
+
+        // Collect all servers from all teams
+        $allServers = collect();
+        $allApplications = collect();
+        $allDatabases = collect();
+        $allServices = collect();
+        $activeSubscriptions = collect();
+
+        foreach ($teams as $team) {
+            $servers = $team->servers;
+            $allServers = $allServers->merge($servers);
+
+            foreach ($servers as $server) {
+                $resources = $server->definedResources();
+                foreach ($resources as $resource) {
+                    if ($resource instanceof \App\Models\Application) {
+                        $allApplications->push($resource);
+                    } elseif ($resource instanceof \App\Models\Service) {
+                        $allServices->push($resource);
+                    } else {
+                        $allDatabases->push($resource);
+                    }
+                }
+            }
+
+            if ($team->subscription && $team->subscription->stripe_subscription_id) {
+                $activeSubscriptions->push($team->subscription);
+            }
+        }
+
+        $this->table(
+            ['Property', 'Value'],
+            [
+                ['User', $this->user->email],
+                ['User ID', $this->user->id],
+                ['Created', $this->user->created_at->format('Y-m-d H:i:s')],
+                ['Last Login', $this->user->updated_at->format('Y-m-d H:i:s')],
+                ['Teams (Total)', $teams->count()],
+                ['Teams (Owner)', $ownedTeams->count()],
+                ['Teams (Member)', $memberTeams->count()],
+                ['Servers', $allServers->unique('id')->count()],
+                ['Applications', $allApplications->count()],
+                ['Databases', $allDatabases->count()],
+                ['Services', $allServices->count()],
+                ['Active Stripe Subscriptions', $activeSubscriptions->count()],
+            ]
+        );
+
+        $this->newLine();
+
+        $this->warn('⚠️  WARNING: This will permanently delete the user and all associated data!');
+        $this->newLine();
+
+        if (! $this->confirm('Do you want to continue with the deletion process?', false)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function deleteResources(): bool
+    {
+        $this->newLine();
+        $this->info('═══════════════════════════════════════');
+        $this->info('PHASE 2: DELETE RESOURCES');
+        $this->info('═══════════════════════════════════════');
+        $this->newLine();
+
+        $action = new DeleteUserResources($this->user, $this->isDryRun);
+        $resources = $action->getResourcesPreview();
+
+        if ($resources['applications']->isEmpty() &&
+            $resources['databases']->isEmpty() &&
+            $resources['services']->isEmpty()) {
+            $this->info('No resources to delete.');
+
+            return true;
+        }
+
+        $this->info('Resources to be deleted:');
+        $this->newLine();
+
+        if ($resources['applications']->isNotEmpty()) {
+            $this->warn("Applications to be deleted ({$resources['applications']->count()}):");
+            $this->table(
+                ['Name', 'UUID', 'Server', 'Status'],
+                $resources['applications']->map(function ($app) {
+                    return [
+                        $app->name,
+                        $app->uuid,
+                        $app->destination->server->name,
+                        $app->status ?? 'unknown',
+                    ];
+                })->toArray()
+            );
+            $this->newLine();
+        }
+
+        if ($resources['databases']->isNotEmpty()) {
+            $this->warn("Databases to be deleted ({$resources['databases']->count()}):");
+            $this->table(
+                ['Name', 'Type', 'UUID', 'Server'],
+                $resources['databases']->map(function ($db) {
+                    return [
+                        $db->name,
+                        class_basename($db),
+                        $db->uuid,
+                        $db->destination->server->name,
+                    ];
+                })->toArray()
+            );
+            $this->newLine();
+        }
+
+        if ($resources['services']->isNotEmpty()) {
+            $this->warn("Services to be deleted ({$resources['services']->count()}):");
+            $this->table(
+                ['Name', 'UUID', 'Server'],
+                $resources['services']->map(function ($service) {
+                    return [
+                        $service->name,
+                        $service->uuid,
+                        $service->server->name,
+                    ];
+                })->toArray()
+            );
+            $this->newLine();
+        }
+
+        $this->error('⚠️  THIS ACTION CANNOT BE UNDONE!');
+        if (! $this->confirm('Are you sure you want to delete all these resources?', false)) {
+            return false;
+        }
+
+        if (! $this->isDryRun) {
+            $this->info('Deleting resources...');
+            $result = $action->execute();
+            $this->info("Deleted: {$result['applications']} applications, {$result['databases']} databases, {$result['services']} services");
+            $this->logAction("Deleted resources for user {$this->user->email}: {$result['applications']} apps, {$result['databases']} databases, {$result['services']} services");
+        }
+
+        return true;
+    }
+
+    private function deleteServers(): bool
+    {
+        $this->newLine();
+        $this->info('═══════════════════════════════════════');
+        $this->info('PHASE 3: DELETE SERVERS');
+        $this->info('═══════════════════════════════════════');
+        $this->newLine();
+
+        $action = new DeleteUserServers($this->user, $this->isDryRun);
+        $servers = $action->getServersPreview();
+
+        if ($servers->isEmpty()) {
+            $this->info('No servers to delete.');
+
+            return true;
+        }
+
+        $this->warn("Servers to be deleted ({$servers->count()}):");
+        $this->table(
+            ['ID', 'Name', 'IP', 'Description', 'Resources Count'],
+            $servers->map(function ($server) {
+                $resourceCount = $server->definedResources()->count();
+
+                return [
+                    $server->id,
+                    $server->name,
+                    $server->ip,
+                    $server->description ?? '-',
+                    $resourceCount,
+                ];
+            })->toArray()
+        );
+        $this->newLine();
+
+        $this->error('⚠️  WARNING: Deleting servers will remove all server configurations!');
+        if (! $this->confirm('Are you sure you want to delete all these servers?', false)) {
+            return false;
+        }
+
+        if (! $this->isDryRun) {
+            $this->info('Deleting servers...');
+            $result = $action->execute();
+            $this->info("Deleted {$result['servers']} servers");
+            $this->logAction("Deleted {$result['servers']} servers for user {$this->user->email}");
+        }
+
+        return true;
+    }
+
+    private function handleTeams(): bool
+    {
+        $this->newLine();
+        $this->info('═══════════════════════════════════════');
+        $this->info('PHASE 4: HANDLE TEAMS');
+        $this->info('═══════════════════════════════════════');
+        $this->newLine();
+
+        $action = new DeleteUserTeams($this->user, $this->isDryRun);
+        $preview = $action->getTeamsPreview();
+
+        // Check for edge cases first - EXIT IMMEDIATELY if found
+        if ($preview['edge_cases']->isNotEmpty()) {
+            $this->error('═══════════════════════════════════════');
+            $this->error('⚠️  EDGE CASES DETECTED - CANNOT PROCEED');
+            $this->error('═══════════════════════════════════════');
+            $this->newLine();
+
+            foreach ($preview['edge_cases'] as $edgeCase) {
+                $team = $edgeCase['team'];
+                $reason = $edgeCase['reason'];
+                $this->error("Team: {$team->name} (ID: {$team->id})");
+                $this->error("Issue: {$reason}");
+
+                // Show team members for context
+                $this->info('Current members:');
+                foreach ($team->members as $member) {
+                    $role = $member->pivot->role;
+                    $this->line("  - {$member->name} ({$member->email}) - Role: {$role}");
+                }
+
+                // Check for active resources
+                $resourceCount = 0;
+                foreach ($team->servers as $server) {
+                    $resources = $server->definedResources();
+                    $resourceCount += $resources->count();
+                }
+
+                if ($resourceCount > 0) {
+                    $this->warn("  ⚠️  This team has {$resourceCount} active resources!");
+                }
+
+                // Show subscription details if relevant
+                if ($team->subscription && $team->subscription->stripe_subscription_id) {
+                    $this->warn('  ⚠️  Active Stripe subscription details:');
+                    $this->warn("    Subscription ID: {$team->subscription->stripe_subscription_id}");
+                    $this->warn("    Customer ID: {$team->subscription->stripe_customer_id}");
+
+                    // Show other owners who could potentially take over
+                    $otherOwners = $team->members
+                        ->where('id', '!=', $this->user->id)
+                        ->filter(function ($member) {
+                            return $member->pivot->role === 'owner';
+                        });
+
+                    if ($otherOwners->isNotEmpty()) {
+                        $this->info('  Other owners who could take over billing:');
+                        foreach ($otherOwners as $owner) {
+                            $this->line("    - {$owner->name} ({$owner->email})");
+                        }
+                    }
+                }
+
+                $this->newLine();
+            }
+
+            $this->error('Please resolve these issues manually before retrying:');
+
+            // Check if any edge case involves subscription payment issues
+            $hasSubscriptionIssue = $preview['edge_cases']->contains(function ($edgeCase) {
+                return str_contains($edgeCase['reason'], 'Stripe subscription');
+            });
+
+            if ($hasSubscriptionIssue) {
+                $this->info('For teams with subscription payment issues:');
+                $this->info('1. Cancel the subscription through Stripe dashboard, OR');
+                $this->info('2. Transfer the subscription to another owner\'s payment method, OR');
+                $this->info('3. Have the other owner create a new subscription after cancelling this one');
+                $this->newLine();
+            }
+
+            $hasNoOwnerReplacement = $preview['edge_cases']->contains(function ($edgeCase) {
+                return str_contains($edgeCase['reason'], 'No suitable owner replacement');
+            });
+
+            if ($hasNoOwnerReplacement) {
+                $this->info('For teams with no suitable owner replacement:');
+                $this->info('1. Assign an admin role to a trusted member, OR');
+                $this->info('2. Transfer team resources to another team, OR');
+                $this->info('3. Delete the team manually if no longer needed');
+                $this->newLine();
+            }
+
+            $this->error('USER DELETION ABORTED DUE TO EDGE CASES');
+            $this->logAction("User deletion aborted for {$this->user->email}: Edge cases in team handling");
+
+            // Exit immediately - don't proceed with deletion
+            if (! $this->isDryRun) {
+                DB::rollBack();
+            }
+            exit(1);
+        }
+
+        if ($preview['to_delete']->isEmpty() &&
+            $preview['to_transfer']->isEmpty() &&
+            $preview['to_leave']->isEmpty()) {
+            $this->info('No team changes needed.');
+
+            return true;
+        }
+
+        if ($preview['to_delete']->isNotEmpty()) {
+            $this->warn('Teams to be DELETED (user is the only member):');
+            $this->table(
+                ['ID', 'Name', 'Resources', 'Subscription'],
+                $preview['to_delete']->map(function ($team) {
+                    $resourceCount = 0;
+                    foreach ($team->servers as $server) {
+                        $resourceCount += $server->definedResources()->count();
+                    }
+                    $hasSubscription = $team->subscription && $team->subscription->stripe_subscription_id
+                        ? '⚠️ YES - '.$team->subscription->stripe_subscription_id
+                        : 'No';
+
+                    return [
+                        $team->id,
+                        $team->name,
+                        $resourceCount,
+                        $hasSubscription,
+                    ];
+                })->toArray()
+            );
+            $this->newLine();
+        }
+
+        if ($preview['to_transfer']->isNotEmpty()) {
+            $this->warn('Teams where ownership will be TRANSFERRED:');
+            $this->table(
+                ['Team ID', 'Team Name', 'New Owner', 'New Owner Email'],
+                $preview['to_transfer']->map(function ($item) {
+                    return [
+                        $item['team']->id,
+                        $item['team']->name,
+                        $item['new_owner']->name,
+                        $item['new_owner']->email,
+                    ];
+                })->toArray()
+            );
+            $this->newLine();
+        }
+
+        if ($preview['to_leave']->isNotEmpty()) {
+            $this->warn('Teams where user will be REMOVED (other owners/admins exist):');
+            $userId = $this->user->id;
+            $this->table(
+                ['ID', 'Name', 'User Role', 'Other Members'],
+                $preview['to_leave']->map(function ($team) use ($userId) {
+                    $userRole = $team->members->where('id', $userId)->first()->pivot->role;
+                    $otherMembers = $team->members->count() - 1;
+
+                    return [
+                        $team->id,
+                        $team->name,
+                        $userRole,
+                        $otherMembers,
+                    ];
+                })->toArray()
+            );
+            $this->newLine();
+        }
+
+        $this->error('⚠️  WARNING: Team changes affect access control and ownership!');
+        if (! $this->confirm('Are you sure you want to proceed with these team changes?', false)) {
+            return false;
+        }
+
+        if (! $this->isDryRun) {
+            $this->info('Processing team changes...');
+            $result = $action->execute();
+            $this->info("Teams deleted: {$result['deleted']}, ownership transferred: {$result['transferred']}, left: {$result['left']}");
+            $this->logAction("Team changes for user {$this->user->email}: deleted {$result['deleted']}, transferred {$result['transferred']}, left {$result['left']}");
+        }
+
+        return true;
+    }
+
+    private function cancelStripeSubscriptions(): bool
+    {
+        $this->newLine();
+        $this->info('═══════════════════════════════════════');
+        $this->info('PHASE 5: CANCEL STRIPE SUBSCRIPTIONS');
+        $this->info('═══════════════════════════════════════');
+        $this->newLine();
+
+        $action = new CancelSubscription($this->user, $this->isDryRun);
+        $subscriptions = $action->getSubscriptionsPreview();
+
+        if ($subscriptions->isEmpty()) {
+            $this->info('No Stripe subscriptions to cancel.');
+
+            return true;
+        }
+
+        $this->info('Stripe subscriptions to cancel:');
+        $this->newLine();
+
+        $totalMonthlyValue = 0;
+        foreach ($subscriptions as $subscription) {
+            $team = $subscription->team;
+            $planId = $subscription->stripe_plan_id;
+
+            // Try to get the price from config
+            $monthlyValue = $this->getSubscriptionMonthlyValue($planId);
+            $totalMonthlyValue += $monthlyValue;
+
+            $this->line("  - {$subscription->stripe_subscription_id} (Team: {$team->name})");
+            if ($monthlyValue > 0) {
+                $this->line("    Monthly value: \${$monthlyValue}");
+            }
+            if ($subscription->stripe_cancel_at_period_end) {
+                $this->line('    ⚠️  Already set to cancel at period end');
+            }
+        }
+
+        if ($totalMonthlyValue > 0) {
+            $this->newLine();
+            $this->warn("Total monthly value: \${$totalMonthlyValue}");
+        }
+        $this->newLine();
+
+        $this->error('⚠️  WARNING: Subscriptions will be cancelled IMMEDIATELY (not at period end)!');
+        if (! $this->confirm('Are you sure you want to cancel all these subscriptions immediately?', false)) {
+            return false;
+        }
+
+        if (! $this->isDryRun) {
+            $this->info('Cancelling subscriptions...');
+            $result = $action->execute();
+            $this->info("Cancelled {$result['cancelled']} subscriptions, {$result['failed']} failed");
+            if ($result['failed'] > 0 && ! empty($result['errors'])) {
+                $this->error('Failed subscriptions:');
+                foreach ($result['errors'] as $error) {
+                    $this->error("  - {$error}");
+                }
+            }
+            $this->logAction("Cancelled {$result['cancelled']} Stripe subscriptions for user {$this->user->email}");
+        }
+
+        return true;
+    }
+
+    private function deleteUserProfile(): bool
+    {
+        $this->newLine();
+        $this->info('═══════════════════════════════════════');
+        $this->info('PHASE 6: DELETE USER PROFILE');
+        $this->info('═══════════════════════════════════════');
+        $this->newLine();
+
+        $this->warn('⚠️  FINAL STEP - This action is IRREVERSIBLE!');
+        $this->newLine();
+
+        $this->info('User profile to be deleted:');
+        $this->table(
+            ['Property', 'Value'],
+            [
+                ['Email', $this->user->email],
+                ['Name', $this->user->name],
+                ['User ID', $this->user->id],
+                ['Created', $this->user->created_at->format('Y-m-d H:i:s')],
+                ['Email Verified', $this->user->email_verified_at ? 'Yes' : 'No'],
+                ['2FA Enabled', $this->user->two_factor_confirmed_at ? 'Yes' : 'No'],
+            ]
+        );
+
+        $this->newLine();
+
+        $this->warn("Type 'DELETE {$this->user->email}' to confirm final deletion:");
+        $confirmation = $this->ask('Confirmation');
+
+        if ($confirmation !== "DELETE {$this->user->email}") {
+            $this->error('Confirmation text does not match. Deletion cancelled.');
+
+            return false;
+        }
+
+        if (! $this->isDryRun) {
+            $this->info('Deleting user profile...');
+
+            try {
+                $this->user->delete();
+                $this->info('User profile deleted successfully.');
+                $this->logAction("User profile deleted: {$this->user->email}");
+            } catch (\Exception $e) {
+                $this->error('Failed to delete user profile: '.$e->getMessage());
+                $this->logAction("Failed to delete user profile {$this->user->email}: ".$e->getMessage());
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function getSubscriptionMonthlyValue(string $planId): int
+    {
+        // Map plan IDs to monthly values based on config
+        $subscriptionConfigs = config('subscription');
+
+        foreach ($subscriptionConfigs as $key => $value) {
+            if ($value === $planId && str_contains($key, 'stripe_price_id_')) {
+                // Extract price from key pattern: stripe_price_id_basic_monthly -> basic
+                $planType = str($key)->after('stripe_price_id_')->before('_')->toString();
+
+                // Map to known prices (you may need to adjust these based on your actual pricing)
+                return match ($planType) {
+                    'basic' => 29,
+                    'pro' => 49,
+                    'ultimate' => 99,
+                    default => 0
+                };
+            }
+        }
+
+        return 0;
+    }
+
+    private function logAction(string $message): void
+    {
+        $logMessage = "[CloudDeleteUser] {$message}";
+
+        if ($this->isDryRun) {
+            $logMessage = "[DRY RUN] {$logMessage}";
+        }
+
+        Log::channel('single')->info($logMessage);
+
+        // Also log to a dedicated user deletion log file
+        $logFile = storage_path('logs/user-deletions.log');
+        $timestamp = now()->format('Y-m-d H:i:s');
+        file_put_contents($logFile, "[{$timestamp}] {$logMessage}\n", FILE_APPEND | LOCK_EX);
+    }
+}
@@ -388,8 +388,11 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
        $dockerfile_base64 = base64_encode($this->application->dockerfile);
        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->application->name} to {$this->server->name}.");
        $this->prepare_builder_image();
-        $dockerfile_content = base64_decode($dockerfile_base64);
-        transfer_file_to_container($dockerfile_content, "{$this->workdir}{$this->dockerfile_location}", $this->deployment_uuid, $this->server);
+        $this->execute_remote_command(
+            [
+                executeInDocker($this->deployment_uuid, "echo '$dockerfile_base64' | base64 -d | tee {$this->workdir}{$this->dockerfile_location} > /dev/null"),
+            ],
+        );
        $this->generate_image_names();
        $this->generate_compose_file();
        $this->generate_build_env_variables();
@@ -479,7 +482,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
            if (filled($this->env_filename)) {
                $services = collect(data_get($composeFile, 'services', []));
                $services = $services->map(function ($service, $name) {
-                    $service['env_file'] = ["/artifacts/{$this->env_filename}"];
+                    $service['env_file'] = [$this->env_filename];

                    return $service;
                });
@@ -494,7 +497,10 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
            $yaml = Yaml::dump(convertToArray($composeFile), 10);
        }
        $this->docker_compose_base64 = base64_encode($yaml);
-        transfer_file_to_container($yaml, "{$this->workdir}{$this->docker_compose_location}", $this->deployment_uuid, $this->server);
+        $this->execute_remote_command([
+            executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d | tee {$this->workdir}{$this->docker_compose_location} > /dev/null"),
+            'hidden' => true,
+        ]);
        // Build new container to limit downtime.
        $this->application_deployment_queue->addLogEntry('Pulling & building required images.');

@@ -505,7 +511,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
        } else {
            $command = "{$this->coolify_variables} docker compose";
            if (filled($this->env_filename)) {
-                $command .= " --env-file /artifacts/{$this->env_filename}";
+                $command .= " --env-file {$this->workdir}/{$this->env_filename}";
            }
            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";
@@ -551,7 +557,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue

                $command = "{$this->coolify_variables} docker compose";
                if (filled($this->env_filename)) {
-                    $command .= " --env-file /artifacts/{$this->env_filename}";
+                    $command .= " --env-file {$server_workdir}/{$this->env_filename}";
                }
                $command .= " --project-directory {$server_workdir} -f {$server_workdir}{$this->docker_compose_location} up -d";
                $this->execute_remote_command(
@@ -568,7 +574,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                $command = "{$this->coolify_variables} docker compose";
                if ($this->preserveRepository) {
                    if (filled($this->env_filename)) {
-                        $command .= " --env-file /artifacts/{$this->env_filename}";
+                        $command .= " --env-file {$server_workdir}/{$this->env_filename}";
                    }
                    $command .= " --project-name {$this->application->uuid} --project-directory {$server_workdir} -f {$server_workdir}{$this->docker_compose_location} up -d";
                    $this->write_deployment_configurations();
@@ -578,7 +584,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                    );
                } else {
                    if (filled($this->env_filename)) {
-                        $command .= " --env-file /artifacts/{$this->env_filename}";
+                        $command .= " --env-file {$this->workdir}/{$this->env_filename}";
                    }
                    $command .= " --project-name {$this->application->uuid} --project-directory {$this->workdir} -f {$this->workdir}{$this->docker_compose_location} up -d";
                    $this->execute_remote_command(
@@ -709,12 +715,13 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                $composeFileName = "$mainDir/".addPreviewDeploymentSuffix('docker-compose', $this->pull_request_id).'.yaml';
                $this->docker_compose_location = '/'.addPreviewDeploymentSuffix('docker-compose', $this->pull_request_id).'.yaml';
            }
-            $this->execute_remote_command([
-                "mkdir -p $mainDir",
-            ]);
-            $docker_compose_content = base64_decode($this->docker_compose_base64);
-            transfer_file_to_server($docker_compose_content, $composeFileName, $this->server);
            $this->execute_remote_command(
+                [
+                    "mkdir -p $mainDir",
+                ],
+                [
+                    "echo '{$this->docker_compose_base64}' | base64 -d | tee $composeFileName > /dev/null",
+                ],
                [
                    "echo '{$readme}' > $mainDir/README.md",
                ]
@@ -911,24 +918,8 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
        });
        if ($this->pull_request_id === 0) {
            $this->env_filename = '.env';
-            // Filter out buildtime-only variables from runtime environment
-            $runtime_environment_variables = $sorted_environment_variables->filter(function ($env) {
-                return ! $env->is_buildtime_only;
-            });
-            foreach ($runtime_environment_variables as $env) {
-                $envs->push($env->key.'='.$env->real_value);
-            }
-            // 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()) {
-                    $envs->push("PORT={$ports[0]}");
-                }
-            }
-            // Add HOST if not exists
-            if ($this->application->environment_variables->where('key', 'HOST')->isEmpty()) {
-                $envs->push('HOST=0.0.0.0');
-            }

+            // Generate SERVICE_ variables first for dockercompose
            if ($this->build_pack === 'dockercompose') {
                $domains = collect(json_decode($this->application->docker_compose_domains)) ?? collect([]);

@@ -957,26 +948,38 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                    $envs->push('SERVICE_NAME_'.str($serviceName)->upper().'='.$serviceName);
                }
            }
-        } else {
-            $this->env_filename = '.env';
-            // Filter out buildtime-only variables from runtime environment for preview
-            $runtime_environment_variables_preview = $sorted_environment_variables_preview->filter(function ($env) {
+
+            // Filter out buildtime-only variables from runtime environment
+            $runtime_environment_variables = $sorted_environment_variables->filter(function ($env) {
                return ! $env->is_buildtime_only;
            });
-            foreach ($runtime_environment_variables_preview as $env) {
+
+            // Sort runtime environment variables: those referencing SERVICE_ variables come after others
+            $runtime_environment_variables = $runtime_environment_variables->sortBy(function ($env) {
+                if (str($env->value)->startsWith('$SERVICE_') || str($env->value)->contains('${SERVICE_')) {
+                    return 2;
+                }
+
+                return 1;
+            });
+
+            foreach ($runtime_environment_variables as $env) {
                $envs->push($env->key.'='.$env->real_value);
            }
            // Add PORT if not exists, use the first port as default
            if ($this->build_pack !== 'dockercompose') {
-                if ($this->application->environment_variables_preview->where('key', 'PORT')->isEmpty()) {
+                if ($this->application->environment_variables->where('key', 'PORT')->isEmpty()) {
                    $envs->push("PORT={$ports[0]}");
                }
            }
            // Add HOST if not exists
-            if ($this->application->environment_variables_preview->where('key', 'HOST')->isEmpty()) {
+            if ($this->application->environment_variables->where('key', 'HOST')->isEmpty()) {
                $envs->push('HOST=0.0.0.0');
            }
+        } else {
+            $this->env_filename = '.env';

+            // Generate SERVICE_ variables first for dockercompose preview
            if ($this->build_pack === 'dockercompose') {
                $domains = collect(json_decode(data_get($this->preview, 'docker_compose_domains'))) ?? collect([]);

@@ -1001,6 +1004,34 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                    $envs->push('SERVICE_NAME_'.str($rawServiceName)->upper().'='.addPreviewDeploymentSuffix($rawServiceName, $this->pull_request_id));
                }
            }
+
+            // Filter out buildtime-only variables from runtime environment for preview
+            $runtime_environment_variables_preview = $sorted_environment_variables_preview->filter(function ($env) {
+                return ! $env->is_buildtime_only;
+            });
+
+            // Sort runtime environment variables: those referencing SERVICE_ variables come after others
+            $runtime_environment_variables_preview = $runtime_environment_variables_preview->sortBy(function ($env) {
+                if (str($env->value)->startsWith('$SERVICE_') || str($env->value)->contains('${SERVICE_')) {
+                    return 2;
+                }
+
+                return 1;
+            });
+
+            foreach ($runtime_environment_variables_preview as $env) {
+                $envs->push($env->key.'='.$env->real_value);
+            }
+            // Add PORT if not exists, use the first port as default
+            if ($this->build_pack !== 'dockercompose') {
+                if ($this->application->environment_variables_preview->where('key', 'PORT')->isEmpty()) {
+                    $envs->push("PORT={$ports[0]}");
+                }
+            }
+            // Add HOST if not exists
+            if ($this->application->environment_variables_preview->where('key', 'HOST')->isEmpty()) {
+                $envs->push('HOST=0.0.0.0');
+            }
        }
        if ($envs->isEmpty()) {
            if ($this->env_filename) {
@@ -1033,17 +1064,27 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
            }
            $this->env_filename = null;
        } else {
-            $envs_content = $envs->implode("\n");
-            transfer_file_to_container($envs_content, "/artifacts/{$this->env_filename}", $this->deployment_uuid, $this->server);
+            $envs_base64 = base64_encode($envs->implode("\n"));
+            $this->execute_remote_command(
+                [
+                    executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d | tee $this->workdir/{$this->env_filename} > /dev/null"),
+                ],

-            // Save the env filename with preview deployment suffix
-            $env_filename = addPreviewDeploymentSuffix($this->env_filename, $this->pull_request_id);
+            );
            if ($this->use_build_server) {
                $this->server = $this->original_server;
-                transfer_file_to_server($envs_content, "$this->configuration_dir/{$env_filename}", $this->server);
+                $this->execute_remote_command(
+                    [
+                        "echo '$envs_base64' | base64 -d | tee $this->configuration_dir/{$this->env_filename} > /dev/null",
+                    ]
+                );
                $this->server = $this->build_server;
            } else {
-                transfer_file_to_server($envs_content, "$this->configuration_dir/{$env_filename}", $this->server);
+                $this->execute_remote_command(
+                    [
+                        "echo '$envs_base64' | base64 -d | tee $this->configuration_dir/{$this->env_filename} > /dev/null",
+                    ]
+                );
            }
        }
        $this->environment_variables = $envs;
@@ -1436,11 +1477,14 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
        }
        $private_key = data_get($this->application, 'private_key.private_key');
        if ($private_key) {
-            $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, 'mkdir -p /root/.ssh'),
-            ]);
-            transfer_file_to_container($private_key, '/root/.ssh/id_rsa', $this->deployment_uuid, $this->server);
+            $private_key = base64_encode($private_key);
            $this->execute_remote_command(
+                [
+                    executeInDocker($this->deployment_uuid, 'mkdir -p /root/.ssh'),
+                ],
+                [
+                    executeInDocker($this->deployment_uuid, "echo '{$private_key}' | base64 -d | tee /root/.ssh/id_rsa > /dev/null"),
+                ],
                [
                    executeInDocker($this->deployment_uuid, 'chmod 600 /root/.ssh/id_rsa'),
                ],
@@ -1845,7 +1889,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
            ],
        ];
        if (filled($this->env_filename)) {
-            $docker_compose['services'][$this->container_name]['env_file'] = ["/artifacts/{$this->env_filename}"];
+            $docker_compose['services'][$this->container_name]['env_file'] = [$this->env_filename];
        }
        $docker_compose['services'][$this->container_name]['healthcheck'] = [
            'test' => [
@@ -2002,7 +2046,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue

        $this->docker_compose = Yaml::dump($docker_compose, 10);
        $this->docker_compose_base64 = base64_encode($this->docker_compose);
-        transfer_file_to_container(base64_decode($this->docker_compose_base64), "{$this->workdir}/docker-compose.yaml", $this->deployment_uuid, $this->server);
+        $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->docker_compose_base64}' | base64 -d | tee {$this->workdir}/docker-compose.yaml > /dev/null"), 'hidden' => true]);
    }

    private function generate_local_persistent_volumes()
@@ -2130,8 +2174,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
            } else {
                if ($this->application->build_pack === 'nixpacks') {
                    $this->nixpacks_plan = base64_encode($this->nixpacks_plan);
-                    $nixpacks_content = base64_decode($this->nixpacks_plan);
-                    transfer_file_to_container($nixpacks_content, '/artifacts/thegameplan.json', $this->deployment_uuid, $this->server);
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d | tee /artifacts/thegameplan.json > /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}"),
@@ -2155,7 +2198,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                    $base64_build_command = base64_encode($build_command);
                    $this->execute_remote_command(
                        [
-                            transfer_file_to_container(base64_decode($base64_build_command), '/artifacts/build.sh', $this->deployment_uuid, $this->server),
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                            'hidden' => true,
                        ],
                        [
@@ -2178,7 +2221,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                    }
                    $this->execute_remote_command(
                        [
-                            transfer_file_to_container(base64_decode($base64_build_command), '/artifacts/build.sh', $this->deployment_uuid, $this->server),
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                            'hidden' => true,
                        ],
                        [
@@ -2210,13 +2253,13 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
            $base64_build_command = base64_encode($build_command);
            $this->execute_remote_command(
                [
-                    transfer_file_to_container(base64_decode($dockerfile), "{$this->workdir}/Dockerfile", $this->deployment_uuid, $this->server),
+                    executeInDocker($this->deployment_uuid, "echo '{$dockerfile}' | base64 -d | tee {$this->workdir}/Dockerfile > /dev/null"),
                ],
                [
-                    transfer_file_to_container(base64_decode($nginx_config), "{$this->workdir}/nginx.conf", $this->deployment_uuid, $this->server),
+                    executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d | tee {$this->workdir}/nginx.conf > /dev/null"),
                ],
                [
-                    transfer_file_to_container(base64_decode($base64_build_command), '/artifacts/build.sh', $this->deployment_uuid, $this->server),
+                    executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                    'hidden' => true,
                ],
                [
@@ -2239,7 +2282,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                $base64_build_command = base64_encode($build_command);
                $this->execute_remote_command(
                    [
-                        transfer_file_to_container(base64_decode($base64_build_command), '/artifacts/build.sh', $this->deployment_uuid, $this->server),
+                        executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                        'hidden' => true,
                    ],
                    [
@@ -2254,8 +2297,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
            } else {
                if ($this->application->build_pack === 'nixpacks') {
                    $this->nixpacks_plan = base64_encode($this->nixpacks_plan);
-                    $nixpacks_content = base64_decode($this->nixpacks_plan);
-                    transfer_file_to_container($nixpacks_content, '/artifacts/thegameplan.json', $this->deployment_uuid, $this->server);
+                    $this->execute_remote_command([executeInDocker($this->deployment_uuid, "echo '{$this->nixpacks_plan}' | base64 -d | tee /artifacts/thegameplan.json > /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}"),
@@ -2278,7 +2320,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                    $base64_build_command = base64_encode($build_command);
                    $this->execute_remote_command(
                        [
-                            transfer_file_to_container(base64_decode($base64_build_command), '/artifacts/build.sh', $this->deployment_uuid, $this->server),
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                            'hidden' => true,
                        ],
                        [
@@ -2301,7 +2343,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                    }
                    $this->execute_remote_command(
                        [
-                            transfer_file_to_container(base64_decode($base64_build_command), '/artifacts/build.sh', $this->deployment_uuid, $this->server),
+                            executeInDocker($this->deployment_uuid, "echo '{$base64_build_command}' | base64 -d | tee /artifacts/build.sh > /dev/null"),
                            'hidden' => true,
                        ],
                        [
@@ -2434,7 +2476,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
        }
        $dockerfile_base64 = base64_encode($dockerfile->implode("\n"));
        $this->execute_remote_command([
-            transfer_file_to_container(base64_decode($dockerfile_base64), "{$this->workdir}{$this->dockerfile_location}", $this->deployment_uuid, $this->server),
+            executeInDocker($this->deployment_uuid, "echo '{$dockerfile_base64}' | base64 -d | tee {$this->workdir}{$this->dockerfile_location} > /dev/null"),
            'hidden' => true,
        ]);
    }
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Actions\Docker\GetContainersStatus;
-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 DEPRECATEDContainerStatusJob implements ShouldBeEncrypted, ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $tries = 4;
-
-    public function backoff(): int
-    {
-        return isDev() ? 1 : 3;
-    }
-
-    public function __construct(public Server $server) {}
-
-    public function handle()
-    {
-        GetContainersStatus::run($this->server);
-    }
-}
@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Actions\Server\ResourcesCheck;
-use App\Actions\Server\ServerCheck;
-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 DEPRECATEDServerCheckNewJob implements ShouldBeEncrypted, ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $tries = 1;
-
-    public $timeout = 60;
-
-    public function __construct(public Server $server) {}
-
-    public function handle()
-    {
-        try {
-            ServerCheck::run($this->server);
-            ResourcesCheck::dispatch($this->server);
-        } catch (\Throwable $e) {
-            return handleError($e);
-        }
-    }
-}
@@ -1,162 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\InstanceSettings;
-use App\Models\Server;
-use App\Models\Team;
-use Cron\CronExpression;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\Middleware\WithoutOverlapping;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Log;
-
-class DEPRECATEDServerResourceManager implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * The time when this job execution started.
-     */
-    private ?Carbon $executionTime = null;
-
-    private InstanceSettings $settings;
-
-    private string $instanceTimezone;
-
-    /**
-     * Create a new job instance.
-     */
-    public function __construct()
-    {
-        $this->onQueue('high');
-    }
-
-    /**
-     * Get the middleware the job should pass through.
-     */
-    public function middleware(): array
-    {
-        return [
-            (new WithoutOverlapping('server-resource-manager'))
-                ->releaseAfter(60),
-        ];
-    }
-
-    public function handle(): void
-    {
-        // Freeze the execution time at the start of the job
-        $this->executionTime = Carbon::now();
-
-        $this->settings = instanceSettings();
-        $this->instanceTimezone = $this->settings->instance_timezone ?: config('app.timezone');
-
-        if (validate_timezone($this->instanceTimezone) === false) {
-            $this->instanceTimezone = config('app.timezone');
-        }
-
-        // Process server checks - don't let failures stop the job
-        try {
-            $this->processServerChecks();
-        } catch (\Exception $e) {
-            Log::channel('scheduled-errors')->error('Failed to process server checks', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString(),
-            ]);
-        }
-    }
-
-    private function processServerChecks(): void
-    {
-        $servers = $this->getServers();
-
-        foreach ($servers as $server) {
-            try {
-                $this->processServer($server);
-            } catch (\Exception $e) {
-                Log::channel('scheduled-errors')->error('Error processing server', [
-                    'server_id' => $server->id,
-                    'server_name' => $server->name,
-                    'error' => $e->getMessage(),
-                ]);
-            }
-        }
-    }
-
-    private function getServers()
-    {
-        $allServers = Server::where('ip', '!=', '1.2.3.4');
-
-        if (isCloud()) {
-            $servers = $allServers->whereRelation('team.subscription', 'stripe_invoice_paid', true)->get();
-            $own = Team::find(0)->servers;
-
-            return $servers->merge($own);
-        } else {
-            return $allServers->get();
-        }
-    }
-
-    private function processServer(Server $server): void
-    {
-        $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
-        if (validate_timezone($serverTimezone) === false) {
-            $serverTimezone = config('app.timezone');
-        }
-
-        // Sentinel check
-        $lastSentinelUpdate = $server->sentinel_updated_at;
-        if (Carbon::parse($lastSentinelUpdate)->isBefore($this->executionTime->subSeconds($server->waitBeforeDoingSshCheck()))) {
-            // Dispatch ServerCheckJob if due
-            $checkFrequency = isCloud() ? '*/5 * * * *' : '* * * * *'; // Every 5 min for cloud, every minute for self-hosted
-            if ($this->shouldRunNow($checkFrequency, $serverTimezone)) {
-                ServerCheckJob::dispatch($server);
-            }
-
-            // Dispatch ServerStorageCheckJob if due
-            $serverDiskUsageCheckFrequency = data_get($server->settings, 'server_disk_usage_check_frequency', '0 * * * *');
-            if (isset(VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency])) {
-                $serverDiskUsageCheckFrequency = VALID_CRON_STRINGS[$serverDiskUsageCheckFrequency];
-            }
-            if ($this->shouldRunNow($serverDiskUsageCheckFrequency, $serverTimezone)) {
-                ServerStorageCheckJob::dispatch($server);
-            }
-        }
-
-        // Dispatch DockerCleanupJob if due
-        $dockerCleanupFrequency = data_get($server->settings, 'docker_cleanup_frequency', '0 * * * *');
-        if (isset(VALID_CRON_STRINGS[$dockerCleanupFrequency])) {
-            $dockerCleanupFrequency = VALID_CRON_STRINGS[$dockerCleanupFrequency];
-        }
-        if ($this->shouldRunNow($dockerCleanupFrequency, $serverTimezone)) {
-            DockerCleanupJob::dispatch($server, false, $server->settings->delete_unused_volumes, $server->settings->delete_unused_networks);
-        }
-
-        // Dispatch ServerPatchCheckJob if due (weekly)
-        if ($this->shouldRunNow('0 0 * * 0', $serverTimezone)) { // Weekly on Sunday at midnight
-            ServerPatchCheckJob::dispatch($server);
-        }
-
-        // Dispatch Sentinel restart if due (daily for Sentinel-enabled servers)
-        if ($server->isSentinelEnabled() && $this->shouldRunNow('0 0 * * *', $serverTimezone)) {
-            dispatch(function () use ($server) {
-                $server->restartContainer('coolify-sentinel');
-            });
-        }
-    }
-
-    private function shouldRunNow(string $frequency, string $timezone): bool
-    {
-        $cron = new CronExpression($frequency);
-
-        // Use the frozen execution time, not the current time
-        $baseTime = $this->executionTime ?? Carbon::now();
-        $executionTime = $baseTime->copy()->setTimezone($timezone);
-
-        return $cron->isDue($executionTime);
-    }
-}
@@ -65,6 +65,8 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced

    public Collection $foundApplicationPreviewsIds;

+    public Collection $applicationContainerStatuses;
+
    public bool $foundProxy = false;

    public bool $foundLogDrainContainer = false;
@@ -87,6 +89,7 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
        $this->foundServiceApplicationIds = collect();
        $this->foundApplicationPreviewsIds = collect();
        $this->foundServiceDatabaseIds = collect();
+        $this->applicationContainerStatuses = collect();
        $this->allApplicationIds = collect();
        $this->allDatabaseUuids = collect();
        $this->allTcpProxyUuids = collect();
@@ -155,7 +158,14 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
                            if ($this->allApplicationIds->contains($applicationId) && $this->isRunning($containerStatus)) {
                                $this->foundApplicationIds->push($applicationId);
                            }
-                            $this->updateApplicationStatus($applicationId, $containerStatus);
+                            // 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)) {
@@ -205,9 +215,86 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced

        $this->updateAdditionalServersStatus();

+        // Aggregate multi-container application statuses
+        $this->aggregateMultiContainerStatuses();
+
        $this->checkLogDrainContainer();
    }

+    private function aggregateMultiContainerStatuses()
+    {
+        if ($this->applicationContainerStatuses->isEmpty()) {
+            return;
+        }
+
+        foreach ($this->applicationContainerStatuses as $applicationId => $containerStatuses) {
+            $application = $this->applications->where('id', $applicationId)->first();
+            if (! $application) {
+                continue;
+            }
+
+            // 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
+                }
+            }
+
+            // 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 ($relevantStatuses->isEmpty()) {
+                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)';
+            }
+
+            // Update application status with aggregated result
+            if ($aggregatedStatus && $application->status !== $aggregatedStatus) {
+                $application->status = $aggregatedStatus;
+                $application->save();
+            }
+        }
+    }
+
    private function updateApplicationStatus(string $applicationId, string $containerStatus)
    {
        $application = $this->applications->where('id', $applicationId)->first();
@@ -78,11 +78,11 @@ class ServerConnectionCheckJob implements ShouldBeEncrypted, ShouldQueue
            }

            // Server is reachable, check if Docker is available
-            // $isUsable = $this->checkDockerAvailability();
+            $isUsable = $this->checkDockerAvailability();

            $this->server->settings->update([
                'is_reachable' => true,
-                'is_usable' => true,
+                'is_usable' => $isUsable,
            ]);

        } catch (\Throwable $e) {
@@ -58,7 +58,7 @@ class StripeProcessJob implements ShouldQueue
                case 'checkout.session.completed':
                    $clientReferenceId = data_get($data, 'client_reference_id');
                    if (is_null($clientReferenceId)) {
-                        send_internal_notification('Checkout session completed without client reference id.');
+                        // send_internal_notification('Checkout session completed without client reference id.');
                        break;
                    }
                    $userId = Str::before($clientReferenceId, ':');
@@ -68,7 +68,7 @@ class StripeProcessJob implements ShouldQueue
                    $team = Team::find($teamId);
                    $found = $team->members->where('id', $userId)->first();
                    if (! $found->isAdmin()) {
-                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                        // send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
                        throw new \RuntimeException("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
                    }
                    $subscription = Subscription::where('team_id', $teamId)->first();
@@ -95,7 +95,7 @@ class StripeProcessJob implements ShouldQueue
                    $customerId = data_get($data, 'customer');
                    $planId = data_get($data, 'lines.data.0.plan.id');
                    if (Str::contains($excludedPlans, $planId)) {
-                        send_internal_notification('Subscription excluded.');
+                        // send_internal_notification('Subscription excluded.');
                        break;
                    }
                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
@@ -110,16 +110,38 @@ class StripeProcessJob implements ShouldQueue
                    break;
                case 'invoice.payment_failed':
                    $customerId = data_get($data, 'customer');
+                    $invoiceId = data_get($data, 'id');
+                    $paymentIntentId = data_get($data, 'payment_intent');
+
                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
                    if (! $subscription) {
-                        send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: '.$customerId);
+                        // send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: '.$customerId);
                        throw new \RuntimeException("No subscription found for customer: {$customerId}");
                    }
                    $team = data_get($subscription, 'team');
                    if (! $team) {
-                        send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: '.$customerId);
+                        // send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: '.$customerId);
                        throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
                    }
+
+                    // Verify payment status with Stripe API before sending failure notification
+                    if ($paymentIntentId) {
+                        try {
+                            $stripe = new \Stripe\StripeClient(config('subscription.stripe_api_key'));
+                            $paymentIntent = $stripe->paymentIntents->retrieve($paymentIntentId);
+
+                            if (in_array($paymentIntent->status, ['processing', 'succeeded', 'requires_action', 'requires_confirmation'])) {
+                                break;
+                            }
+
+                            if (! $subscription->stripe_invoice_paid && $subscription->created_at->diffInMinutes(now()) < 5) {
+                                SubscriptionInvoiceFailedJob::dispatch($team)->delay(now()->addSeconds(60));
+                                break;
+                            }
+                        } catch (\Exception $e) {
+                        }
+                    }
+
                    if (! $subscription->stripe_invoice_paid) {
                        SubscriptionInvoiceFailedJob::dispatch($team);
                        // send_internal_notification('Invoice payment failed: '.$customerId);
@@ -129,11 +151,11 @@ class StripeProcessJob implements ShouldQueue
                    $customerId = data_get($data, 'customer');
                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
                    if (! $subscription) {
-                        send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: '.$customerId);
+                        // send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: '.$customerId);
                        throw new \RuntimeException("No subscription found in Coolify for customer: {$customerId}");
                    }
                    if ($subscription->stripe_invoice_paid) {
-                        send_internal_notification('payment_intent.payment_failed but invoice is active for customer: '.$customerId);
+                        // send_internal_notification('payment_intent.payment_failed but invoice is active for customer: '.$customerId);

                        return;
                    }
@@ -154,7 +176,7 @@ class StripeProcessJob implements ShouldQueue
                    $team = Team::find($teamId);
                    $found = $team->members->where('id', $userId)->first();
                    if (! $found->isAdmin()) {
-                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
+                        // send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
                        throw new \RuntimeException("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
                    }
                    $subscription = Subscription::where('team_id', $teamId)->first();
@@ -177,7 +199,7 @@ class StripeProcessJob implements ShouldQueue
                    $subscriptionId = data_get($data, 'items.data.0.subscription') ?? data_get($data, 'id');
                    $planId = data_get($data, 'items.data.0.plan.id') ?? data_get($data, 'plan.id');
                    if (Str::contains($excludedPlans, $planId)) {
-                        send_internal_notification('Subscription excluded.');
+                        // send_internal_notification('Subscription excluded.');
                        break;
                    }
                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
@@ -194,7 +216,7 @@ class StripeProcessJob implements ShouldQueue
                                'stripe_invoice_paid' => false,
                            ]);
                        } else {
-                            send_internal_notification('No subscription and team id found');
+                            // send_internal_notification('No subscription and team id found');
                            throw new \RuntimeException('No subscription and team id found');
                        }
                    }
@@ -230,7 +252,7 @@ class StripeProcessJob implements ShouldQueue
                            $subscription->update([
                                'stripe_past_due' => true,
                            ]);
-                            send_internal_notification('Past Due: '.$customerId.'Subscription ID: '.$subscriptionId);
+                            // send_internal_notification('Past Due: '.$customerId.'Subscription ID: '.$subscriptionId);
                        }
                    }
                    if ($status === 'unpaid') {
@@ -238,13 +260,13 @@ class StripeProcessJob implements ShouldQueue
                            $subscription->update([
                                'stripe_invoice_paid' => false,
                            ]);
-                            send_internal_notification('Unpaid: '.$customerId.'Subscription ID: '.$subscriptionId);
+                            // send_internal_notification('Unpaid: '.$customerId.'Subscription ID: '.$subscriptionId);
                        }
                        $team = data_get($subscription, 'team');
                        if ($team) {
                            $team->subscriptionEnded();
                        } else {
-                            send_internal_notification('Subscription unpaid but no team found in Coolify for customer: '.$customerId);
+                            // send_internal_notification('Subscription unpaid but no team found in Coolify for customer: '.$customerId);
                            throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
                        }
                    }
@@ -273,11 +295,11 @@ class StripeProcessJob implements ShouldQueue
                        if ($team) {
                            $team->subscriptionEnded();
                        } else {
-                            send_internal_notification('Subscription deleted but no team found in Coolify for customer: '.$customerId);
+                            // send_internal_notification('Subscription deleted but no team found in Coolify for customer: '.$customerId);
                            throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
                        }
                    } else {
-                        send_internal_notification('Subscription deleted but no subscription found in Coolify for customer: '.$customerId);
+                        // send_internal_notification('Subscription deleted but no subscription found in Coolify for customer: '.$customerId);
                        throw new \RuntimeException("No subscription found in Coolify for customer: {$customerId}");
                    }
                    break;
@@ -23,6 +23,47 @@ class SubscriptionInvoiceFailedJob implements ShouldBeEncrypted, ShouldQueue
    public function handle()
    {
        try {
+            // Double-check subscription status before sending failure notification
+            $subscription = $this->team->subscription;
+            if ($subscription && $subscription->stripe_customer_id) {
+                try {
+                    $stripe = new \Stripe\StripeClient(config('subscription.stripe_api_key'));
+
+                    if ($subscription->stripe_subscription_id) {
+                        $stripeSubscription = $stripe->subscriptions->retrieve($subscription->stripe_subscription_id);
+
+                        if (in_array($stripeSubscription->status, ['active', 'trialing'])) {
+                            if (! $subscription->stripe_invoice_paid) {
+                                $subscription->update([
+                                    'stripe_invoice_paid' => true,
+                                    'stripe_past_due' => false,
+                                ]);
+                            }
+
+                            return;
+                        }
+                    }
+
+                    $invoices = $stripe->invoices->all([
+                        'customer' => $subscription->stripe_customer_id,
+                        'limit' => 3,
+                    ]);
+
+                    foreach ($invoices->data as $invoice) {
+                        if ($invoice->paid && $invoice->created > (time() - 3600)) {
+                            $subscription->update([
+                                'stripe_invoice_paid' => true,
+                                'stripe_past_due' => false,
+                            ]);
+
+                            return;
+                        }
+                    }
+                } catch (\Exception $e) {
+                }
+            }
+
+            // If we reach here, payment genuinely failed
            $session = getStripeCustomerPortalSession($this->team);
            $mail = new MailMessage;
            $mail->view('emails.subscription-invoice-failed', [
@@ -232,12 +232,8 @@ EOD;
                    break;
            }

-            $this->importCommands[] = [
-                'transfer_file' => [
-                    'content' => $restoreCommand,
-                    'destination' => $scriptPath,
-                ],
-            ];
+            $restoreCommandBase64 = base64_encode($restoreCommand);
+            $this->importCommands[] = "echo \"{$restoreCommandBase64}\" | base64 -d > {$scriptPath}";
            $this->importCommands[] = "chmod +x {$scriptPath}";
            $this->importCommands[] = "docker cp {$scriptPath} {$this->container}:{$scriptPath}";

@@ -105,6 +105,19 @@ class Executions extends Component
        $this->currentPage++;
    }

+    public function loadAllLogs()
+    {
+        if (! $this->selectedExecution || ! $this->selectedExecution->message) {
+            return;
+        }
+
+        $lines = collect(explode("\n", $this->selectedExecution->message));
+        $totalLines = $lines->count();
+        $totalPages = ceil($totalLines / $this->logsPerPage);
+
+        $this->currentPage = $totalPages;
+    }
+
    public function getLogLinesProperty()
    {
        if (! $this->selectedExecution) {
@@ -32,7 +32,7 @@ class Navbar extends Component
        $teamId = auth()->user()->currentTeam()->id;

        return [
-            'refreshServerShow' => '$refresh',
+            'refreshServerShow' => 'refreshServer',
            "echo-private:team.{$teamId},ProxyStatusChangedUI" => 'showNotification',
        ];
    }
@@ -134,6 +134,12 @@ class Navbar extends Component

    }

+    public function refreshServer()
+    {
+        $this->server->refresh();
+        $this->server->load('settings');
+    }
+
    public function render()
    {
        return view('livewire.server.navbar');
@@ -78,7 +78,10 @@ class NewDynamicConfiguration extends Component
                $yaml = Yaml::dump($yaml, 10, 2);
                $this->value = $yaml;
            }
-            transfer_file_to_server($this->value, $file, $this->server);
+            $base64_value = base64_encode($this->value);
+            instant_remote_process([
+                "echo '{$base64_value}' | base64 -d | tee {$file} > /dev/null",
+            ], $this->server);
            if ($proxy_type === 'CADDY') {
                $this->server->reloadCaddy();
            }
@@ -63,6 +63,8 @@ class Show extends Component

    public bool $isSentinelDebugEnabled;

+    public ?string $sentinelCustomDockerImage = null;
+
    public string $serverTimezone;

    public function getListeners()
@@ -267,7 +269,8 @@ class Show extends Component
    {
        try {
            $this->authorize('manageSentinel', $this->server);
-            $this->server->restartSentinel();
+            $customImage = isDev() ? $this->sentinelCustomDockerImage : null;
+            $this->server->restartSentinel($customImage);
            $this->dispatch('success', 'Restarting Sentinel.');
        } catch (\Throwable $e) {
            return handleError($e, $this);
@@ -295,12 +298,38 @@ class Show extends Component
        }
    }

+    public function updatedIsBuildServer($value)
+    {
+        try {
+            $this->authorize('update', $this->server);
+            if ($value === true && $this->isSentinelEnabled) {
+                $this->isSentinelEnabled = false;
+                $this->isMetricsEnabled = false;
+                $this->isSentinelDebugEnabled = false;
+                StopSentinel::dispatch($this->server);
+                $this->dispatch('info', 'Sentinel has been disabled as build servers cannot run Sentinel.');
+            }
+            $this->submit();
+            // Dispatch event to refresh the navbar
+            $this->dispatch('refreshServerShow');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
    public function updatedIsSentinelEnabled($value)
    {
        try {
            $this->authorize('manageSentinel', $this->server);
            if ($value === true) {
-                StartSentinel::run($this->server, true);
+                if ($this->isBuildServer) {
+                    $this->isSentinelEnabled = false;
+                    $this->dispatch('error', 'Sentinel cannot be enabled on build servers.');
+
+                    return;
+                }
+                $customImage = isDev() ? $this->sentinelCustomDockerImage : null;
+                StartSentinel::run($this->server, true, null, $customImage);
            } else {
                $this->isMetricsEnabled = false;
                $this->isSentinelDebugEnabled = false;
@@ -1073,20 +1073,26 @@ class Application extends BaseModel
            if (is_null($private_key)) {
                throw new RuntimeException('Private key not found. Please add a private key to the application and try again.');
            }
+            $private_key = base64_encode($private_key);
            $base_comamnd = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$base_command} {$customRepository}";

-            $commands = collect([]);
+            if ($exec_in_docker) {
+                $commands = collect([
+                    executeInDocker($deployment_uuid, 'mkdir -p /root/.ssh'),
+                    executeInDocker($deployment_uuid, "echo '{$private_key}' | base64 -d | tee /root/.ssh/id_rsa > /dev/null"),
+                    executeInDocker($deployment_uuid, 'chmod 600 /root/.ssh/id_rsa'),
+                ]);
+            } else {
+                $commands = collect([
+                    'mkdir -p /root/.ssh',
+                    "echo '{$private_key}' | base64 -d | tee /root/.ssh/id_rsa > /dev/null",
+                    'chmod 600 /root/.ssh/id_rsa',
+                ]);
+            }

            if ($exec_in_docker) {
-                $commands->push(executeInDocker($deployment_uuid, 'mkdir -p /root/.ssh'));
-                // SSH key transfer handled by ApplicationDeploymentJob, assume key is already in container
-                $commands->push(executeInDocker($deployment_uuid, 'chmod 600 /root/.ssh/id_rsa'));
                $commands->push(executeInDocker($deployment_uuid, $base_comamnd));
            } else {
-                $server = $this->destination->server;
-                $commands->push('mkdir -p /root/.ssh');
-                transfer_file_to_server($private_key, '/root/.ssh/id_rsa', $server);
-                $commands->push('chmod 600 /root/.ssh/id_rsa');
                $commands->push($base_comamnd);
            }

@@ -1212,6 +1218,7 @@ class Application extends BaseModel
            if (is_null($private_key)) {
                throw new RuntimeException('Private key not found. Please add a private key to the application and try again.');
            }
+            $private_key = base64_encode($private_key);
            $escapedCustomRepository = escapeshellarg($customRepository);
            $git_clone_command_base = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$escapedCustomRepository} {$escapedBaseDir}";
            if ($only_checkout) {
@@ -1219,18 +1226,18 @@ class Application extends BaseModel
            } else {
                $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command_base);
            }
-
-            $commands = collect([]);
-
            if ($exec_in_docker) {
-                $commands->push(executeInDocker($deployment_uuid, 'mkdir -p /root/.ssh'));
-                // SSH key transfer handled by ApplicationDeploymentJob, assume key is already in container
-                $commands->push(executeInDocker($deployment_uuid, 'chmod 600 /root/.ssh/id_rsa'));
+                $commands = collect([
+                    executeInDocker($deployment_uuid, 'mkdir -p /root/.ssh'),
+                    executeInDocker($deployment_uuid, "echo '{$private_key}' | base64 -d | tee /root/.ssh/id_rsa > /dev/null"),
+                    executeInDocker($deployment_uuid, 'chmod 600 /root/.ssh/id_rsa'),
+                ]);
            } else {
-                $server = $this->destination->server;
-                $commands->push('mkdir -p /root/.ssh');
-                transfer_file_to_server($private_key, '/root/.ssh/id_rsa', $server);
-                $commands->push('chmod 600 /root/.ssh/id_rsa');
+                $commands = collect([
+                    'mkdir -p /root/.ssh',
+                    "echo '{$private_key}' | base64 -d | tee /root/.ssh/id_rsa > /dev/null",
+                    'chmod 600 /root/.ssh/id_rsa',
+                ]);
            }
            if ($pull_request_id !== 0) {
                if ($git_type === 'gitlab') {
@@ -1563,7 +1570,19 @@ class Application extends BaseModel
        if (is_null($this->watch_paths)) {
            return false;
        }
-        $watch_paths = collect(explode("\n", $this->watch_paths));
+        $watch_paths = collect(explode("\n", $this->watch_paths))
+            ->map(function (string $path): string {
+                return trim($path);
+            })
+            ->filter(function (string $path): bool {
+                return strlen($path) > 0;
+            });
+
+        // If no valid patterns after filtering, don't trigger
+        if ($watch_paths->isEmpty()) {
+            return false;
+        }
+
        $matches = $modified_files->filter(function ($file) use ($watch_paths) {
            return $watch_paths->contains(function ($glob) use ($file) {
                return fnmatch($glob, $file);
@@ -159,7 +159,8 @@ class LocalFileVolume extends BaseModel
            $chmod = data_get($this, 'chmod');
            $chown = data_get($this, 'chown');
            if ($content) {
-                transfer_file_to_server($content, $path, $server);
+                $content = base64_encode($content);
+                $commands->push("echo '$content' | base64 -d | tee $path > /dev/null");
            } else {
                $commands->push("touch $path");
            }
@@ -174,9 +175,7 @@ class LocalFileVolume extends BaseModel
            $commands->push("mkdir -p $path > /dev/null 2>&1 || true");
        }

-        if ($commands->count() > 0) {
-            return instant_remote_process($commands, $server);
-        }
+        return instant_remote_process($commands, $server);
    }

    // Accessor for convenient access
@@ -309,7 +309,10 @@ class Server extends BaseModel
                $conf = Yaml::dump($dynamic_conf, 12, 2);
            }
            $conf = $banner.$conf;
-            transfer_file_to_server($conf, $default_redirect_file, $this);
+            $base64 = base64_encode($conf);
+            instant_remote_process([
+                "echo '$base64' | base64 -d | tee $default_redirect_file > /dev/null",
+            ], $this);
        }

        if ($proxy_type === 'CADDY') {
@@ -443,10 +446,11 @@ class Server extends BaseModel
                    "# Do not edit it manually (only if you know what are you doing).\n\n".
                    $yaml;

+                $base64 = base64_encode($yaml);
                instant_remote_process([
                    "mkdir -p $dynamic_config_path",
+                    "echo '$base64' | base64 -d | tee $file > /dev/null",
                ], $this);
-                transfer_file_to_server($yaml, $file, $this);
            }
        } elseif ($this->proxyType() === 'CADDY') {
            $file = "$dynamic_config_path/coolify.caddy";
@@ -469,7 +473,10 @@ $schema://$host {
    }
    reverse_proxy coolify:8080
 }";
-                transfer_file_to_server($caddy_file, $file, $this);
+                $base64 = base64_encode($caddy_file);
+                instant_remote_process([
+                    "echo '$base64' | base64 -d | tee $file > /dev/null",
+                ], $this);
                $this->reloadCaddy();
            }
        }
@@ -1252,13 +1259,13 @@ $schema://$host {
        return str($this->ip)->contains(':');
    }

-    public function restartSentinel(bool $async = true)
+    public function restartSentinel(?string $customImage = null, bool $async = true)
    {
        try {
            if ($async) {
-                StartSentinel::dispatch($this, true);
+                StartSentinel::dispatch($this, true, null, $customImage);
            } else {
-                StartSentinel::run($this, true);
+                StartSentinel::run($this, true, null, $customImage);
            }
        } catch (\Throwable $e) {
            return handleError($e);
@@ -1312,6 +1319,7 @@ $schema://$host {
    public function generateCaCertificate()
    {
        try {
+            ray('Generating CA certificate for server', $this->id);
            SslHelper::generateSslCertificate(
                commonName: 'Coolify CA Certificate',
                serverId: $this->id,
@@ -1319,6 +1327,7 @@ $schema://$host {
                validityDays: 10 * 365
            );
            $caCertificate = SslCertificate::where('server_id', $this->id)->where('is_ca_certificate', true)->first();
+            ray('CA certificate generated', $caCertificate);
            if ($caCertificate) {
                $certificateContent = $caCertificate->ssl_certificate;
                $caCertPath = config('constants.coolify.base_config_path').'/ssl/';
@@ -1280,10 +1280,8 @@ class Service extends BaseModel
        if ($envs->count() === 0) {
            $commands[] = 'touch .env';
        } else {
-            $envs_content = $envs->implode("\n");
-            transfer_file_to_server($envs_content, $this->workdir().'/.env', $this->server);
-
-            return;
+            $envs_base64 = base64_encode($envs->implode("\n"));
+            $commands[] = "echo '$envs_base64' | base64 -d | tee .env > /dev/null";
        }

        instant_remote_process($commands, $this->server);
@@ -80,9 +80,23 @@ class FortifyServiceProvider extends ServiceProvider
            ) {
                $user->updated_at = now();
                $user->save();
-                $user->currentTeam = $user->teams->firstWhere('personal_team', true);
-                if (! $user->currentTeam) {
-                    $user->currentTeam = $user->recreate_personal_team();
+
+                // Check if user has a pending invitation they haven't accepted yet
+                $invitation = \App\Models\TeamInvitation::whereEmail($email)->first();
+                if ($invitation && $invitation->isValid()) {
+                    // User is logging in for the first time after being invited
+                    // Attach them to the invited team if not already attached
+                    if (! $user->teams()->where('team_id', $invitation->team->id)->exists()) {
+                        $user->teams()->attach($invitation->team->id, ['role' => $invitation->role]);
+                    }
+                    $user->currentTeam = $invitation->team;
+                    $invitation->delete();
+                } else {
+                    // Normal login - use personal team
+                    $user->currentTeam = $user->teams->firstWhere('personal_team', true);
+                    if (! $user->currentTeam) {
+                        $user->currentTeam = $user->recreate_personal_team();
+                    }
                }
                session(['currentTeam' => $user->currentTeam]);