Merge branch 'next' into 4117-2

2026-03-11 08:55:47 +00:00 · 2024-12-02 12:25:34 +01:00 · 2024-12-02 12:25:34 +01:00 · 0b179c2385
commit 0b179c2385
parent 57a4a7d616 428ba67cc0
47 changed files with 353 additions and 272 deletions
--- a/README.md
+++ b/README.md
@ -40,7 +40,7 @@ Special thanks to our biggest sponsors!

 ### Special Sponsors

-![image](https://github.com/user-attachments/assets/152bd1e0-e0c1-4d47-8a4f-0eb3700d2e61)
+![image](https://github.com/user-attachments/assets/726fb63e-c3b8-4260-b3ac-06780605ec5d)

 * [CCCareers](https://cccareers.org/) - A career development platform connecting coding bootcamp graduates with job opportunities in the tech industry.
 * [Hetzner](http://htznr.li/CoolifyXHetzner) - A German web hosting company offering affordable dedicated servers, cloud services, and web hosting solutions.
@ -50,6 +50,7 @@ Special thanks to our biggest sponsors!
 * [QuantCDN](https://www.quantcdn.io/?ref=coolify.io) - A content delivery network (CDN) optimizing website performance through global content distribution.
 * [Arcjet](https://arcjet.com/?ref=coolify.io) - A cloud-based platform providing real-time protection against API abuse and bot attacks.
 * [SupaGuide](https://supa.guide/?ref=coolify.io) - A comprehensive resource hub offering guides and tutorials for web development using Supabase.
+* [GoldenVM](https://billing.goldenvm.com/?ref=coolify.io) - A cloud hosting provider offering scalable infrastructure solutions for businesses of all sizes.
 * [Tigris](https://tigrisdata.com/?ref=coolify.io) - A fully managed serverless object storage service compatible with Amazon S3 API. Offers high performance, scalability, and built-in search capabilities for efficient data management.
 * [Advin](https://coolify.ad.vin/?ref=coolify.io) - A digital advertising agency specializing in programmatic advertising and data-driven marketing strategies.
 * [Treive](https://trieve.ai/?ref=coolify.io) - An AI-powered search and discovery platform for enhancing information retrieval in large datasets.
@ -90,7 +91,6 @@ Special thanks to our biggest sponsors!
 <a href="https://github.com/urtho"><img src="https://github.com/urtho.png" width="60px" alt="Paweł Pierścionek" /></a>
 <a href="https://github.com/monocursive"><img src="https://github.com/monocursive.png" width="60px" alt="Michael Mazurczak" /></a>
 <a href="https://formbricks.com/?utm_source=coolify.io"><img src="https://github.com/formbricks.png" width="60px" alt="Formbricks" /></a>
-<a href="https://x.com/adithsuhas17?utm_source=coolify.io"><img src="https://github.com/adith-suhas-sv.png" width="60px" alt="Adith Suhas" /></a>
 <a href="https://startupfa.me?utm_source=coolify.io"><img src="https://github.com/startupfame.png" width="60px" alt="StartupFame" /></a>
 <a href="https://jonasjaeger.com?utm_source=coolify.io"><img src="https://github.com/toxin20.png" width="60px" alt="Jonas Jaeger" /></a>
 <a href="https://github.com/therealjp?utm_source=coolify.io"><img src="https://github.com/therealjp.png" width="60px" alt="JP" /></a>
@ -147,10 +147,10 @@ By subscribing to the cloud version, you get the Coolify server for the same pri

 # Core Maintainers

-| Andras Bacsai | Peak |
+| Andras Bacsai | 🏔️ Peak |
 |------------|------------|
-| <img src="https://github.com/andrasbacsai.png" width="200px" alt="Andras Bacsai" /> | <img src="https://github.com/peaklabs-dev.png" width="200px" alt="Peak Labs" /> |
-| <a href="https://x.com/heyandras"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Twitter.svg" width="25px"></a> <a href="https://github.com/andrasbacsai"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Github.svg" width="25px"></a> | <a href="https://x.com/peaklabs_dev"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Twitter.svg" width="25px"></a> <a href="https://github.com/peaklabs-dev"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Github.svg" width="25px"></a> |
+| <img src="https://github.com/andrasbacsai.png" width="200px" alt="Andras Bacsai" /> | <img src="https://github.com/peaklabs-dev.png" width="200px" alt="peaklabs-dev" /> |
+| <a href="https://github.com/andrasbacsai"><img src="https://api.iconify.design/devicon:github.svg" width="25px"></a> <a href="https://x.com/heyandras"><img src="https://api.iconify.design/devicon:twitter.svg" width="25px"></a> <a href="https://bsky.app/profile/heyandras.dev"><img src="https://api.iconify.design/simple-icons:bluesky.svg" width="25px"></a> | <a href="https://github.com/peaklabs-dev"><img src="https://api.iconify.design/devicon:github.svg" width="25px"></a> <a href="https://x.com/peaklabs_dev"><img src="https://api.iconify.design/devicon:twitter.svg" width="25px"></a> <a href="https://bsky.app/profile/peaklabs.dev"><img src="https://api.iconify.design/simple-icons:bluesky.svg" width="25px"></a> |

 # Repo Activity

--- a/app/Console/Commands/Emails.php
+++ b/app/Console/Commands/Emails.php
@ -187,7 +187,7 @@ class Emails extends Command
                        'team_id' => 0,
                    ]);
                }
-                $this->mail = (new BackupSuccess($backup, $db))->toMail();
+                // $this->mail = (new BackupSuccess($backup->frequency, $db->name))->toMail();
                $this->sendEmail();
                break;
                // case 'invitation-link':
--- a/app/Console/Commands/ServicesGenerate.php
+++ b/app/Console/Commands/ServicesGenerate.php
@ -20,7 +20,10 @@ class ServicesGenerate extends Command

    public function handle(): int
    {
-        $serviceTemplatesJson = collect(glob(base_path('templates/compose/*.yaml')))
+        $serviceTemplatesJson = collect(array_merge(
+            glob(base_path('templates/compose/*.yaml')),
+            glob(base_path('templates/compose/*.yml'))
+        ))
            ->mapWithKeys(function ($file): array {
                $file = basename($file);
                $parsed = $this->processFile($file);
@ -68,7 +71,7 @@ class ServicesGenerate extends Command
            'slogan' => $data->get('slogan', str($file)->headline()),
            'compose' => $compose,
            'tags' => $tags,
-            'logo' => $data->get('logo', 'svgs/coolify.png'),
+            'logo' => $data->get('logo', 'svgs/default.webp'),
            'minversion' => $data->get('minversion', '0.0.0'),
        ];

--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@ -132,7 +132,7 @@ class Kernel extends ConsoleKernel
        }

        foreach ($servers as $server) {
-            $serverTimezone = $server->settings->server_timezone;
+            $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);

            // Sentinel check
            $lastSentinelUpdate = $server->sentinel_updated_at;
@ -141,8 +141,12 @@ class Kernel extends ConsoleKernel
                if (validate_timezone($serverTimezone) === false) {
                    $serverTimezone = config('app.timezone');
                }
-                $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyMinute()->onOneServer();
-                // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyMinute()->onOneServer();
+                if (isCloud()) {
+                    $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyFiveMinutes()->onOneServer();
+                } else {
+                    $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyMinute()->onOneServer();
+                }
+                // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyFiveMinutes()->onOneServer();

                // Check storage usage every 10 minutes if Sentinel does not activated
                $this->scheduleInstance->job(new ServerStorageCheckJob($server))->everyTenMinutes()->onOneServer();
--- a/app/Jobs/ServerCheckJob.php
+++ b/app/Jobs/ServerCheckJob.php
@ -31,7 +31,12 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
    }

-    public function __construct(public Server $server) {}
+    public function __construct(public Server $server)
+    {
+        if (isDev()) {
+            $this->handle();
+        }
+    }

    public function handle()
    {
--- a/app/Livewire/Project/Application/Configuration.php
+++ b/app/Livewire/Project/Application/Configuration.php
@ -16,24 +16,33 @@ class Configuration extends Component

    public function mount()
    {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (! $project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (! $environment) {
-            return redirect()->route('dashboard');
-        }
-        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
-        if (! $application) {
-            return redirect()->route('dashboard');
-        }
+        $project = currentTeam()
+            ->projects()
+            ->select('id', 'uuid', 'team_id')
+            ->where('uuid', request()->route('project_uuid'))
+            ->firstOrFail();
+
+        $environment = $project->environments()
+            ->select('id', 'name', 'project_id')
+            ->where('name', request()->route('environment_name'))
+            ->firstOrFail();
+
+        $application = $environment->applications()
+            ->with(['destination'])
+            ->where('uuid', request()->route('application_uuid'))
+            ->firstOrFail();
+
        $this->application = $application;
-        $mainServer = $this->application->destination->server;
-        $servers = Server::ownedByCurrentTeam()->get();
-        $this->servers = $servers->filter(function ($server) use ($mainServer) {
-            return $server->id != $mainServer->id;
-        });
+
+        if ($application->destination && $application->destination->server) {
+            $mainServer = $application->destination->server;
+            $this->servers = Server::ownedByCurrentTeam()
+                ->select('id', 'name')
+                ->where('id', '!=', $mainServer->id)
+                ->get();
+        } else {
+            $this->servers = collect();
+        }
    }

    public function render()
--- a/app/Livewire/Project/New/Select.php
+++ b/app/Livewire/Project/New/Select.php
--- a/app/Livewire/Server/Advanced.php
+++ b/app/Livewire/Server/Advanced.php
@ -22,7 +22,7 @@ class Advanced extends Component
    #[Validate('boolean')]
    public bool $forceDockerCleanup = false;

-    #[Validate('string')]
+    #[Validate(['string', 'required'])]
    public string $dockerCleanupFrequency = '*/10 * * * *';

    #[Validate(['integer', 'min:1', 'max:99'])]
@ -78,7 +78,6 @@ class Advanced extends Component
        try {
            $this->syncData(true);
            $this->dispatch('success', 'Server updated.');
-            // $this->dispatch('refreshServerShow');
        } catch (\Throwable $e) {
            return handleError($e, $this);
        }
--- a/app/Livewire/Server/LogDrains.php
+++ b/app/Livewire/Server/LogDrains.php
@ -49,33 +49,73 @@ class LogDrains extends Component
        }
    }

-    public function syncData(bool $toModel = false)
+    public function syncDataNewRelic(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->server->settings->is_logdrain_newrelic_enabled = $this->isLogDrainNewRelicEnabled;
+            $this->server->settings->logdrain_newrelic_license_key = $this->logDrainNewRelicLicenseKey;
+            $this->server->settings->logdrain_newrelic_base_uri = $this->logDrainNewRelicBaseUri;
+        } else {
+            $this->isLogDrainNewRelicEnabled = $this->server->settings->is_logdrain_newrelic_enabled;
+            $this->logDrainNewRelicLicenseKey = $this->server->settings->logdrain_newrelic_license_key;
+            $this->logDrainNewRelicBaseUri = $this->server->settings->logdrain_newrelic_base_uri;
+        }
+    }
+
+    public function syncDataAxiom(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->server->settings->is_logdrain_axiom_enabled = $this->isLogDrainAxiomEnabled;
+            $this->server->settings->logdrain_axiom_dataset_name = $this->logDrainAxiomDatasetName;
+            $this->server->settings->logdrain_axiom_api_key = $this->logDrainAxiomApiKey;
+        } else {
+            $this->isLogDrainAxiomEnabled = $this->server->settings->is_logdrain_axiom_enabled;
+            $this->logDrainAxiomDatasetName = $this->server->settings->logdrain_axiom_dataset_name;
+            $this->logDrainAxiomApiKey = $this->server->settings->logdrain_axiom_api_key;
+        }
+    }
+
+    public function syncDataCustom(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->server->settings->is_logdrain_custom_enabled = $this->isLogDrainCustomEnabled;
+            $this->server->settings->logdrain_custom_config = $this->logDrainCustomConfig;
+            $this->server->settings->logdrain_custom_config_parser = $this->logDrainCustomConfigParser;
+        } else {
+            $this->isLogDrainCustomEnabled = $this->server->settings->is_logdrain_custom_enabled;
+            $this->logDrainCustomConfig = $this->server->settings->logdrain_custom_config;
+            $this->logDrainCustomConfigParser = $this->server->settings->logdrain_custom_config_parser;
+        }
+    }
+
+    public function syncData(bool $toModel = false, ?string $type = null)
    {
        if ($toModel) {
            $this->customValidation();
-            $this->server->settings->is_logdrain_newrelic_enabled = $this->isLogDrainNewRelicEnabled;
-            $this->server->settings->is_logdrain_axiom_enabled = $this->isLogDrainAxiomEnabled;
-            $this->server->settings->is_logdrain_custom_enabled = $this->isLogDrainCustomEnabled;
-
-            $this->server->settings->logdrain_newrelic_license_key = $this->logDrainNewRelicLicenseKey;
-            $this->server->settings->logdrain_newrelic_base_uri = $this->logDrainNewRelicBaseUri;
-            $this->server->settings->logdrain_axiom_dataset_name = $this->logDrainAxiomDatasetName;
-            $this->server->settings->logdrain_axiom_api_key = $this->logDrainAxiomApiKey;
-            $this->server->settings->logdrain_custom_config = $this->logDrainCustomConfig;
-            $this->server->settings->logdrain_custom_config_parser = $this->logDrainCustomConfigParser;
-
+            if ($type === 'newrelic') {
+                $this->syncDataNewRelic($toModel);
+            } elseif ($type === 'axiom') {
+                $this->syncDataAxiom($toModel);
+            } elseif ($type === 'custom') {
+                $this->syncDataCustom($toModel);
+            } else {
+                $this->syncDataNewRelic($toModel);
+                $this->syncDataAxiom($toModel);
+                $this->syncDataCustom($toModel);
+            }
            $this->server->settings->save();
        } else {
-            $this->isLogDrainNewRelicEnabled = $this->server->settings->is_logdrain_newrelic_enabled;
-            $this->isLogDrainAxiomEnabled = $this->server->settings->is_logdrain_axiom_enabled;
-            $this->isLogDrainCustomEnabled = $this->server->settings->is_logdrain_custom_enabled;
-
-            $this->logDrainNewRelicLicenseKey = $this->server->settings->logdrain_newrelic_license_key;
-            $this->logDrainNewRelicBaseUri = $this->server->settings->logdrain_newrelic_base_uri;
-            $this->logDrainAxiomDatasetName = $this->server->settings->logdrain_axiom_dataset_name;
-            $this->logDrainAxiomApiKey = $this->server->settings->logdrain_axiom_api_key;
-            $this->logDrainCustomConfig = $this->server->settings->logdrain_custom_config;
-            $this->logDrainCustomConfigParser = $this->server->settings->logdrain_custom_config_parser;
+            if ($type === 'newrelic') {
+                $this->syncDataNewRelic($toModel);
+            } elseif ($type === 'axiom') {
+                $this->syncDataAxiom($toModel);
+            } elseif ($type === 'custom') {
+                $this->syncDataCustom($toModel);
+            } else {
+                $this->syncDataNewRelic($toModel);
+                $this->syncDataAxiom($toModel);
+                $this->syncDataCustom($toModel);
+            }
        }
    }

@ -136,7 +176,7 @@ class LogDrains extends Component
    public function submit(string $type)
    {
        try {
-            $this->syncData(true);
+            $this->syncData(true, $type);
            $this->dispatch('success', 'Settings saved.');
        } catch (\Throwable $e) {
            return handleError($e, $this);
--- a/app/Livewire/Settings/Index.php
+++ b/app/Livewire/Settings/Index.php
@ -53,7 +53,7 @@ class Index extends Component
    #[Validate('string')]
    public string $auto_update_frequency;

-    #[Validate('string')]
+    #[Validate('string|required')]
    public string $update_check_frequency;

    #[Validate('required|string|timezone')]
@ -109,6 +109,13 @@ class Index extends Component

    public function instantSave($isSave = true)
    {
+        $this->validate();
+        if ($this->settings->is_auto_update_enabled === true) {
+            $this->validate([
+                'auto_update_frequency' => ['required', 'string'],
+            ]);
+        }
+
        $this->settings->fqdn = $this->fqdn;
        $this->settings->resale_license = $this->resale_license;
        $this->settings->public_port_min = $this->public_port_min;
--- a/app/Notifications/Application/DeploymentFailed.php
+++ b/app/Notifications/Application/DeploymentFailed.php
@ -4,18 +4,12 @@ namespace App\Notifications\Application;

 use App\Models\Application;
 use App\Models\ApplicationPreview;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class DeploymentFailed extends Notification implements ShouldQueue
+class DeploymentFailed extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    public Application $application;

    public ?ApplicationPreview $preview = null;
--- a/app/Notifications/Application/DeploymentSuccess.php
+++ b/app/Notifications/Application/DeploymentSuccess.php
@ -4,18 +4,12 @@ namespace App\Notifications\Application;

 use App\Models\Application;
 use App\Models\ApplicationPreview;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class DeploymentSuccess extends Notification implements ShouldQueue
+class DeploymentSuccess extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    public Application $application;

    public ?ApplicationPreview $preview = null;
--- a/app/Notifications/Application/StatusChanged.php
+++ b/app/Notifications/Application/StatusChanged.php
@ -3,18 +3,12 @@
 namespace App\Notifications\Application;

 use App\Models\Application;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class StatusChanged extends Notification implements ShouldQueue
+class StatusChanged extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    public string $resource_name;

    public string $project_uuid;
--- a/app/Notifications/Container/ContainerRestarted.php
+++ b/app/Notifications/Container/ContainerRestarted.php
@ -3,18 +3,12 @@
 namespace App\Notifications\Container;

 use App\Models\Server;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class ContainerRestarted extends Notification implements ShouldQueue
+class ContainerRestarted extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    public function __construct(public string $name, public Server $server, public ?string $url = null)
    {
        $this->onQueue('high');
--- a/app/Notifications/Container/ContainerStopped.php
+++ b/app/Notifications/Container/ContainerStopped.php
@ -3,18 +3,12 @@
 namespace App\Notifications\Container;

 use App\Models\Server;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class ContainerStopped extends Notification implements ShouldQueue
+class ContainerStopped extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    public function __construct(public string $name, public Server $server, public ?string $url = null)
    {
        $this->onQueue('high');
--- a/app/Notifications/CustomEmailNotification.php
+++ b/app/Notifications/CustomEmailNotification.php
@ -0,0 +1,18 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Notification;
+
+class CustomEmailNotification extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $backoff = [10, 20, 30, 40, 50];
+
+    public $tries = 5;
+
+    public $maxExceptions = 5;
+}
--- a/app/Notifications/Database/BackupFailed.php
+++ b/app/Notifications/Database/BackupFailed.php
@ -3,20 +3,12 @@
 namespace App\Notifications\Database;

 use App\Models\ScheduledDatabaseBackup;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class BackupFailed extends Notification implements ShouldQueue
+class BackupFailed extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $backoff = 10;
-
-    public $tries = 2;
-
    public string $name;

    public string $frequency;
--- a/app/Notifications/Database/BackupSuccess.php
+++ b/app/Notifications/Database/BackupSuccess.php
@ -3,20 +3,12 @@
 namespace App\Notifications\Database;

 use App\Models\ScheduledDatabaseBackup;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class BackupSuccess extends Notification implements ShouldQueue
+class BackupSuccess extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $backoff = 10;
-
-    public $tries = 3;
-
    public string $name;

    public string $frequency;
@ -24,6 +16,7 @@ class BackupSuccess extends Notification implements ShouldQueue
    public function __construct(ScheduledDatabaseBackup $backup, public $database, public $database_name)
    {
        $this->onQueue('high');
+
        $this->name = $database->name;
        $this->frequency = $backup->frequency;
    }
--- a/app/Notifications/ScheduledTask/TaskFailed.php
+++ b/app/Notifications/ScheduledTask/TaskFailed.php
@ -3,20 +3,12 @@
 namespace App\Notifications\ScheduledTask;

 use App\Models\ScheduledTask;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class TaskFailed extends Notification implements ShouldQueue
+class TaskFailed extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $backoff = 10;
-
-    public $tries = 2;
-
    public ?string $url = null;

    public function __construct(public ScheduledTask $task, public string $output)
--- a/app/Notifications/Server/DockerCleanup.php
+++ b/app/Notifications/Server/DockerCleanup.php
@ -5,17 +5,11 @@ namespace App\Notifications\Server;
 use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Notification;

-class DockerCleanup extends Notification implements ShouldQueue
+class DockerCleanup extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    public function __construct(public Server $server, public string $message)
    {
        $this->onQueue('high');
--- a/app/Notifications/Server/ForceDisabled.php
+++ b/app/Notifications/Server/ForceDisabled.php
@ -6,18 +6,12 @@ use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class ForceDisabled extends Notification implements ShouldQueue
+class ForceDisabled extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    public function __construct(public Server $server)
    {
        $this->onQueue('high');
--- a/app/Notifications/Server/ForceEnabled.php
+++ b/app/Notifications/Server/ForceEnabled.php
@ -6,18 +6,12 @@ use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class ForceEnabled extends Notification implements ShouldQueue
+class ForceEnabled extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    public function __construct(public Server $server)
    {
        $this->onQueue('high');
--- a/app/Notifications/Server/HighDiskUsage.php
+++ b/app/Notifications/Server/HighDiskUsage.php
@ -3,18 +3,12 @@
 namespace App\Notifications\Server;

 use App\Models\Server;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class HighDiskUsage extends Notification implements ShouldQueue
+class HighDiskUsage extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    public function __construct(public Server $server, public int $disk_usage, public int $server_disk_usage_notification_threshold)
    {
        $this->onQueue('high');
--- a/app/Notifications/Server/Reachable.php
+++ b/app/Notifications/Server/Reachable.php
@ -6,18 +6,12 @@ use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class Reachable extends Notification implements ShouldQueue
+class Reachable extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    protected bool $isRateLimited = false;

    public function __construct(public Server $server)
--- a/app/Notifications/Server/Unreachable.php
+++ b/app/Notifications/Server/Unreachable.php
@ -6,18 +6,12 @@ use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class Unreachable extends Notification implements ShouldQueue
+class Unreachable extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
    protected bool $isRateLimited = false;

    public function __construct(public Server $server)
--- a/app/Notifications/TransactionalEmails/InvitationLink.php
+++ b/app/Notifications/TransactionalEmails/InvitationLink.php
@ -6,17 +6,11 @@ use App\Models\Team;
 use App\Models\TeamInvitation;
 use App\Models\User;
 use App\Notifications\Channels\TransactionalEmailChannel;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Notifications\CustomEmailNotification;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class InvitationLink extends Notification implements ShouldQueue
+class InvitationLink extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 5;
-
    public function via(): array
    {
        return [TransactionalEmailChannel::class];
--- a/app/Notifications/TransactionalEmails/Test.php
+++ b/app/Notifications/TransactionalEmails/Test.php
@ -3,17 +3,11 @@
 namespace App\Notifications\TransactionalEmails;

 use App\Notifications\Channels\EmailChannel;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Notifications\CustomEmailNotification;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;

-class Test extends Notification implements ShouldQueue
+class Test extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 5;
-
    public function __construct(public string $emails)
    {
        $this->onQueue('high');
--- a/bootstrap/getVersion.php
+++ b/bootstrap/getVersion.php
@ -1,4 +1,10 @@
 <?php

+// To prevent github actions from failing
+function env()
+{
+    return null;
+}
+
 $version = include 'config/constants.php';
 echo $version['coolify']['version'] ?: 'unknown';
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@ -940,6 +940,15 @@ function generateEnvValue(string $command, Service|Application|null $service = n
        case 'REALBASE64_32':
            $generatedValue = base64_encode(Str::random(32));
            break;
+        case 'HEX_32':
+            $generatedValue = bin2hex(Str::random(32));
+            break;
+        case 'HEX_64':
+            $generatedValue = bin2hex(Str::random(64));
+            break;
+        case 'HEX_128':
+            $generatedValue = bin2hex(Str::random(128));
+            break;
        case 'USER':
            $generatedValue = Str::random(16);
            break;
--- a/config/constants.php
+++ b/config/constants.php
@ -2,7 +2,7 @@

 return [
    'coolify' => [
-        'version' => '4.0.0-beta.372',
+        'version' => '4.0.0-beta.374',
        'self_hosted' => env('SELF_HOSTED', true),
        'autoupdate' => env('AUTOUPDATE'),
        'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
--- a/public/svgs/default.webp
+++ b/public/svgs/default.webp
--- a/resources/css/app.css
+++ b/resources/css/app.css
@ -4,9 +4,23 @@
@tailwind components;
@tailwind utilities;

+html {
+    font-size: 93.75%;
+}
+
+:root {
+    --vh: 1vh;
+}
+
+@screen lg {
+    html {
+        font-size: 87.5%;
+    }
+}
+
 html,
 body {
-    @apply h-full bg-neutral-50 text-neutral-800 dark:bg-base dark:text-neutral-400;
+    @apply h-full bg-neutral-50 text-neutral-800 dark:bg-base dark:text-neutral-400 w-full;
 }

 body {
@ -30,6 +44,14 @@ body {
    @apply text-black dark:bg-coolgray-100 dark:text-white ring-neutral-200 dark:ring-coolgray-300;
 }

+.input-sticky {
+    @apply text-black dark:bg-coolgray-100 dark:text-white ring-neutral-200 dark:ring-coolgray-300 focus:ring-2 dark:focus:ring-coolgray-300 focus:ring-neutral-400 block w-full py-1.5 rounded border-0 text-sm ring-1 ring-inset;
+}
+
+.input-sticky-active {
+    @apply border-2 border-coollabs text-black dark:text-white focus:bg-neutral-200 dark:focus:bg-coolgray-400 focus:border-coollabs;
+}
+
 /* Readonly */
 .input {
    @apply dark:read-only:text-neutral-500 dark:read-only:ring-0 dark:read-only:bg-coolgray-100/40 placeholder:text-neutral-300 dark:placeholder:text-neutral-700 read-only:text-neutral-500 read-only:bg-neutral-200;
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@ -162,7 +162,7 @@
                            <div class="pt-1 text-xs">Nixpacks will detect the required configuration
                                automatically.
                                <a class="underline"
-                                    href="https://coolify.io/docs/resources/applications/index">Framework
+                                    href="https://coolify.io/docs/applications">Framework
                                    Specific Docs</a>
                            </div>
                        @endif
--- a/resources/views/livewire/project/application/source.blade.php
+++ b/resources/views/livewire/project/application/source.blade.php
@ -43,7 +43,7 @@
            <h4 class="py-2 ">Select another Private Key</h4>
            <div class="flex flex-wrap gap-2">
                @foreach ($privateKeys as $key)
-                    <x-forms.button wire:click.defer="setPrivateKey('{{ $key->id }}')">{{ $key->name }}
+                    <x-forms.button wire:click="setPrivateKey('{{ $key->id }}')">{{ $key->name }}
                    </x-forms.button>
                @endforeach
            </div>
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@ -12,9 +12,10 @@
    <div class="pb-4">Deploy resources, like Applications, Databases, Services...</div>
    <div x-data="searchResources()">
        @if ($current_step === 'type')
-            <div class="sticky top-0 z-50 py-2">
-                <input autocomplete="off" x-ref="searchInput" class="input w-full" x-model="search"
-                    placeholder="Type / to search..." @keydown.window.slash.prevent="$refs.searchInput.focus()">
+            <div x-data="{ isSticky: false }" x-init="window.addEventListener('scroll', () => isSticky = window.pageYOffset > 100)" class="sticky top-0 z-50 py-2">
+                <input autocomplete="off" x-ref="searchInput" class="input-sticky"
+                    :class="{ 'input-sticky-active': isSticky }" x-model="search" placeholder="Type / to search..."
+                    @keydown.window.slash.prevent="$refs.searchInput.focus()">
            </div>
            <div x-show="loading">Loading...</div>
            <div x-show="!loading" class="flex flex-col gap-4 py-4">
@ -30,8 +31,7 @@
                                    <span x-html="application.description"></span>
                                </x-slot>
                                <x-slot:logo>
-                                    <img class="w-[4.5rem]
-                            aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 "
+                                    <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 dark:opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 dark:bg-white/10 bg-black/10"
                                        :src="application.logo">
                                </x-slot:logo>
                            </x-resource-view>
@ -47,8 +47,7 @@
                                <x-slot:title><span x-text="application.name"></span></x-slot>
                                <x-slot:description><span x-text="application.description"></span></x-slot>
                                <x-slot:logo> <img
-                                        class="w-[4.5rem]
-                            aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 "
+                                        class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 dark:opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 dark:bg-white/10 bg-black/10 "
                                        :src="application.logo"></x-slot>
                            </x-resource-view>
                        </div>
@ -100,7 +99,7 @@
                                    </x-slot>
                                    <x-slot:logo>
                                        <template x-if="service.logo">
-                                            <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100"
+                                            <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 dark:opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 dark:bg-white/10 bg-black/10"
                                                :src='service.logo'
                                                x-on:error.window="$event.target.src = service.logo_github_url"
                                                onerror="this.onerror=null; this.src=this.getAttribute('data-fallback');"
@ -111,7 +110,7 @@
                                    <x-slot:documentation>
                                        <template x-if="service.documentation">
                                            <div class="flex items-center px-2" title="Read the documentation.">
-                                                <a class="p-2 rounded hover:bg-coolgray-200 hover:no-underline group-hover:dark:text-white text-neutral-600"
+                                                <a class="p-2 rounded hover:bg-gray-100 dark:hover:bg-coolgray-200 hover:no-underline group-hover:dark:text-white text-neutral-600"
                                                    onclick="event.stopPropagation()" :href="service.documentation"
                                                    target="_blank">
                                                    Docs
@ -170,7 +169,8 @@
                            }
                            const filtered = Object.values(items).filter(item => {
                                return (item.name?.toLowerCase().includes(searchLower) ||
-                                    item.description?.toLowerCase().includes(searchLower))
+                                    item.description?.toLowerCase().includes(searchLower) ||
+                                    item.slogan?.toLowerCase().includes(searchLower))
                            })
                            return isSort ? filtered.sort(sortFn) : filtered;
                        },
@ -274,7 +274,7 @@
            16 (default).</div>
        <div class="flex flex-col gap-4">
            <div class="flex flex-col gap-2">
-                <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex"
+                <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex "
                    wire:click="setPostgresqlType('postgres:16-alpine')">
                    <div class="flex flex-col">
                        <div class="box-title">PostgreSQL 16 (default)</div>
--- a/resources/views/livewire/project/service/edit-compose.blade.php
+++ b/resources/views/livewire/project/service/edit-compose.blade.php
@ -13,7 +13,7 @@
        <x-forms.textarea rows="20" readonly id="service.docker_compose">
        </x-forms.textarea>
    </div>
-    <div class="pt-2 w-72">
+    <div class="pt-2 w-96">
        <x-forms.checkbox label="Escape special characters in labels?"
            helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
            id="service.is_container_label_escape_enabled" instantSave></x-forms.checkbox>
--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php
@ -3,7 +3,7 @@
        <div class="flex items-center gap-2">
            <h2>Environment Variables</h2>
            <div class="flex flex-col items-center">
-                <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
+                <x-modal-input buttonTitle="+ Add" title="New Environment Variable" :closeOutside="false">
                    <livewire:project.shared.environment-variable.add />
                </x-modal-input>
            </div>
@ -38,7 +38,7 @@
            <div>Environment (secrets) variables for Production.</div>
        </div>
        @php
-            $requiredEmptyVars = $resource->environment_variables->filter(function($env) {
+            $requiredEmptyVars = $resource->environment_variables->filter(function ($env) {
                return $env->is_required && empty($env->value);
            });
            $otherVars = $resource->environment_variables->diff($requiredEmptyVars);
@ -62,11 +62,13 @@
        @endif
    @else
        <form wire:submit.prevent='submit' class="flex flex-col gap-2">
-            <x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables" wire:model="variables" label="Production Environment Variables"></x-forms.textarea>
+            <x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables" wire:model="variables"
+                label="Production Environment Variables"></x-forms.textarea>

            @if ($showPreview)
-                <x-forms.textarea rows="10" class="whitespace-pre-wrap" label="Preview Deployments Environment Variables"
-                    id="variablesPreview" wire:model="variablesPreview"></x-forms.textarea>
+                <x-forms.textarea rows="10" class="whitespace-pre-wrap"
+                    label="Preview Deployments Environment Variables" id="variablesPreview"
+                    wire:model="variablesPreview"></x-forms.textarea>
            @endif

            <x-forms.button type="submit" class="btn btn-primary">Save All Environment Variables</x-forms.button>
--- a/scripts/install.sh
+++ b/scripts/install.sh
@ -83,6 +83,11 @@ if [ "$OS_TYPE" = "manjaro" ] || [ "$OS_TYPE" = "manjaro-arm" ]; then
    OS_TYPE="arch"
 fi

+# Check if the OS is Endeavour OS, if so, change it to arch
+if [ "$OS_TYPE" = "endeavouros" ]; then
+    OS_TYPE="arch"
+fi
+
 # Check if the OS is Asahi Linux, if so, change it to fedora
 if [ "$OS_TYPE" = "fedora-asahi-remix" ]; then
    OS_TYPE="fedora"
--- a/templates/compose/bluesky-pds.yaml
+++ b/templates/compose/bluesky-pds.yaml
@ -0,0 +1,36 @@
+# ignore: true
+# documentation: https://github.com/bluesky-social/pds
+# slogan: A social network for the decentralized web
+# tags: pds, bluesky, social, network, decentralized
+# logo:
+# port: 3000
+
+services:
+  pds:
+    image: ghcr.io/bluesky-social/pds:0.4
+    volumes:
+      - pds-data:/pds
+    environment:
+      - SERVICE_FQDN_PDS_3000
+      - PDS_JWT_SECRET=${SERVICE_BASE64_PDS}
+      - PDS_ADMIN_PASSWORD=${SERVICE_PASSWORD_PDS}
+      - PDS_ADMIN_EMAIL=${PDS_ADMIN_EMAIL:-admin@example.com}
+      - PDS_DATADIR=${PDS_DATADIR:-/pds}
+      - PDS_BLOBSTORE_DISK_LOCATION=${PDS_DATADIR:-/pds}/blocks
+      - PDS_BLOB_UPLOAD_LIMIT=${PDS_BLOB_UPLOAD_LIMIT:-52428800}
+      - PDS_HOSTNAME=${SERVICE_URL_PDS}
+      - PDS_DID_PLC_URL=https://plc.directory
+      - PDS_BSKY_APP_VIEW_URL=https://api.bsky.app
+      - PDS_BSKY_APP_VIEW_DID=did:web:api.bsky.app
+      - PDS_REPORT_SERVICE_URL=https://mod.bsky.app
+      - PDS_REPORT_SERVICE_DID=did:plc:ar7c4by46qjdydhdevvrndac
+      - PDS_CRAWLERS=https://bsky.network
+      - LOG_ENABLED=${LOG_ENABLED:-true}
+      - PDS_EMAIL_SMTP_URL=${PDS_EMAIL_SMTP_URL:-smtp://localhost:8025}
+      - PDS_EMAIL_FROM_ADDRESS=${PDS_EMAIL_FROM_ADDRESS:-admin@example.com}
+      - PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=${SERVICE_HEX_32_ROTATIONKEY}
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "http://127.0.0.1:3000/xrpc/_health"]
+      interval: 2s
+      timeout: 10s
+      retries: 10
--- a/templates/compose/budibase.yaml
+++ b/templates/compose/budibase.yaml
@ -9,11 +9,11 @@ services:
    image: budibase.docker.scarf.sh/budibase/apps
    environment:
      - SELF_HOSTED=1
-      - COUCH_DB_URL=http://$SERVICE_USER_BUDIBASE_COUCHDB:$SERVICE_PASSWORD_BUDIBASE_COUCHDB@couchdb-service:5984
+      - COUCH_DB_URL=http://$SERVICE_USER_COUCHDB:$SERVICE_PASSWORD_COUCHDB@couchdb-service:5984
      - WORKER_URL=http://worker-service:4003
      - MINIO_URL=http://minio-service:9000
-      - MINIO_ACCESS_KEY=$SERVICE_USER_BUDIBASE_MINIO
-      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_BUDIBASE_MINIO
+      - MINIO_ACCESS_KEY=$SERVICE_USER_MINIO
+      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_MINIO
      - INTERNAL_API_KEY=$SERVICE_BASE64_128_BUDIBASE
      - BUDIBASE_ENVIRONMENT=${BUDIBASE_ENVIRONMENT:-PRODUCTION}
      - PORT=4002
@ -22,14 +22,14 @@ services:
      - LOG_LEVEL=info
      - ENABLE_ANALYTICS=${ENABLE_ANALYTICS:-true}
      - REDIS_URL=redis-service:6379
-      - REDIS_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_REDIS
+      - REDIS_PASSWORD=$SERVICE_PASSWORD_REDIS
      - BB_ADMIN_USER_EMAIL=
      - BB_ADMIN_USER_PASSWORD=
    depends_on:
      - worker-service
      - redis-service
    healthcheck:
-      test: ["CMD", "curl", "-f", "http://app-service:4002"]
+      test: ["CMD", "wget", "--spider", "-qO-", "http://localhost:4002/health"]
      interval: 15s
      timeout: 15s
      retries: 5
@ -43,21 +43,21 @@ services:
      - CLUSTER_PORT=10000
      - API_ENCRYPTION_KEY=$SERVICE_BASE64_64_BUDIBASE
      - JWT_SECRET=$SERVICE_BASE64_64_BUDIBASE
-      - MINIO_ACCESS_KEY=$SERVICE_USER_BUDIBASE_MINIO
-      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_BUDIBASE_MINIO
+      - MINIO_ACCESS_KEY=$SERVICE_USER_MINIO
+      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_MINIO
      - MINIO_URL=http://minio-service:9000
      - APPS_URL=http://app-service:4002
-      - COUCH_DB_USERNAME=$SERVICE_USER_BUDIBASE_COUCHDB
-      - COUCH_DB_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_COUCHDB
-      - COUCH_DB_URL=http://$SERVICE_USER_BUDIBASE_COUCHDB:$SERVICE_PASSWORD_BUDIBASE_COUCHDB@couchdb-service:5984
+      - COUCH_DB_USERNAME=$SERVICE_USER_COUCHDB
+      - COUCH_DB_PASSWORD=$SERVICE_PASSWORD_COUCHDB
+      - COUCH_DB_URL=http://$SERVICE_USER_COUCHDB:$SERVICE_PASSWORD_COUCHDB@couchdb-service:5984
      - INTERNAL_API_KEY=$SERVICE_BASE64_128_BUDIBASE
      - REDIS_URL=redis-service:6379
-      - REDIS_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_REDIS
+      - REDIS_PASSWORD=$SERVICE_PASSWORD_REDIS
    depends_on:
      - redis-service
      - minio-service
    healthcheck:
-      test: ["CMD", "curl", "-f", "http://worker-service:4003"]
+      test: ["CMD", "wget", "--spider", "-qO-", "http://localhost:4003/health"]
      interval: 15s
      timeout: 15s
      retries: 5
@ -68,8 +68,8 @@ services:
    volumes:
      - minio_data:/data
    environment:
-      - MINIO_ACCESS_KEY=$SERVICE_USER_BUDIBASE_MINIO
-      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_BUDIBASE_MINIO
+      - MINIO_ROOT_USER=$SERVICE_USER_MINIO
+      - MINIO_ROOT_PASSWORD=$SERVICE_PASSWORD_MINIO
      - MINIO_BROWSER=off
    command: server /data --console-address ":9001"
    healthcheck:
@ -105,8 +105,8 @@ services:
  couchdb-service:
    image: budibase/couchdb
    environment:
-      - COUCHDB_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_COUCHDB
-      - COUCHDB_USER=$SERVICE_USER_BUDIBASE_COUCHDB
+      - COUCHDB_PASSWORD=$SERVICE_PASSWORD_COUCHDB
+      - COUCHDB_USER=$SERVICE_USER_COUCHDB
      - TARGETBUILD=docker-compose
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:5984/"]
@ -119,12 +119,12 @@ services:

  redis-service:
    image: redis
-    command: redis-server --requirepass "$SERVICE_PASSWORD_BUDIBASE_REDIS"
+    command: redis-server --requirepass "$SERVICE_PASSWORD_REDIS"
    volumes:
      - redis_data:/data
    healthcheck:
      test:
-        ["CMD", "redis-cli", "-a", "$SERVICE_PASSWORD_BUDIBASE_REDIS", "ping"]
+        ["CMD", "redis-cli", "-a", "$SERVICE_PASSWORD_REDIS", "ping"]
      interval: 15s
      timeout: 15s
      retries: 5
@ -138,13 +138,8 @@ services:
    command: --debug --http-api-update bbapps bbworker bbproxy
    environment:
      - WATCHTOWER_HTTP_API=true
-      - WATCHTOWER_HTTP_API_TOKEN=$SERVICE_PASSWORD_BUDIBASE_WATCHTOWER
+      - WATCHTOWER_HTTP_API_TOKEN=$SERVICE_PASSWORD_WATCHTOWER
      - WATCHTOWER_CLEANUP=true
    labels:
      - "com.centurylinklabs.watchtower.enable=false"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://watchtower-service:8080"]
-      interval: 15s
-      timeout: 15s
-      retries: 5
-      start_period: 10s
+    exclude_from_hc: true
--- a/templates/compose/formbricks.yaml
+++ b/templates/compose/formbricks.yaml
@ -12,10 +12,10 @@ services:
      - WEBAPP_URL=$SERVICE_FQDN_FORMBRICKS
      - DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgresql:5432/${POSTGRESQL_DATABASE:-formbricks}
      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
-      - NEXTAUTH_SECRET=$SERVICE_BASE64_64_NEXTAUTH
+      - NEXTAUTH_SECRET=$SERVICE_BASE64_NEXTAUTH
      - NEXTAUTH_URL=$SERVICE_FQDN_FORMBRICKS
-      - ENCRYPTION_KEY=$SERVICE_BASE64_64_ENCRYPTION
-      - CRON_SECRET=$SERVICE_BASE64_64_CRON
+      - ENCRYPTION_KEY=$SERVICE_BASE64_ENCRYPTION
+      - CRON_SECRET=$SERVICE_BASE64_CRON
      - ENTERPRISE_LICENSE_KEY=${ENTERPRISE_LICENSE_KEY}
      - MAIL_FROM=${MAIL_FROM:-test@example.com}
      - SMTP_HOST=${SMTP_HOST:-test.example.com}
@ -59,7 +59,7 @@ services:
      - REDIS_URL=${REDIS_URL}
      - REDIS_HTTP_URL=${REDIS_HTTP_URL}
      - DEFAULT_ORGANIZATION_ID=${DEFAULT_ORGANIZATION_ID}
-      - DEFAULT_ORGANIZATION_ROLE=${DEFAULT_ORGANIZATION_ROLE:-admin}
+      - DEFAULT_ORGANIZATION_ROLE=${DEFAULT_ORGANIZATION_ROLE:-owner}
    volumes:
      - formbricks-uploads:/apps/web/uploads/
    depends_on:
@ -72,7 +72,7 @@ services:
      retries: 15

  postgresql:
-    image: postgres:16-alpine
+    image: pgvector/pgvector:pg16
    volumes:
      - formbricks-postgresql-data:/var/lib/postgresql/data
    environment:
--- a/templates/compose/macos.yaml
+++ b/templates/compose/macos.yaml
@ -1,3 +1,4 @@
+# ignore: true
 # documentation: https://github.com/dockur/macos
 # slogan: Run macOS in a containerized environment.
 # tags: macos, virtualization, container, os
@ -12,6 +13,8 @@ services:
    environment:
      - SERVICE_FQDN_MACOS_8006
      - VERSION=15
+    devices:
+      - /dev/kvm:/dev/kvm
    cap_add:
      - NET_ADMIN
    stop_grace_period: 2m
--- a/templates/compose/next-image-transformation.yaml
+++ b/templates/compose/next-image-transformation.yaml
@ -1,6 +1,7 @@
 # documentation: https://github.com/coollabsio/next-image-transformation
 # slogan: Drop-in replacement for Vercel's Nextjs image optimization service.
 # tags: nextjs,image,transformation,service
+# logo: svgs/coolify.png
 # port: 3000

 services:
--- a/templates/compose/postiz.yaml
+++ b/templates/compose/postiz.yaml
@ -13,9 +13,8 @@ services:
      - FRONTEND_URL=${SERVICE_FQDN_POSTIZ}
      - NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZ}/api
      - JWT_SECRET=${SERVICE_PASSWORD_JWTSECRET}
-      - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRESQL}:${SERVICE_PASSWORD_POSTGRESQL}@postgres:5432/${POSTGRESQL_DATABASE:-postiz-db}
-      # Changed Redis URL to use default username
-      - REDIS_URL=redis://${SERVICE_USER_REDIS}:${SERVICE_PASSWORD_REDIS}@redis:6379
+      - DATABASE_URL=postgresql://postgres:${SERVICE_PASSWORD_POSTGRESQL}@postgres:5432/${POSTGRESQL_DATABASE:-postiz-db}
+      - REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379
      - BACKEND_INTERNAL_URL=http://localhost:3000
      
      # Cloudflare R2 Settings
@ -75,7 +74,7 @@ services:
      # Misc Settings
      - NEXT_PUBLIC_DISCORD_SUPPORT=${NEXT_PUBLIC_DISCORD_SUPPORT}
      - NEXT_PUBLIC_POLOTNO=${NEXT_PUBLIC_POLOTNO}
-      - IS_GENERAL=${IS_GENERAL:-true}
+      - IS_GENERAL=true
      - NX_ADD_PLUGINS=${NX_ADD_PLUGINS:-false}
      
      # Payment Settings
@ -106,13 +105,11 @@ services:
    volumes:
      - postiz_postgresql_data:/var/lib/postgresql/data
    environment:
-      - POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
+      - POSTGRES_USER=postgres
      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
      - POSTGRES_DB=${POSTGRESQL_DATABASE:-postiz-db}
    healthcheck:
-      test:
-        - CMD-SHELL
-        - pg_isready -U ${SERVICE_USER_POSTGRESQL} -d ${POSTGRESQL_DATABASE:-postiz-db}
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB:-postiz-db}"]
      interval: 5s
      timeout: 20s
      retries: 10
@ -121,7 +118,6 @@ services:
    image: redis:7.2
    environment:
      - REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}
-      - REDIS_USER=${SERVICE_USER_REDIS}
    command: redis-server --requirepass ${SERVICE_PASSWORD_REDIS}
    volumes:
      - postiz_redis_data:/data
--- a/templates/compose/windows.yaml
+++ b/templates/compose/windows.yaml
@ -1,3 +1,4 @@
+# ignore: true
 # documentation: https://github.com/dockur/windows
 # slogan: Run Windows in a containerized environment.
 # tags: windows, virtualization, container, os
@ -12,6 +13,8 @@ services:
    environment:
      - SERVICE_FQDN_WINDOWS_8006
      - VERSION=11
+    devices:
+      - /dev/kvm:/dev/kvm
    cap_add:
      - NET_ADMIN
    stop_grace_period: 2m
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@ -666,7 +666,7 @@
            "tv",
            "music"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0",
        "port": "6555"
    },
@ -1140,7 +1140,7 @@
            "applications",
            "interface"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0"
    },
    "heyform": {
@ -1266,7 +1266,7 @@
            "finance",
            "self-hosted"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0",
        "port": "9000"
    },
@ -1432,7 +1432,7 @@
            "geofencing",
            "low-code"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0",
        "port": "7512"
    },
@ -1738,7 +1738,7 @@
            "videos",
            "playlist"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0",
        "port": "8081"
    },
@ -2126,7 +2126,7 @@
            "collaboration",
            "teamwork"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0",
        "port": "3000"
    },
@ -2151,7 +2151,7 @@
            "open",
            "source"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0"
    },
    "phpmyadmin": {
@ -2422,7 +2422,7 @@
            "link",
            "sharing"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0",
        "port": "8080"
    },
@ -2439,7 +2439,7 @@
            "link",
            "sharing"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0",
        "port": "5231"
    },
@ -2455,7 +2455,7 @@
            "network",
            "internet"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0"
    },
    "soketi": {
@ -2926,7 +2926,7 @@
            "privacy",
            "search engine"
        ],
-        "logo": "svgs/coolify.png",
+        "logo": "svgs/default.webp",
        "minversion": "0.0.0",
        "port": "5000"
    },
@ -3040,5 +3040,20 @@
        "logo": "svgs/zipline.png",
        "minversion": "0.0.0",
        "port": "3000"
+    },
+    "convertx": {
+        "documentation": "https://github.com/C4illin/ConvertX?utm_source=coolify.io",
+        "slogan": "A self-hosted online file converter. Supports over a thousand different formats.",
+        "compose": "c2VydmljZXM6CiAgY29udmVydHg6CiAgICBpbWFnZTogJ2doY3IuaW8vYzRpbGxpbi9jb252ZXJ0eDpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fQ09OVkVSVFgKICAgICAgLSAnQUNDT1VOVF9SRUdJU1RSQVRJT049JHtBQ0NPVU5UX1JFR0lTVFJBVElPTjotZmFsc2V9JwogICAgICAtICdIVFRQX0FMTE9XRUQ9JHtIVFRQX0FMTE9XRUQ6LXRydWV9JwogICAgICAtICdBTExPV19VTkFVVEhFTlRJQ0FURUQ9JHtBTExPV19VTkFVVEhFTlRJQ0FURUQ6LWZhbHNlfScKICAgICAgLSAnQVVUT19ERUxFVEVfRVZFUllfTl9IT1VSUz0ke0FVVE9fREVMRVRFX0VWRVJZX05fSE9VUlM6LTI0fScKICAgICAgLSAnSldUX1NFQ1JFVD0ke1NFUlZJQ0VfUEFTU1dPUkRfQ09OVkVSVFhKV1RTRUNSRVR9JwogICAgdm9sdW1lczoKICAgICAgLSAnY29udmVydHhfZGF0YTovYXBwL2RhdGEnCg==",
+        "tags": [
+            "converter",
+            "file",
+            "documents",
+            "files",
+            "directories"
+        ],
+        "logo": "svgs/convertx.png",
+        "minversion": "0.0.0",
+        "port": "3000"
    }
 }
--- a/versions.json
+++ b/versions.json
@ -1,10 +1,10 @@
 {
    "coolify": {
        "v4": {
-            "version": "4.0.0-beta.372"
+            "version": "4.0.0-beta.374"
        },
        "nightly": {
-            "version": "4.0.0-beta.373"
+            "version": "4.0.0-beta.375"
        },
        "helper": {
            "version": "1.0.4"