diff --git a/README.md b/README.md
index dac48d127..56edffd31 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,8 @@ Special thanks to our biggest sponsors!
 
 ### Special Sponsors
 
-![image](https://github.com/user-attachments/assets/726fb63e-c3b8-4260-b3ac-06780605ec5d)
+![image](https://github.com/user-attachments/assets/6022bc9c-8435-4d14-9497-8be230ed8cb1)
+
 
 * [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.
@@ -52,7 +53,9 @@ Special thanks to our biggest sponsors!
 * [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.
+* [Cloudify.ro](https://cloudify.ro/?ref=coolify.io) - A cloud hosting provider offering scalable infrastructure solutions for businesses of all sizes.
+* [Syntaxfm](https://syntax.fm/?ref=coolify.io) - Podcast for web developers.
+* [PFGlabs](https://pfglabs.com/?ref=coolify.io) - Build real project with Golang.
 * [Treive](https://trieve.ai/?ref=coolify.io) - An AI-powered search and discovery platform for enhancing information retrieval in large datasets.
 * [Blacksmith](https://blacksmith.sh/?ref=coolify.io) - A cloud-native platform for automating infrastructure provisioning and management across multiple cloud providers.
 * [Brand Dev](https://brand.dev/?ref=coolify.io) - A web development agency specializing in creating custom digital experiences and brand identities.
@@ -92,6 +95,9 @@ Special thanks to our biggest sponsors!
 <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://startupfa.me?utm_source=coolify.io"><img src="https://github.com/startupfame.png" width="60px" alt="StartupFame" /></a>
+<a href="https://bsky.app/profile/jyc.dev"><img src="https://github.com/jycouet.png" width="60px" alt="jyc.dev" /></a>
+<a href="https://bitlaunch.io/?utm_source=coolify.io"><img src="https://github.com/bitlaunchio.png" width="60px" alt="BitLaunch" /></a>
+<a href="https://internetgarden.co/?utm_source=coolify.io"><img src="./other/logos/internetgarden.ico" width="60px" alt="Internet Garden" /></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>
 <a href="https://evercam.io/?utm_source=coolify.io"><img src="https://github.com/evercam.png" width="60px" alt="Evercam" /></a>
diff --git a/app/Console/Commands/Migration.php b/app/Console/Commands/Migration.php
new file mode 100644
index 000000000..44c17203b
--- /dev/null
+++ b/app/Console/Commands/Migration.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class Migration extends Command
+{
+    protected $signature = 'start:migration';
+
+    protected $description = 'Start Migration';
+
+    public function handle()
+    {
+        if (config('constants.migration.is_migration_enabled')) {
+            $this->info('Migration is enabled on this server.');
+            $this->call('migrate', ['--force' => true, '--isolated' => true]);
+            exit(0);
+        } else {
+            $this->info('Migration is disabled on this server.');
+            exit(0);
+        }
+    }
+}
diff --git a/app/Console/Commands/NotifyDemo.php b/app/Console/Commands/NotifyDemo.php
index f0131b7b2..990a03869 100644
--- a/app/Console/Commands/NotifyDemo.php
+++ b/app/Console/Commands/NotifyDemo.php
@@ -59,9 +59,10 @@ class NotifyDemo extends Command
                 <div class="text-yellow-500"> Channels: </div>
                 <ul class="text-coolify">
                     <li>email</li>
-                    <li>slack</li>
                     <li>discord</li>
                     <li>telegram</li>
+                    <li>slack</li>
+                    <li>pushover</li>
                 </ul>
             </div>
         </div>
@@ -72,6 +73,6 @@ class NotifyDemo extends Command
         <div class="mr-1">
             In which manner you wish a <strong class="text-coolify">coolified</strong> notification?
         </div>
-        HTML, ['email', 'slack', 'discord', 'telegram']);
+        HTML, ['email', 'discord', 'telegram', 'slack', 'pushover']);
     }
 }
diff --git a/app/Console/Commands/Seeder.php b/app/Console/Commands/Seeder.php
new file mode 100644
index 000000000..e37b6a9d2
--- /dev/null
+++ b/app/Console/Commands/Seeder.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class Seeder extends Command
+{
+    protected $signature = 'start:seeder';
+
+    protected $description = 'Start Seeder';
+
+    public function handle()
+    {
+        if (config('constants.seeder.is_seeder_enabled')) {
+            $this->info('Seeder is enabled on this server.');
+            $this->call('db:seed', ['--class' => 'ProductionSeeder', '--force' => true]);
+            exit(0);
+        } else {
+            $this->info('Seeder is disabled on this server.');
+            exit(0);
+        }
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 19d22ae21..2ed3ee454 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -218,7 +218,7 @@ class Kernel extends ConsoleKernel
                 }
             }
             if ($service) {
-                if (str($service->status())->contains('running') === false) {
+                if (str($service->status)->contains('running') === false) {
                     continue;
                 }
             }
diff --git a/app/Http/Controllers/Api/ResourcesController.php b/app/Http/Controllers/Api/ResourcesController.php
index 4180cef9a..ad12c83ab 100644
--- a/app/Http/Controllers/Api/ResourcesController.php
+++ b/app/Http/Controllers/Api/ResourcesController.php
@@ -53,11 +53,7 @@ class ResourcesController extends Controller
         $resources = $resources->flatten();
         $resources = $resources->map(function ($resource) {
             $payload = $resource->toArray();
-            if ($resource->getMorphClass() === \App\Models\Service::class) {
-                $payload['status'] = $resource->status();
-            } else {
-                $payload['status'] = $resource->status;
-            }
+            $payload['status'] = $resource->status;
             $payload['type'] = $resource->type();
 
             return $payload;
diff --git a/app/Http/Controllers/Api/ServersController.php b/app/Http/Controllers/Api/ServersController.php
index f37040bdd..b1deb5321 100644
--- a/app/Http/Controllers/Api/ServersController.php
+++ b/app/Http/Controllers/Api/ServersController.php
@@ -154,11 +154,7 @@ class ServersController extends Controller
                     'created_at' => $resource->created_at,
                     'updated_at' => $resource->updated_at,
                 ];
-                if ($resource->type() === 'service') {
-                    $payload['status'] = $resource->status();
-                } else {
-                    $payload['status'] = $resource->status;
-                }
+                $payload['status'] = $resource->status;
 
                 return $payload;
             });
@@ -237,11 +233,7 @@ class ServersController extends Controller
                 'created_at' => $resource->created_at,
                 'updated_at' => $resource->updated_at,
             ];
-            if ($resource->type() === 'service') {
-                $payload['status'] = $resource->status();
-            } else {
-                $payload['status'] = $resource->status;
-            }
+            $payload['status'] = $resource->status;
 
             return $payload;
         });
diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php
index e6b7e9854..bcaba7107 100644
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/app/Http/Controllers/Api/ServicesController.php
@@ -25,6 +25,8 @@ class ServicesController extends Controller
             $service->makeHidden([
                 'docker_compose_raw',
                 'docker_compose',
+                'value',
+                'real_value',
             ]);
         }
 
@@ -1070,7 +1072,7 @@ class ServicesController extends Controller
         if (! $service) {
             return response()->json(['message' => 'Service not found.'], 404);
         }
-        if (str($service->status())->contains('running')) {
+        if (str($service->status)->contains('running')) {
             return response()->json(['message' => 'Service is already running.'], 400);
         }
         StartService::dispatch($service);
@@ -1148,7 +1150,7 @@ class ServicesController extends Controller
         if (! $service) {
             return response()->json(['message' => 'Service not found.'], 404);
         }
-        if (str($service->status())->contains('stopped') || str($service->status())->contains('exited')) {
+        if (str($service->status)->contains('stopped') || str($service->status)->contains('exited')) {
             return response()->json(['message' => 'Service is already stopped.'], 400);
         }
         StopService::dispatch($service);
diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index 06aec5e49..6730dceb7 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -32,8 +32,6 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 
     public Server $server;
 
-    public ScheduledDatabaseBackup $backup;
-
     public StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database;
 
     public ?string $container_name = null;
@@ -58,10 +56,9 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 
     public ?S3Storage $s3 = null;
 
-    public function __construct($backup)
+    public function __construct(public ScheduledDatabaseBackup $backup)
     {
         $this->onQueue('high');
-        $this->backup = $backup;
     }
 
     public function handle(): void
diff --git a/app/Jobs/SendMessageToPushoverJob.php b/app/Jobs/SendMessageToPushoverJob.php
new file mode 100644
index 000000000..834a32b07
--- /dev/null
+++ b/app/Jobs/SendMessageToPushoverJob.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Notifications\Dto\PushoverMessage;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Http;
+
+class SendMessageToPushoverJob implements ShouldBeEncrypted, ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 5;
+
+    public $backoff = 10;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     */
+    public int $maxExceptions = 5;
+
+    public function __construct(
+        public PushoverMessage $message,
+        public string $token,
+        public string $user,
+    ) {
+        $this->onQueue('high');
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $response = Http::post('https://api.pushover.net/1/messages.json', $this->message->toPayload($this->token, $this->user));
+        if ($response->failed()) {
+            throw new \RuntimeException('Pushover notification failed with ' . $response->status() . ' status code.' . $response->body());
+        }
+    }
+}
diff --git a/app/Jobs/SendMessageToTelegramJob.php b/app/Jobs/SendMessageToTelegramJob.php
index 85f4fc934..6b0a64ae3 100644
--- a/app/Jobs/SendMessageToTelegramJob.php
+++ b/app/Jobs/SendMessageToTelegramJob.php
@@ -32,7 +32,7 @@ class SendMessageToTelegramJob implements ShouldBeEncrypted, ShouldQueue
         public array $buttons,
         public string $token,
         public string $chatId,
-        public ?string $topicId = null,
+        public ?string $threadId = null,
     ) {
         $this->onQueue('high');
     }
@@ -67,8 +67,8 @@ class SendMessageToTelegramJob implements ShouldBeEncrypted, ShouldQueue
             'chat_id' => $this->chatId,
             'text' => $this->text,
         ];
-        if ($this->topicId) {
-            $payload['message_thread_id'] = $this->topicId;
+        if ($this->threadId) {
+            $payload['message_thread_id'] = $this->threadId;
         }
         $response = Http::post($url, $payload);
         if ($response->failed()) {
diff --git a/app/Jobs/StripeProcessJob.php b/app/Jobs/StripeProcessJob.php
index 00c9b6d18..d61c738f4 100644
--- a/app/Jobs/StripeProcessJob.php
+++ b/app/Jobs/StripeProcessJob.php
@@ -173,8 +173,8 @@ class StripeProcessJob implements ShouldQueue
                     $userId = data_get($data, 'metadata.user_id');
                     $customerId = data_get($data, 'customer');
                     $status = data_get($data, 'status');
-                    $subscriptionId = data_get($data, 'items.data.0.subscription');
-                    $planId = data_get($data, 'items.data.0.plan.id');
+                    $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.');
                         break;
@@ -218,9 +218,18 @@ class StripeProcessJob implements ShouldQueue
                         'stripe_cancel_at_period_end' => $cancelAtPeriodEnd,
                     ]);
                     if ($status === 'paused' || $status === 'incomplete_expired') {
-                        $subscription->update([
-                            'stripe_invoice_paid' => false,
-                        ]);
+                        if ($subscription->stripe_subscription_id === $subscriptionId) {
+                            $subscription->update([
+                                'stripe_invoice_paid' => false,
+                            ]);
+                        }
+                    }
+                    if ($status === 'active') {
+                        if ($subscription->stripe_subscription_id === $subscriptionId) {
+                            $subscription->update([
+                                'stripe_invoice_paid' => true,
+                            ]);
+                        }
                     }
                     if ($feedback) {
                         $reason = "Cancellation feedback for {$customerId}: '".$feedback."'";
@@ -228,13 +237,24 @@ class StripeProcessJob implements ShouldQueue
                             $reason .= ' with comment: \''.$comment."'";
                         }
                     }
+
                     break;
                 case 'customer.subscription.deleted':
-                    // End subscription
                     $customerId = data_get($data, 'customer');
-                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
-                    $team = data_get($subscription, 'team');
-                    $team?->subscriptionEnded();
+                    $subscriptionId = data_get($data, 'id');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->where('stripe_subscription_id', $subscriptionId)->first();
+                    if ($subscription) {
+                        $team = data_get($subscription, 'team');
+                        if ($team) {
+                            $team->subscriptionEnded();
+                        } else {
+                            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);
+                        throw new \RuntimeException("No subscription found in Coolify for customer: {$customerId}");
+                    }
                     break;
                 default:
                     throw new \RuntimeException("Unhandled event type: {$type}");
diff --git a/app/Livewire/Admin/Index.php b/app/Livewire/Admin/Index.php
index 359db6329..b5f6d2929 100644
--- a/app/Livewire/Admin/Index.php
+++ b/app/Livewire/Admin/Index.php
@@ -21,16 +21,28 @@ class Index extends Component
 
     public function mount()
     {
-        if (! isCloud()) {
+        if (! isCloud() && ! isDev()) {
             return redirect()->route('dashboard');
         }
-
-        if (Auth::id() !== 0) {
+        if (Auth::id() !== 0 && ! session('impersonating')) {
             return redirect()->route('dashboard');
         }
         $this->getSubscribers();
     }
 
+    public function back()
+    {
+        if (session('impersonating')) {
+            session()->forget('impersonating');
+            $user = User::find(0);
+            $team_to_switch_to = $user->teams->first();
+            Auth::login($user);
+            refreshSession($team_to_switch_to);
+
+            return redirect(request()->header('Referer'));
+        }
+    }
+
     public function submitSearch()
     {
         if ($this->search !== '') {
@@ -52,9 +64,10 @@ class Index extends Component
         if (Auth::id() !== 0) {
             return redirect()->route('dashboard');
         }
+        session(['impersonating' => true]);
         $user = User::find($user_id);
         $team_to_switch_to = $user->teams->first();
-        Cache::forget("team:{$user->id}");
+        // Cache::forget("team:{$user->id}");
         Auth::login($user);
         refreshSession($team_to_switch_to);
 
diff --git a/app/Livewire/Notifications/Email.php b/app/Livewire/Notifications/Email.php
index dc2a95e84..eac48cf77 100644
--- a/app/Livewire/Notifications/Email.php
+++ b/app/Livewire/Notifications/Email.php
@@ -14,8 +14,10 @@ class Email extends Component
 {
     protected $listeners = ['refresh' => '$refresh'];
 
+    #[Locked]
     public Team $team;
 
+    #[Locked]
     public EmailNotificationSettings $settings;
 
     #[Locked]
diff --git a/app/Livewire/Notifications/Pushover.php b/app/Livewire/Notifications/Pushover.php
new file mode 100644
index 000000000..f1e4c464d
--- /dev/null
+++ b/app/Livewire/Notifications/Pushover.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace App\Livewire\Notifications;
+
+use App\Models\PushoverNotificationSettings;
+use App\Models\Team;
+use App\Notifications\Test;
+use Livewire\Attributes\Locked;
+use Livewire\Attributes\Validate;
+use Livewire\Component;
+
+class Pushover extends Component
+{
+    protected $listeners = ['refresh' => '$refresh'];
+
+    #[Locked]
+    public Team $team;
+
+    #[Locked]
+    public PushoverNotificationSettings $settings;
+
+    #[Validate(['boolean'])]
+    public bool $pushoverEnabled = false;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $pushoverUserKey = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $pushoverApiToken = null;
+
+    #[Validate(['boolean'])]
+    public bool $deploymentSuccessPushoverNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $deploymentFailurePushoverNotifications = true;
+
+    #[Validate(['boolean'])]
+    public bool $statusChangePushoverNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $backupSuccessPushoverNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $backupFailurePushoverNotifications = true;
+
+    #[Validate(['boolean'])]
+    public bool $scheduledTaskSuccessPushoverNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $scheduledTaskFailurePushoverNotifications = true;
+
+    #[Validate(['boolean'])]
+    public bool $dockerCleanupSuccessPushoverNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $dockerCleanupFailurePushoverNotifications = true;
+
+    #[Validate(['boolean'])]
+    public bool $serverDiskUsagePushoverNotifications = true;
+
+    #[Validate(['boolean'])]
+    public bool $serverReachablePushoverNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $serverUnreachablePushoverNotifications = true;
+
+    public function mount()
+    {
+        try {
+            $this->team = auth()->user()->currentTeam();
+            $this->settings = $this->team->pushoverNotificationSettings;
+            $this->syncData();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function syncData(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->validate();
+            $this->settings->pushover_enabled = $this->pushoverEnabled;
+            $this->settings->pushover_user_key = $this->pushoverUserKey;
+            $this->settings->pushover_api_token = $this->pushoverApiToken;
+
+            $this->settings->deployment_success_pushover_notifications = $this->deploymentSuccessPushoverNotifications;
+            $this->settings->deployment_failure_pushover_notifications = $this->deploymentFailurePushoverNotifications;
+            $this->settings->status_change_pushover_notifications = $this->statusChangePushoverNotifications;
+            $this->settings->backup_success_pushover_notifications = $this->backupSuccessPushoverNotifications;
+            $this->settings->backup_failure_pushover_notifications = $this->backupFailurePushoverNotifications;
+            $this->settings->scheduled_task_success_pushover_notifications = $this->scheduledTaskSuccessPushoverNotifications;
+            $this->settings->scheduled_task_failure_pushover_notifications = $this->scheduledTaskFailurePushoverNotifications;
+            $this->settings->docker_cleanup_success_pushover_notifications = $this->dockerCleanupSuccessPushoverNotifications;
+            $this->settings->docker_cleanup_failure_pushover_notifications = $this->dockerCleanupFailurePushoverNotifications;
+            $this->settings->server_disk_usage_pushover_notifications = $this->serverDiskUsagePushoverNotifications;
+            $this->settings->server_reachable_pushover_notifications = $this->serverReachablePushoverNotifications;
+            $this->settings->server_unreachable_pushover_notifications = $this->serverUnreachablePushoverNotifications;
+
+            $this->settings->save();
+            refreshSession();
+        } else {
+            $this->pushoverEnabled = $this->settings->pushover_enabled;
+            $this->pushoverUserKey = $this->settings->pushover_user_key;
+            $this->pushoverApiToken = $this->settings->pushover_api_token;
+
+            $this->deploymentSuccessPushoverNotifications = $this->settings->deployment_success_pushover_notifications;
+            $this->deploymentFailurePushoverNotifications = $this->settings->deployment_failure_pushover_notifications;
+            $this->statusChangePushoverNotifications = $this->settings->status_change_pushover_notifications;
+            $this->backupSuccessPushoverNotifications = $this->settings->backup_success_pushover_notifications;
+            $this->backupFailurePushoverNotifications = $this->settings->backup_failure_pushover_notifications;
+            $this->scheduledTaskSuccessPushoverNotifications = $this->settings->scheduled_task_success_pushover_notifications;
+            $this->scheduledTaskFailurePushoverNotifications = $this->settings->scheduled_task_failure_pushover_notifications;
+            $this->dockerCleanupSuccessPushoverNotifications = $this->settings->docker_cleanup_success_pushover_notifications;
+            $this->dockerCleanupFailurePushoverNotifications = $this->settings->docker_cleanup_failure_pushover_notifications;
+            $this->serverDiskUsagePushoverNotifications = $this->settings->server_disk_usage_pushover_notifications;
+            $this->serverReachablePushoverNotifications = $this->settings->server_reachable_pushover_notifications;
+            $this->serverUnreachablePushoverNotifications = $this->settings->server_unreachable_pushover_notifications;
+        }
+    }
+
+    public function instantSavePushoverEnabled()
+    {
+        try {
+            $this->validate([
+                'pushoverUserKey' => 'required',
+                'pushoverApiToken' => 'required',
+            ], [
+                'pushoverUserKey.required' => 'Pushover User Key is required.',
+                'pushoverApiToken.required' => 'Pushover API Token is required.',
+            ]);
+            $this->saveModel();
+        } catch (\Throwable $e) {
+            $this->pushoverEnabled = false;
+
+            return handleError($e, $this);
+        } finally {
+            $this->dispatch('refresh');
+        }
+    }
+
+    public function instantSave()
+    {
+        try {
+            $this->syncData(true);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        } finally {
+            $this->dispatch('refresh');
+        }
+    }
+
+    public function submit()
+    {
+        try {
+            $this->resetErrorBag();
+            $this->syncData(true);
+            $this->saveModel();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function saveModel()
+    {
+        $this->syncData(true);
+        refreshSession();
+        $this->dispatch('success', 'Settings saved.');
+    }
+
+    public function sendTestNotification()
+    {
+        try {
+            $this->team->notify(new Test(channel: 'pushover'));
+            $this->dispatch('success', 'Test notification sent.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function render()
+    {
+        return view('livewire.notifications.pushover');
+    }
+}
diff --git a/app/Livewire/Notifications/Slack.php b/app/Livewire/Notifications/Slack.php
index 97464fa1c..f47ad8a97 100644
--- a/app/Livewire/Notifications/Slack.php
+++ b/app/Livewire/Notifications/Slack.php
@@ -5,13 +5,18 @@ namespace App\Livewire\Notifications;
 use App\Models\SlackNotificationSettings;
 use App\Models\Team;
 use App\Notifications\Test;
+use Livewire\Attributes\Locked;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class Slack extends Component
 {
+    protected $listeners = ['refresh' => '$refresh'];
+
+    #[Locked]
     public Team $team;
 
+    #[Locked]
     public SlackNotificationSettings $settings;
 
     #[Validate(['boolean'])]
@@ -121,6 +126,8 @@ class Slack extends Component
             $this->slackEnabled = false;
 
             return handleError($e, $this);
+        } finally {
+            $this->dispatch('refresh');
         }
     }
 
@@ -130,6 +137,8 @@ class Slack extends Component
             $this->syncData(true);
         } catch (\Throwable $e) {
             return handleError($e, $this);
+        } finally {
+            $this->dispatch('refresh');
         }
     }
 
diff --git a/app/Livewire/Notifications/Telegram.php b/app/Livewire/Notifications/Telegram.php
index de2fa9cdc..01afb4ac6 100644
--- a/app/Livewire/Notifications/Telegram.php
+++ b/app/Livewire/Notifications/Telegram.php
@@ -5,13 +5,18 @@ namespace App\Livewire\Notifications;
 use App\Models\Team;
 use App\Models\TelegramNotificationSettings;
 use App\Notifications\Test;
+use Livewire\Attributes\Locked;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class Telegram extends Component
 {
+    protected $listeners = ['refresh' => '$refresh'];
+
+    #[Locked]
     public Team $team;
 
+    #[Locked]
     public TelegramNotificationSettings $settings;
 
     #[Validate(['boolean'])]
@@ -60,40 +65,40 @@ class Telegram extends Component
     public bool $serverUnreachableTelegramNotifications = true;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsDeploymentSuccessTopicId = null;
+    public ?string $telegramNotificationsDeploymentSuccessThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsDeploymentFailureTopicId = null;
+    public ?string $telegramNotificationsDeploymentFailureThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsStatusChangeTopicId = null;
+    public ?string $telegramNotificationsStatusChangeThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsBackupSuccessTopicId = null;
+    public ?string $telegramNotificationsBackupSuccessThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsBackupFailureTopicId = null;
+    public ?string $telegramNotificationsBackupFailureThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsScheduledTaskSuccessTopicId = null;
+    public ?string $telegramNotificationsScheduledTaskSuccessThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsScheduledTaskFailureTopicId = null;
+    public ?string $telegramNotificationsScheduledTaskFailureThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsDockerCleanupSuccessTopicId = null;
+    public ?string $telegramNotificationsDockerCleanupSuccessThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsDockerCleanupFailureTopicId = null;
+    public ?string $telegramNotificationsDockerCleanupFailureThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsServerDiskUsageTopicId = null;
+    public ?string $telegramNotificationsServerDiskUsageThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsServerReachableTopicId = null;
+    public ?string $telegramNotificationsServerReachableThreadId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsServerUnreachableTopicId = null;
+    public ?string $telegramNotificationsServerUnreachableThreadId = null;
 
     public function mount()
     {
@@ -127,21 +132,20 @@ class Telegram extends Component
             $this->settings->server_reachable_telegram_notifications = $this->serverReachableTelegramNotifications;
             $this->settings->server_unreachable_telegram_notifications = $this->serverUnreachableTelegramNotifications;
 
-            $this->settings->telegram_notifications_deployment_success_topic_id = $this->telegramNotificationsDeploymentSuccessTopicId;
-            $this->settings->telegram_notifications_deployment_failure_topic_id = $this->telegramNotificationsDeploymentFailureTopicId;
-            $this->settings->telegram_notifications_status_change_topic_id = $this->telegramNotificationsStatusChangeTopicId;
-            $this->settings->telegram_notifications_backup_success_topic_id = $this->telegramNotificationsBackupSuccessTopicId;
-            $this->settings->telegram_notifications_backup_failure_topic_id = $this->telegramNotificationsBackupFailureTopicId;
-            $this->settings->telegram_notifications_scheduled_task_success_topic_id = $this->telegramNotificationsScheduledTaskSuccessTopicId;
-            $this->settings->telegram_notifications_scheduled_task_failure_topic_id = $this->telegramNotificationsScheduledTaskFailureTopicId;
-            $this->settings->telegram_notifications_docker_cleanup_success_topic_id = $this->telegramNotificationsDockerCleanupSuccessTopicId;
-            $this->settings->telegram_notifications_docker_cleanup_failure_topic_id = $this->telegramNotificationsDockerCleanupFailureTopicId;
-            $this->settings->telegram_notifications_server_disk_usage_topic_id = $this->telegramNotificationsServerDiskUsageTopicId;
-            $this->settings->telegram_notifications_server_reachable_topic_id = $this->telegramNotificationsServerReachableTopicId;
-            $this->settings->telegram_notifications_server_unreachable_topic_id = $this->telegramNotificationsServerUnreachableTopicId;
+            $this->settings->telegram_notifications_deployment_success_thread_id = $this->telegramNotificationsDeploymentSuccessThreadId;
+            $this->settings->telegram_notifications_deployment_failure_thread_id = $this->telegramNotificationsDeploymentFailureThreadId;
+            $this->settings->telegram_notifications_status_change_thread_id = $this->telegramNotificationsStatusChangeThreadId;
+            $this->settings->telegram_notifications_backup_success_thread_id = $this->telegramNotificationsBackupSuccessThreadId;
+            $this->settings->telegram_notifications_backup_failure_thread_id = $this->telegramNotificationsBackupFailureThreadId;
+            $this->settings->telegram_notifications_scheduled_task_success_thread_id = $this->telegramNotificationsScheduledTaskSuccessThreadId;
+            $this->settings->telegram_notifications_scheduled_task_failure_thread_id = $this->telegramNotificationsScheduledTaskFailureThreadId;
+            $this->settings->telegram_notifications_docker_cleanup_success_thread_id = $this->telegramNotificationsDockerCleanupSuccessThreadId;
+            $this->settings->telegram_notifications_docker_cleanup_failure_thread_id = $this->telegramNotificationsDockerCleanupFailureThreadId;
+            $this->settings->telegram_notifications_server_disk_usage_thread_id = $this->telegramNotificationsServerDiskUsageThreadId;
+            $this->settings->telegram_notifications_server_reachable_thread_id = $this->telegramNotificationsServerReachableThreadId;
+            $this->settings->telegram_notifications_server_unreachable_thread_id = $this->telegramNotificationsServerUnreachableThreadId;
 
             $this->settings->save();
-            refreshSession();
         } else {
             $this->telegramEnabled = $this->settings->telegram_enabled;
             $this->telegramToken = $this->settings->telegram_token;
@@ -160,18 +164,18 @@ class Telegram extends Component
             $this->serverReachableTelegramNotifications = $this->settings->server_reachable_telegram_notifications;
             $this->serverUnreachableTelegramNotifications = $this->settings->server_unreachable_telegram_notifications;
 
-            $this->telegramNotificationsDeploymentSuccessTopicId = $this->settings->telegram_notifications_deployment_success_topic_id;
-            $this->telegramNotificationsDeploymentFailureTopicId = $this->settings->telegram_notifications_deployment_failure_topic_id;
-            $this->telegramNotificationsStatusChangeTopicId = $this->settings->telegram_notifications_status_change_topic_id;
-            $this->telegramNotificationsBackupSuccessTopicId = $this->settings->telegram_notifications_backup_success_topic_id;
-            $this->telegramNotificationsBackupFailureTopicId = $this->settings->telegram_notifications_backup_failure_topic_id;
-            $this->telegramNotificationsScheduledTaskSuccessTopicId = $this->settings->telegram_notifications_scheduled_task_success_topic_id;
-            $this->telegramNotificationsScheduledTaskFailureTopicId = $this->settings->telegram_notifications_scheduled_task_failure_topic_id;
-            $this->telegramNotificationsDockerCleanupSuccessTopicId = $this->settings->telegram_notifications_docker_cleanup_success_topic_id;
-            $this->telegramNotificationsDockerCleanupFailureTopicId = $this->settings->telegram_notifications_docker_cleanup_failure_topic_id;
-            $this->telegramNotificationsServerDiskUsageTopicId = $this->settings->telegram_notifications_server_disk_usage_topic_id;
-            $this->telegramNotificationsServerReachableTopicId = $this->settings->telegram_notifications_server_reachable_topic_id;
-            $this->telegramNotificationsServerUnreachableTopicId = $this->settings->telegram_notifications_server_unreachable_topic_id;
+            $this->telegramNotificationsDeploymentSuccessThreadId = $this->settings->telegram_notifications_deployment_success_thread_id;
+            $this->telegramNotificationsDeploymentFailureThreadId = $this->settings->telegram_notifications_deployment_failure_thread_id;
+            $this->telegramNotificationsStatusChangeThreadId = $this->settings->telegram_notifications_status_change_thread_id;
+            $this->telegramNotificationsBackupSuccessThreadId = $this->settings->telegram_notifications_backup_success_thread_id;
+            $this->telegramNotificationsBackupFailureThreadId = $this->settings->telegram_notifications_backup_failure_thread_id;
+            $this->telegramNotificationsScheduledTaskSuccessThreadId = $this->settings->telegram_notifications_scheduled_task_success_thread_id;
+            $this->telegramNotificationsScheduledTaskFailureThreadId = $this->settings->telegram_notifications_scheduled_task_failure_thread_id;
+            $this->telegramNotificationsDockerCleanupSuccessThreadId = $this->settings->telegram_notifications_docker_cleanup_success_thread_id;
+            $this->telegramNotificationsDockerCleanupFailureThreadId = $this->settings->telegram_notifications_docker_cleanup_failure_thread_id;
+            $this->telegramNotificationsServerDiskUsageThreadId = $this->settings->telegram_notifications_server_disk_usage_thread_id;
+            $this->telegramNotificationsServerReachableThreadId = $this->settings->telegram_notifications_server_reachable_thread_id;
+            $this->telegramNotificationsServerUnreachableThreadId = $this->settings->telegram_notifications_server_unreachable_thread_id;
         }
     }
 
@@ -181,6 +185,8 @@ class Telegram extends Component
             $this->syncData(true);
         } catch (\Throwable $e) {
             return handleError($e, $this);
+        } finally {
+            $this->dispatch('refresh');
         }
     }
 
@@ -210,6 +216,8 @@ class Telegram extends Component
             $this->telegramEnabled = false;
 
             return handleError($e, $this);
+        } finally {
+            $this->dispatch('refresh');
         }
     }
 
diff --git a/app/Livewire/Project/Application/Configuration.php b/app/Livewire/Project/Application/Configuration.php
index 5261a0800..bf2811075 100644
--- a/app/Livewire/Project/Application/Configuration.php
+++ b/app/Livewire/Project/Application/Configuration.php
@@ -8,14 +8,21 @@ use Livewire\Component;
 
 class Configuration extends Component
 {
+    public $currentRoute;
+
     public Application $application;
 
+    public $project;
+
+    public $environment;
+
     public $servers;
 
     protected $listeners = ['buildPackUpdated' => '$refresh'];
 
     public function mount()
     {
+        $this->currentRoute = request()->route()->getName();
         $project = currentTeam()
             ->projects()
             ->select('id', 'uuid', 'team_id')
@@ -30,6 +37,8 @@ class Configuration extends Component
             ->where('uuid', request()->route('application_uuid'))
             ->firstOrFail();
 
+        $this->project = $project;
+        $this->environment = $environment;
         $this->application = $application;
         if ($application->destination && $application->destination->server) {
             $mainServer = $application->destination->server;
diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index ff29b74e9..d1cc3476c 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -327,7 +327,7 @@ class General extends Component
         }
     }
 
-    public function set_redirect()
+    public function setRedirect()
     {
         try {
             $has_www = collect($this->application->fqdns)->filter(fn ($fqdn) => str($fqdn)->contains('www.'))->count();
@@ -360,10 +360,10 @@ class General extends Component
             if ($warning) {
                 $this->dispatch('warning', __('warning.sslipdomain'));
             }
-            $this->resetDefaultLabels();
+            // $this->resetDefaultLabels();
 
             if ($this->application->isDirty('redirect')) {
-                $this->set_redirect();
+                $this->setRedirect();
             }
 
             $this->checkFqdns();
diff --git a/app/Livewire/Project/Database/BackupNow.php b/app/Livewire/Project/Database/BackupNow.php
index 9c9c175e2..3cd360562 100644
--- a/app/Livewire/Project/Database/BackupNow.php
+++ b/app/Livewire/Project/Database/BackupNow.php
@@ -9,11 +9,9 @@ class BackupNow extends Component
 {
     public $backup;
 
-    public function backup_now()
+    public function backupNow()
     {
-        dispatch(new DatabaseBackupJob(
-            backup: $this->backup
-        ));
+        DatabaseBackupJob::dispatch($this->backup);
         $this->dispatch('success', 'Backup queued. It will be available in a few minutes.');
     }
 }
diff --git a/app/Livewire/Project/Resource/Index.php b/app/Livewire/Project/Resource/Index.php
index 283496887..0c2ea802a 100644
--- a/app/Livewire/Project/Resource/Index.php
+++ b/app/Livewire/Project/Resource/Index.php
@@ -46,125 +46,84 @@ class Index extends Component
             return redirect()->route('dashboard');
         }
         $this->project = $project;
-        $this->environment = $environment;
-        $this->applications = $this->environment->applications->load(['tags']);
+        $this->environment = $environment->loadCount([
+            'applications',
+            'redis',
+            'postgresqls',
+            'mysqls',
+            'keydbs',
+            'dragonflies',
+            'clickhouses',
+            'mariadbs',
+            'mongodbs',
+            'services',
+        ]);
+
+        // Eager load all relationships for applications including nested ones
+        $this->applications = $this->environment->applications()->with([
+            'tags',
+            'additional_servers.settings',
+            'additional_networks',
+            'destination.server.settings',
+            'settings',
+        ])->get()->sortBy('name');
         $this->applications = $this->applications->map(function ($application) {
-            if (data_get($application, 'environment.project.uuid')) {
-                $application->hrefLink = route('project.application.configuration', [
-                    'project_uuid' => data_get($application, 'environment.project.uuid'),
-                    'environment_name' => data_get($application, 'environment.name'),
-                    'application_uuid' => data_get($application, 'uuid'),
-                ]);
-            }
+            $application->hrefLink = route('project.application.configuration', [
+                'project_uuid' => $this->project->uuid,
+                'application_uuid' => $application->uuid,
+                'environment_name' => $this->environment->name,
+            ]);
 
             return $application;
         });
-        $this->postgresqls = $this->environment->postgresqls->load(['tags'])->sortBy('name');
-        $this->postgresqls = $this->postgresqls->map(function ($postgresql) {
-            if (data_get($postgresql, 'environment.project.uuid')) {
-                $postgresql->hrefLink = route('project.database.configuration', [
-                    'project_uuid' => data_get($postgresql, 'environment.project.uuid'),
-                    'environment_name' => data_get($postgresql, 'environment.name'),
-                    'database_uuid' => data_get($postgresql, 'uuid'),
-                ]);
-            }
 
-            return $postgresql;
-        });
-        $this->redis = $this->environment->redis->load(['tags'])->sortBy('name');
-        $this->redis = $this->redis->map(function ($redis) {
-            if (data_get($redis, 'environment.project.uuid')) {
-                $redis->hrefLink = route('project.database.configuration', [
-                    'project_uuid' => data_get($redis, 'environment.project.uuid'),
-                    'environment_name' => data_get($redis, 'environment.name'),
-                    'database_uuid' => data_get($redis, 'uuid'),
-                ]);
-            }
+        // Load all database resources in a single query per type
+        $databaseTypes = [
+            'postgresqls' => 'postgresqls',
+            'redis' => 'redis',
+            'mongodbs' => 'mongodbs',
+            'mysqls' => 'mysqls',
+            'mariadbs' => 'mariadbs',
+            'keydbs' => 'keydbs',
+            'dragonflies' => 'dragonflies',
+            'clickhouses' => 'clickhouses',
+        ];
 
-            return $redis;
-        });
-        $this->mongodbs = $this->environment->mongodbs->load(['tags'])->sortBy('name');
-        $this->mongodbs = $this->mongodbs->map(function ($mongodb) {
-            if (data_get($mongodb, 'environment.project.uuid')) {
-                $mongodb->hrefLink = route('project.database.configuration', [
-                    'project_uuid' => data_get($mongodb, 'environment.project.uuid'),
-                    'environment_name' => data_get($mongodb, 'environment.name'),
-                    'database_uuid' => data_get($mongodb, 'uuid'),
-                ]);
-            }
+        // Load all server-related data first to prevent duplicate queries
+        $serverData = $this->environment->applications()
+            ->with(['destination.server.settings'])
+            ->get()
+            ->pluck('destination.server')
+            ->filter()
+            ->unique('id');
 
-            return $mongodb;
-        });
-        $this->mysqls = $this->environment->mysqls->load(['tags'])->sortBy('name');
-        $this->mysqls = $this->mysqls->map(function ($mysql) {
-            if (data_get($mysql, 'environment.project.uuid')) {
-                $mysql->hrefLink = route('project.database.configuration', [
-                    'project_uuid' => data_get($mysql, 'environment.project.uuid'),
-                    'environment_name' => data_get($mysql, 'environment.name'),
-                    'database_uuid' => data_get($mysql, 'uuid'),
+        foreach ($databaseTypes as $property => $relation) {
+            $this->{$property} = $this->environment->{$relation}()->with([
+                'tags',
+                'destination.server.settings',
+            ])->get()->sortBy('name');
+            $this->{$property} = $this->{$property}->map(function ($db) {
+                $db->hrefLink = route('project.database.configuration', [
+                    'project_uuid' => $this->project->uuid,
+                    'database_uuid' => $db->uuid,
+                    'environment_name' => $this->environment->name,
                 ]);
-            }
 
-            return $mysql;
-        });
-        $this->mariadbs = $this->environment->mariadbs->load(['tags'])->sortBy('name');
-        $this->mariadbs = $this->mariadbs->map(function ($mariadb) {
-            if (data_get($mariadb, 'environment.project.uuid')) {
-                $mariadb->hrefLink = route('project.database.configuration', [
-                    'project_uuid' => data_get($mariadb, 'environment.project.uuid'),
-                    'environment_name' => data_get($mariadb, 'environment.name'),
-                    'database_uuid' => data_get($mariadb, 'uuid'),
-                ]);
-            }
+                return $db;
+            });
+        }
 
-            return $mariadb;
-        });
-        $this->keydbs = $this->environment->keydbs->load(['tags'])->sortBy('name');
-        $this->keydbs = $this->keydbs->map(function ($keydb) {
-            if (data_get($keydb, 'environment.project.uuid')) {
-                $keydb->hrefLink = route('project.database.configuration', [
-                    'project_uuid' => data_get($keydb, 'environment.project.uuid'),
-                    'environment_name' => data_get($keydb, 'environment.name'),
-                    'database_uuid' => data_get($keydb, 'uuid'),
-                ]);
-            }
-
-            return $keydb;
-        });
-        $this->dragonflies = $this->environment->dragonflies->load(['tags'])->sortBy('name');
-        $this->dragonflies = $this->dragonflies->map(function ($dragonfly) {
-            if (data_get($dragonfly, 'environment.project.uuid')) {
-                $dragonfly->hrefLink = route('project.database.configuration', [
-                    'project_uuid' => data_get($dragonfly, 'environment.project.uuid'),
-                    'environment_name' => data_get($dragonfly, 'environment.name'),
-                    'database_uuid' => data_get($dragonfly, 'uuid'),
-                ]);
-            }
-
-            return $dragonfly;
-        });
-        $this->clickhouses = $this->environment->clickhouses->load(['tags'])->sortBy('name');
-        $this->clickhouses = $this->clickhouses->map(function ($clickhouse) {
-            if (data_get($clickhouse, 'environment.project.uuid')) {
-                $clickhouse->hrefLink = route('project.database.configuration', [
-                    'project_uuid' => data_get($clickhouse, 'environment.project.uuid'),
-                    'environment_name' => data_get($clickhouse, 'environment.name'),
-                    'database_uuid' => data_get($clickhouse, 'uuid'),
-                ]);
-            }
-
-            return $clickhouse;
-        });
-        $this->services = $this->environment->services->load(['tags'])->sortBy('name');
+        // Load services with their tags and server
+        $this->services = $this->environment->services()->with([
+            'tags',
+            'destination.server.settings',
+        ])->get()->sortBy('name');
         $this->services = $this->services->map(function ($service) {
-            if (data_get($service, 'environment.project.uuid')) {
-                $service->hrefLink = route('project.service.configuration', [
-                    'project_uuid' => data_get($service, 'environment.project.uuid'),
-                    'environment_name' => data_get($service, 'environment.name'),
-                    'service_uuid' => data_get($service, 'uuid'),
-                ]);
-                $service->status = $service->status();
-            }
+            $service->hrefLink = route('project.service.configuration', [
+                'project_uuid' => $this->project->uuid,
+                'service_uuid' => $service->uuid,
+                'environment_name' => $this->environment->name,
+            ]);
 
             return $service;
         });
diff --git a/app/Livewire/Project/Service/Navbar.php b/app/Livewire/Project/Service/Navbar.php
index ee43dc911..22fc1c0d6 100644
--- a/app/Livewire/Project/Service/Navbar.php
+++ b/app/Livewire/Project/Service/Navbar.php
@@ -27,7 +27,7 @@ class Navbar extends Component
 
     public function mount()
     {
-        if (str($this->service->status())->contains('running') && is_null($this->service->config_hash)) {
+        if (str($this->service->status)->contains('running') && is_null($this->service->config_hash)) {
             $this->service->isConfigurationChanged(true);
             $this->dispatch('configurationChanged');
         }
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
index 6294d97c6..2bccde0e9 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
@@ -5,7 +5,6 @@ namespace App\Livewire\Project\Shared\EnvironmentVariable;
 use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
 use App\Models\SharedEnvironmentVariable;
 use Livewire\Component;
-use Visus\Cuid2\Cuid2;
 
 class Show extends Component
 {
@@ -13,8 +12,6 @@ class Show extends Component
 
     public ModelsEnvironmentVariable|SharedEnvironmentVariable $env;
 
-    public ?string $modalId = null;
-
     public bool $isDisabled = false;
 
     public bool $isLocked = false;
@@ -61,7 +58,6 @@ class Show extends Component
         if ($this->env->getMorphClass() === \App\Models\SharedEnvironmentVariable::class) {
             $this->isSharedVariable = true;
         }
-        $this->modalId = new Cuid2;
         $this->parameters = get_route_parameters();
         $this->checkEnvs();
     }
diff --git a/app/Livewire/Project/Shared/ResourceOperations.php b/app/Livewire/Project/Shared/ResourceOperations.php
index e67df6aa9..de7bb3c05 100644
--- a/app/Livewire/Project/Shared/ResourceOperations.php
+++ b/app/Livewire/Project/Shared/ResourceOperations.php
@@ -42,9 +42,11 @@ class ResourceOperations extends Component
         $uuid = (string) new Cuid2;
         $server = $new_destination->server;
         if ($this->resource->getMorphClass() === \App\Models\Application::class) {
+            $name = 'clone-of-'.str($this->resource->name)->limit(20).'-'.$uuid;
+
             $new_resource = $this->resource->replicate()->fill([
                 'uuid' => $uuid,
-                'name' => $this->resource->name.'-clone-'.$uuid,
+                'name' => $name,
                 'fqdn' => generateFqdn($server, $uuid),
                 'status' => 'exited',
                 'destination_id' => $new_destination->id,
@@ -64,8 +66,12 @@ class ResourceOperations extends Component
             }
             $persistentVolumes = $this->resource->persistentStorages()->get();
             foreach ($persistentVolumes as $volume) {
+                $volumeName = str($volume->name)->replace($this->resource->uuid, $new_resource->uuid)->value();
+                if ($volumeName === $volume->name) {
+                    $volumeName = $new_resource->uuid.'-'.str($volume->name)->afterLast('-');
+                }
                 $newPersistentVolume = $volume->replicate()->fill([
-                    'name' => $new_resource->uuid.'-'.str($volume->name)->afterLast('-'),
+                    'name' => $volumeName,
                     'resource_id' => $new_resource->id,
                 ]);
                 $newPersistentVolume->save();
diff --git a/app/Livewire/SettingsOauth.php b/app/Livewire/SettingsOauth.php
index 17b3b89a3..e23f94a73 100644
--- a/app/Livewire/SettingsOauth.php
+++ b/app/Livewire/SettingsOauth.php
@@ -17,6 +17,7 @@ class SettingsOauth extends Component
             $carry["oauth_settings_map.$setting->provider.client_secret"] = 'nullable';
             $carry["oauth_settings_map.$setting->provider.redirect_uri"] = 'nullable';
             $carry["oauth_settings_map.$setting->provider.tenant"] = 'nullable';
+            $carry["oauth_settings_map.$setting->provider.base_url"] = 'nullable';
 
             return $carry;
         }, []);
@@ -34,16 +35,30 @@ class SettingsOauth extends Component
         }, []);
     }
 
-    private function updateOauthSettings()
+    private function updateOauthSettings(?string $provider = null)
     {
-        foreach (array_values($this->oauth_settings_map) as &$setting) {
-            $setting->save();
+        if ($provider) {
+            $oauth = $this->oauth_settings_map[$provider];
+            if (! $oauth->couldBeEnabled()) {
+                $oauth->update(['enabled' => false]);
+                throw new \Exception('OAuth settings are not complete for '.$oauth->provider.'.<br/>Please fill in all required fields.');
+            }
+            $oauth->save();
+            $this->dispatch('success', 'OAuth settings for '.$oauth->provider.' updated successfully!');
+        } else {
+            foreach (array_values($this->oauth_settings_map) as &$setting) {
+                $setting->save();
+            }
         }
     }
 
-    public function instantSave()
+    public function instantSave(string $provider)
     {
-        $this->updateOauthSettings();
+        try {
+            $this->updateOauthSettings($provider);
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function submit()
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 82ad0c2d1..bfb2a1041 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -115,6 +115,12 @@ class Application extends BaseModel
 
     protected static function booted()
     {
+        static::addGlobalScope('withRelations', function ($builder) {
+            $builder->withCount([
+                'additional_servers',
+                'additional_networks',
+            ]);
+        });
         static::saving(function ($application) {
             $payload = [];
             if ($application->isDirty('fqdn')) {
@@ -551,20 +557,21 @@ class Application extends BaseModel
     {
         return Attribute::make(
             get: function () {
-                if ($this->additional_servers->count() === 0) {
-                    return $this->destination->server->isFunctional();
-                } else {
-                    $additional_servers_status = $this->additional_servers->pluck('pivot.status');
-                    $main_server_status = $this->destination->server->isFunctional();
-                    foreach ($additional_servers_status as $status) {
-                        $server_status = str($status)->before(':')->value();
-                        if ($server_status !== 'running') {
-                            return false;
-                        }
-                    }
-
-                    return $main_server_status;
+                if (! $this->relationLoaded('additional_servers') || $this->additional_servers->count() === 0) {
+                    return $this->destination?->server?->isFunctional() ?? false;
                 }
+
+                $additional_servers_status = $this->additional_servers->pluck('pivot.status');
+                $main_server_status = $this->destination?->server?->isFunctional() ?? false;
+
+                foreach ($additional_servers_status as $status) {
+                    $server_status = str($status)->before(':')->value();
+                    if ($server_status !== 'running') {
+                        return false;
+                    }
+                }
+
+                return $main_server_status;
             }
         );
     }
@@ -1331,7 +1338,9 @@ class Application extends BaseModel
                 $currentPath = '';
                 foreach ($parts as $part) {
                     $currentPath .= ($currentPath ? '/' : '').$part;
-                    $paths->push($currentPath);
+                    if (str($currentPath)->isNotEmpty()) {
+                        $paths->push($currentPath);
+                    }
                 }
 
                 return $paths;
@@ -1341,7 +1350,7 @@ class Application extends BaseModel
                 "mkdir -p /tmp/{$uuid}",
                 "cd /tmp/{$uuid}",
                 $cloneCommand,
-                'git sparse-checkout init --cone',
+                'git sparse-checkout init',
                 "git sparse-checkout set {$fileList->implode(' ')}",
                 'git read-tree -mu HEAD',
                 "cat .$workdir$composeFile",
diff --git a/app/Models/OauthSetting.php b/app/Models/OauthSetting.php
index c17c318f1..3d82e89f2 100644
--- a/app/Models/OauthSetting.php
+++ b/app/Models/OauthSetting.php
@@ -11,6 +11,8 @@ class OauthSetting extends Model
 {
     use HasFactory;
 
+    protected $fillable = ['provider', 'client_id', 'client_secret', 'redirect_uri', 'tenant', 'base_url', 'enabled'];
+
     protected function clientSecret(): Attribute
     {
         return Attribute::make(
@@ -18,4 +20,16 @@ class OauthSetting extends Model
             set: fn (?string $value) => empty($value) ? null : Crypt::encryptString($value),
         );
     }
+
+    public function couldBeEnabled(): bool
+    {
+        switch ($this->provider) {
+            case 'azure':
+                return filled($this->client_id) && filled($this->client_secret) && filled($this->redirect_uri) && filled($this->tenant);
+            case 'authentik':
+                return filled($this->client_id) && filled($this->client_secret) && filled($this->redirect_uri) && filled($this->base_url);
+            default:
+                return filled($this->client_id) && filled($this->client_secret) && filled($this->redirect_uri);
+        }
+    }
 }
diff --git a/app/Models/PushoverNotificationSettings.php b/app/Models/PushoverNotificationSettings.php
new file mode 100644
index 000000000..e3191dcc3
--- /dev/null
+++ b/app/Models/PushoverNotificationSettings.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Notifications\Notifiable;
+
+class PushoverNotificationSettings extends Model
+{
+    use Notifiable;
+
+    public $timestamps = false;
+
+    protected $fillable = [
+        'team_id',
+
+        'pushover_enabled',
+        'pushover_user_key',
+        'pushover_api_token',
+
+        'deployment_success_pushover_notifications',
+        'deployment_failure_pushover_notifications',
+        'status_change_pushover_notifications',
+        'backup_success_pushover_notifications',
+        'backup_failure_pushover_notifications',
+        'scheduled_task_success_pushover_notifications',
+        'scheduled_task_failure_pushover_notifications',
+        'docker_cleanup_pushover_notifications',
+        'server_disk_usage_pushover_notifications',
+        'server_reachable_pushover_notifications',
+        'server_unreachable_pushover_notifications',
+    ];
+
+    protected $casts = [
+        'pushover_enabled' => 'boolean',
+        'pushover_user_key' => 'encrypted',
+        'pushover_api_token' => 'encrypted',
+
+        'deployment_success_pushover_notifications' => 'boolean',
+        'deployment_failure_pushover_notifications' => 'boolean',
+        'status_change_pushover_notifications' => 'boolean',
+        'backup_success_pushover_notifications' => 'boolean',
+        'backup_failure_pushover_notifications' => 'boolean',
+        'scheduled_task_success_pushover_notifications' => 'boolean',
+        'scheduled_task_failure_pushover_notifications' => 'boolean',
+        'docker_cleanup_pushover_notifications' => 'boolean',
+        'server_disk_usage_pushover_notifications' => 'boolean',
+        'server_reachable_pushover_notifications' => 'boolean',
+        'server_unreachable_pushover_notifications' => 'boolean',
+    ];
+
+    public function team()
+    {
+        return $this->belongsTo(Team::class);
+    }
+
+    public function isEnabled()
+    {
+        return $this->pushover_enabled;
+    }
+}
diff --git a/app/Models/Service.php b/app/Models/Service.php
index 117677d53..5a2690490 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -46,7 +46,7 @@ class Service extends BaseModel
 
     protected $guarded = [];
 
-    protected $appends = ['server_status'];
+    protected $appends = ['server_status', 'status'];
 
     protected static function booted()
     {
@@ -105,12 +105,12 @@ class Service extends BaseModel
 
     public function isRunning()
     {
-        return (bool) str($this->status())->contains('running');
+        return (bool) str($this->status)->contains('running');
     }
 
     public function isExited()
     {
-        return (bool) str($this->status())->contains('exited');
+        return (bool) str($this->status)->contains('exited');
     }
 
     public function type()
@@ -213,7 +213,7 @@ class Service extends BaseModel
         instant_remote_process(["docker network rm {$uuid}"], $server, false);
     }
 
-    public function status()
+    public function getStatusAttribute()
     {
         $applications = $this->applications;
         $databases = $this->databases;
diff --git a/app/Models/Team.php b/app/Models/Team.php
index 07424a55f..e55cb0d19 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Notifications\Channels\SendsDiscord;
 use App\Notifications\Channels\SendsEmail;
+use App\Notifications\Channels\SendsPushover;
 use App\Notifications\Channels\SendsSlack;
 use App\Traits\HasNotificationSettings;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -32,7 +33,7 @@ use OpenApi\Attributes as OA;
     ]
 )]
 
-class Team extends Model implements SendsDiscord, SendsEmail, SendsSlack
+class Team extends Model implements SendsDiscord, SendsEmail, SendsPushover, SendsSlack
 {
     use HasNotificationSettings, Notifiable;
 
@@ -49,6 +50,7 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsSlack
             $team->discordNotificationSettings()->create();
             $team->slackNotificationSettings()->create();
             $team->telegramNotificationSettings()->create();
+            $team->pushoverNotificationSettings()->create();
         });
 
         static::saving(function ($team) {
@@ -155,6 +157,14 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsSlack
         return data_get($this, 'slack_webhook_url', null);
     }
 
+    public function routeNotificationForPushover()
+    {
+        return [
+            'user' => data_get($this, 'pushover_user_key', null),
+            'token' => data_get($this, 'pushover_api_token', null),
+        ];
+    }
+
     public function getRecipients($notification)
     {
         $recipients = data_get($notification, 'emails', null);
@@ -174,7 +184,8 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsSlack
         return $this->getNotificationSettings('email')?->isEnabled() ||
             $this->getNotificationSettings('discord')?->isEnabled() ||
             $this->getNotificationSettings('slack')?->isEnabled() ||
-            $this->getNotificationSettings('telegram')?->isEnabled();
+            $this->getNotificationSettings('telegram')?->isEnabled() ||
+            $this->getNotificationSettings('pushover')?->isEnabled();
     }
 
     public function subscriptionEnded()
@@ -276,4 +287,9 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsSlack
     {
         return $this->hasOne(SlackNotificationSettings::class);
     }
+
+    public function pushoverNotificationSettings()
+    {
+        return $this->hasOne(PushoverNotificationSettings::class);
+    }
 }
diff --git a/app/Models/TelegramNotificationSettings.php b/app/Models/TelegramNotificationSettings.php
index 2edca14ff..78bd841bd 100644
--- a/app/Models/TelegramNotificationSettings.php
+++ b/app/Models/TelegramNotificationSettings.php
@@ -30,17 +30,17 @@ class TelegramNotificationSettings extends Model
         'server_reachable_telegram_notifications',
         'server_unreachable_telegram_notifications',
 
-        'telegram_notifications_deployment_success_topic_id',
-        'telegram_notifications_deployment_failure_topic_id',
-        'telegram_notifications_status_change_topic_id',
-        'telegram_notifications_backup_success_topic_id',
-        'telegram_notifications_backup_failure_topic_id',
-        'telegram_notifications_scheduled_task_success_topic_id',
-        'telegram_notifications_scheduled_task_failure_topic_id',
-        'telegram_notifications_docker_cleanup_topic_id',
-        'telegram_notifications_server_disk_usage_topic_id',
-        'telegram_notifications_server_reachable_topic_id',
-        'telegram_notifications_server_unreachable_topic_id',
+        'telegram_notifications_deployment_success_thread_id',
+        'telegram_notifications_deployment_failure_thread_id',
+        'telegram_notifications_status_change_thread_id',
+        'telegram_notifications_backup_success_thread_id',
+        'telegram_notifications_backup_failure_thread_id',
+        'telegram_notifications_scheduled_task_success_thread_id',
+        'telegram_notifications_scheduled_task_failure_thread_id',
+        'telegram_notifications_docker_cleanup_thread_id',
+        'telegram_notifications_server_disk_usage_thread_id',
+        'telegram_notifications_server_reachable_thread_id',
+        'telegram_notifications_server_unreachable_thread_id',
     ];
 
     protected $casts = [
@@ -60,17 +60,17 @@ class TelegramNotificationSettings extends Model
         'server_reachable_telegram_notifications' => 'boolean',
         'server_unreachable_telegram_notifications' => 'boolean',
 
-        'telegram_notifications_deployment_success_topic_id' => 'encrypted',
-        'telegram_notifications_deployment_failure_topic_id' => 'encrypted',
-        'telegram_notifications_status_change_topic_id' => 'encrypted',
-        'telegram_notifications_backup_success_topic_id' => 'encrypted',
-        'telegram_notifications_backup_failure_topic_id' => 'encrypted',
-        'telegram_notifications_scheduled_task_success_topic_id' => 'encrypted',
-        'telegram_notifications_scheduled_task_failure_topic_id' => 'encrypted',
-        'telegram_notifications_docker_cleanup_topic_id' => 'encrypted',
-        'telegram_notifications_server_disk_usage_topic_id' => 'encrypted',
-        'telegram_notifications_server_reachable_topic_id' => 'encrypted',
-        'telegram_notifications_server_unreachable_topic_id' => 'encrypted',
+        'telegram_notifications_deployment_success_thread_id' => 'encrypted',
+        'telegram_notifications_deployment_failure_thread_id' => 'encrypted',
+        'telegram_notifications_status_change_thread_id' => 'encrypted',
+        'telegram_notifications_backup_success_thread_id' => 'encrypted',
+        'telegram_notifications_backup_failure_thread_id' => 'encrypted',
+        'telegram_notifications_scheduled_task_success_thread_id' => 'encrypted',
+        'telegram_notifications_scheduled_task_failure_thread_id' => 'encrypted',
+        'telegram_notifications_docker_cleanup_thread_id' => 'encrypted',
+        'telegram_notifications_server_disk_usage_thread_id' => 'encrypted',
+        'telegram_notifications_server_reachable_thread_id' => 'encrypted',
+        'telegram_notifications_server_unreachable_thread_id' => 'encrypted',
     ];
 
     public function team()
diff --git a/app/Notifications/Application/DeploymentFailed.php b/app/Notifications/Application/DeploymentFailed.php
index 06a2b48e3..80c1c421c 100644
--- a/app/Notifications/Application/DeploymentFailed.php
+++ b/app/Notifications/Application/DeploymentFailed.php
@@ -6,6 +6,7 @@ use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -130,6 +131,31 @@ class DeploymentFailed extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        if ($this->preview) {
+            $title = "Pull request #{$this->preview->pull_request_id} deployment failed";
+            $message = "Pull request deployment failed for {$this->application_name}";
+        } else {
+            $title = 'Deployment failed';
+            $message = "Deployment failed for {$this->application_name}";
+        }
+
+        $buttons[] = [
+            'text' => 'Deployment logs',
+            'url' => $this->deployment_url,
+        ];
+
+        return new PushoverMessage(
+            title: $title,
+            level: 'error',
+            message: $message,
+            buttons: [
+                ...$buttons,
+            ],
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         if ($this->preview) {
diff --git a/app/Notifications/Application/DeploymentSuccess.php b/app/Notifications/Application/DeploymentSuccess.php
index 548f5c6e5..b1a3d5225 100644
--- a/app/Notifications/Application/DeploymentSuccess.php
+++ b/app/Notifications/Application/DeploymentSuccess.php
@@ -6,6 +6,7 @@ use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -139,6 +140,42 @@ class DeploymentSuccess extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        if ($this->preview) {
+            $title = "Pull request #{$this->preview->pull_request_id} successfully deployed";
+            $message = 'New PR' . $this->preview->pull_request_id . ' version successfully deployed of ' . $this->application_name . '';
+            if ($this->preview->fqdn) {
+                $buttons[] = [
+                    'text' => 'Open Application',
+                    'url' => $this->preview->fqdn,
+                ];
+            }
+        } else {
+            $title = 'New version successfully deployed';
+            $message = 'New version successfully deployed of ' . $this->application_name . '';
+            if ($this->fqdn) {
+                $buttons[] = [
+                    'text' => 'Open Application',
+                    'url' => $this->fqdn,
+                ];
+            }
+        }
+        $buttons[] = [
+            'text' => 'Deployment logs',
+            'url' => $this->deployment_url,
+        ];
+
+        return new PushoverMessage(
+            title: $title,
+            level: 'success',
+            message: $message,
+            buttons: [
+                ...$buttons,
+            ],
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         if ($this->preview) {
diff --git a/app/Notifications/Application/StatusChanged.php b/app/Notifications/Application/StatusChanged.php
index 32a6a659a..c9c7344c4 100644
--- a/app/Notifications/Application/StatusChanged.php
+++ b/app/Notifications/Application/StatusChanged.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Application;
 use App\Models\Application;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -77,6 +78,23 @@ class StatusChanged extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        $message = $this->resource_name . ' has been stopped.';
+
+        return new PushoverMessage(
+            title: 'Application stopped',
+            level: 'error',
+            message: $message,
+            buttons: [
+                [
+                    'text' => 'Open Application in Coolify',
+                    'url' => $this->resource_url,
+                ],
+            ],
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         $title = 'Application stopped';
diff --git a/app/Notifications/Channels/PushoverChannel.php b/app/Notifications/Channels/PushoverChannel.php
new file mode 100644
index 000000000..3d3728d01
--- /dev/null
+++ b/app/Notifications/Channels/PushoverChannel.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Notifications\Channels;
+
+use App\Jobs\SendMessageToPushoverJob;
+use Illuminate\Notifications\Notification;
+
+class PushoverChannel
+{
+    public function send(SendsPushover $notifiable, Notification $notification): void
+    {
+        $message = $notification->toPushover();
+        $pushoverSettings = $notifiable->pushoverNotificationSettings;
+
+        if (! $pushoverSettings || ! $pushoverSettings->isEnabled() || ! $pushoverSettings->pushover_user_key || ! $pushoverSettings->pushover_api_token) {
+            return;
+        }
+
+        SendMessageToPushoverJob::dispatch($message, $pushoverSettings->pushover_api_token, $pushoverSettings->pushover_user_key);
+    }
+}
diff --git a/app/Notifications/Channels/SendsPushover.php b/app/Notifications/Channels/SendsPushover.php
new file mode 100644
index 000000000..7922eefb4
--- /dev/null
+++ b/app/Notifications/Channels/SendsPushover.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Notifications\Channels;
+
+interface SendsPushover
+{
+    public function routeNotificationForPushover();
+}
diff --git a/app/Notifications/Channels/TelegramChannel.php b/app/Notifications/Channels/TelegramChannel.php
index 17d76181a..ea4ab7171 100644
--- a/app/Notifications/Channels/TelegramChannel.php
+++ b/app/Notifications/Channels/TelegramChannel.php
@@ -16,18 +16,25 @@ class TelegramChannel
         $telegramToken = $settings->telegram_token;
         $chatId = $settings->telegram_chat_id;
 
-        $topicId = match (get_class($notification)) {
-            \App\Notifications\Test::class => $settings->telegram_notifications_test_topic_id,
+        $threadId = match (get_class($notification)) {
+            \App\Notifications\Application\DeploymentSuccess::class => $settings->telegram_notifications_deployment_success_thread_id,
+            \App\Notifications\Application\DeploymentFailed::class => $settings->telegram_notifications_deployment_failure_thread_id,
             \App\Notifications\Application\StatusChanged::class,
             \App\Notifications\Container\ContainerRestarted::class,
-            \App\Notifications\Container\ContainerStopped::class => $settings->telegram_notifications_status_change_topic_id,
-            \App\Notifications\Application\DeploymentSuccess::class => $settings->telegram_notifications_deployment_success_topic_id,
-            \App\Notifications\Application\DeploymentFailed::class => $settings->telegram_notifications_deployment_failure_topic_id,
-            \App\Notifications\Database\BackupSuccess::class => $settings->telegram_notifications_backup_success_topic_id,
-            \App\Notifications\Database\BackupFailed::class => $settings->telegram_notifications_backup_failure_topic_id,
-            \App\Notifications\ScheduledTask\TaskFailed::class => $settings->telegram_notifications_scheduled_task_failure_topic_id,
-            \App\Notifications\Server\Unreachable::class => $settings->telegram_notifications_server_unreachable_topic_id,
-            \App\Notifications\Server\Reachable::class => $settings->telegram_notifications_server_reachable_topic_id,
+            \App\Notifications\Container\ContainerStopped::class => $settings->telegram_notifications_status_change_thread_id,
+
+            \App\Notifications\Database\BackupSuccess::class => $settings->telegram_notifications_backup_success_thread_id,
+            \App\Notifications\Database\BackupFailed::class => $settings->telegram_notifications_backup_failure_thread_id,
+
+            \App\Notifications\ScheduledTask\TaskSuccess::class => $settings->telegram_notifications_scheduled_task_success_thread_id,
+            \App\Notifications\ScheduledTask\TaskFailed::class => $settings->telegram_notifications_scheduled_task_failure_thread_id,
+
+            \App\Notifications\Server\DockerCleanupSuccess::class => $settings->telegram_notifications_docker_cleanup_success_thread_id,
+            \App\Notifications\Server\DockerCleanupFailed::class => $settings->telegram_notifications_docker_cleanup_failure_thread_id,
+            \App\Notifications\Server\HighDiskUsage::class => $settings->telegram_notifications_server_disk_usage_thread_id,
+            \App\Notifications\Server\Unreachable::class => $settings->telegram_notifications_server_unreachable_thread_id,
+            \App\Notifications\Server\Reachable::class => $settings->telegram_notifications_server_reachable_thread_id,
+
             default => null,
         };
 
@@ -35,6 +42,6 @@ class TelegramChannel
             return;
         }
 
-        SendMessageToTelegramJob::dispatch($message, $buttons, $telegramToken, $chatId, $topicId);
+        SendMessageToTelegramJob::dispatch($message, $buttons, $telegramToken, $chatId, $threadId);
     }
 }
diff --git a/app/Notifications/Container/ContainerRestarted.php b/app/Notifications/Container/ContainerRestarted.php
index c25072ecf..68fc6b019 100644
--- a/app/Notifications/Container/ContainerRestarted.php
+++ b/app/Notifications/Container/ContainerRestarted.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Container;
 use App\Models\Server;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -68,6 +69,24 @@ class ContainerRestarted extends CustomEmailNotification
         return $payload;
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        $buttons = [];
+        if ($this->url) {
+            $buttons[] = [
+                'text' => 'Check Proxy in Coolify',
+                'url' => $this->url,
+            ];
+        }
+
+        return new PushoverMessage(
+            title: 'Resource restarted',
+            level: 'warning',
+            message: "A resource ({$this->name}) has been restarted automatically on {$this->server->name}",
+            buttons: $buttons,
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         $title = 'Resource restarted';
diff --git a/app/Notifications/Container/ContainerStopped.php b/app/Notifications/Container/ContainerStopped.php
index bc6e52b6d..49aea196d 100644
--- a/app/Notifications/Container/ContainerStopped.php
+++ b/app/Notifications/Container/ContainerStopped.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Container;
 use App\Models\Server;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -68,6 +69,25 @@ class ContainerStopped extends CustomEmailNotification
         return $payload;
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        $buttons = [];
+        if ($this->url) {
+            $buttons[] = [
+                'text' => 'Open Application in Coolify',
+                'url' => $this->url,
+            ];
+        }
+
+        return new PushoverMessage(
+            title: 'Resource stopped',
+            level: 'error',
+            message: "A resource ({$this->name}) has been stopped unexpectedly on {$this->server->name}",
+            buttons: $buttons,
+        );
+    }
+
+
     public function toSlack(): SlackMessage
     {
         $title = 'Resource stopped';
diff --git a/app/Notifications/Database/BackupFailed.php b/app/Notifications/Database/BackupFailed.php
index 2208f7b1d..6dcb70583 100644
--- a/app/Notifications/Database/BackupFailed.php
+++ b/app/Notifications/Database/BackupFailed.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Database;
 use App\Models\ScheduledDatabaseBackup;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -64,6 +65,15 @@ class BackupFailed extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'Database backup failed',
+            level: 'error',
+            message: "Database backup for {$this->name} (db:{$this->database_name}) was FAILED<br/><br/><b>Frequency:</b> {$this->frequency} .<br/><b>Reason:</b> {$this->output}",
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         $title = 'Database backup failed';
diff --git a/app/Notifications/Database/BackupSuccess.php b/app/Notifications/Database/BackupSuccess.php
index 10b4ff3df..4c3e8e060 100644
--- a/app/Notifications/Database/BackupSuccess.php
+++ b/app/Notifications/Database/BackupSuccess.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Database;
 use App\Models\ScheduledDatabaseBackup;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -62,6 +63,17 @@ class BackupSuccess extends CustomEmailNotification
         ];
     }
 
+
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'Database backup successful',
+            level: 'success',
+            message: "Database backup for {$this->name} (db:{$this->database_name}) was successful.<br/><br/><b>Frequency:</b> {$this->frequency}.",
+        );
+    }
+
+
     public function toSlack(): SlackMessage
     {
         $title = 'Database backup successful';
diff --git a/app/Notifications/Dto/PushoverMessage.php b/app/Notifications/Dto/PushoverMessage.php
new file mode 100644
index 000000000..0efd1d526
--- /dev/null
+++ b/app/Notifications/Dto/PushoverMessage.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Notifications\Dto;
+
+use Illuminate\Support\Facades\Log;
+
+class PushoverMessage
+{
+    public function __construct(
+        public string $title,
+        public string $message,
+        public array $buttons = [],
+        public string $level = 'info',
+    ) {}
+
+    public function getLevelIcon(): string
+    {
+        return match ($this->level) {
+            'info' => 'ℹ️',
+            'error' => '❌',
+            'success' => '✅ ',
+            'warning' => '⚠️',
+        };
+    }
+
+    public function toPayload(string $token, string $user): array
+    {
+        $levelIcon = $this->getLevelIcon();
+        $payload = [
+            'token' => $token,
+            'user' => $user,
+            'title' => "{$levelIcon} {$this->title}",
+            'message' => $this->message,
+            'html' => 1,
+        ];
+
+        foreach ($this->buttons as $button) {
+            $buttonUrl = data_get($button, 'url');
+            $text = data_get($button, 'text', 'Click here');
+            if ($buttonUrl && str_contains($buttonUrl, 'http://localhost')) {
+                $buttonUrl = str_replace('http://localhost', config('app.url'), $buttonUrl);
+            }
+            $payload['message'] .= "&nbsp;<a href='" . $buttonUrl . "'>" . $text . '</a>';
+        }
+
+        Log::info('Pushover message', $payload);
+
+        return $payload;
+    }
+}
diff --git a/app/Notifications/Internal/GeneralNotification.php b/app/Notifications/Internal/GeneralNotification.php
index 7049e3055..1d2367210 100644
--- a/app/Notifications/Internal/GeneralNotification.php
+++ b/app/Notifications/Internal/GeneralNotification.php
@@ -3,6 +3,7 @@
 namespace App\Notifications\Internal;
 
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -40,6 +41,15 @@ class GeneralNotification extends Notification implements ShouldQueue
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'General Notification',
+            level: 'info',
+            message: $this->message,
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         return new SlackMessage(
diff --git a/app/Notifications/ScheduledTask/TaskFailed.php b/app/Notifications/ScheduledTask/TaskFailed.php
index 56c410ecb..c4d92f213 100644
--- a/app/Notifications/ScheduledTask/TaskFailed.php
+++ b/app/Notifications/ScheduledTask/TaskFailed.php
@@ -5,6 +5,7 @@ namespace App\Notifications\ScheduledTask;
 use App\Models\ScheduledTask;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -70,6 +71,30 @@ class TaskFailed extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        $message = "Scheduled task ({$this->task->name}) failed<br/>";
+
+        if ($this->output) {
+            $message .= "<br/><b>Error Output:</b>{$this->output}";
+        }
+
+        $buttons = [];
+        if ($this->url) {
+            $buttons[] = [
+                'text' => 'Open task in Coolify',
+                'url' => (string) $this->url,
+            ];
+        }
+
+        return new PushoverMessage(
+            title: 'Scheduled task failed',
+            level: 'error',
+            message: $message,
+            buttons: $buttons,
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         $title = 'Scheduled task failed';
diff --git a/app/Notifications/ScheduledTask/TaskSuccess.php b/app/Notifications/ScheduledTask/TaskSuccess.php
index fc79aea37..5d4154e7a 100644
--- a/app/Notifications/ScheduledTask/TaskSuccess.php
+++ b/app/Notifications/ScheduledTask/TaskSuccess.php
@@ -5,6 +5,7 @@ namespace App\Notifications\ScheduledTask;
 use App\Models\ScheduledTask;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -70,6 +71,25 @@ class TaskSuccess extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        $message = "Coolify: Scheduled task ({$this->task->name}) succeeded.";
+        $buttons = [];
+        if ($this->url) {
+            $buttons[] = [
+                'text' => 'Open task in Coolify',
+                'url' => (string) $this->url,
+            ];
+        }
+
+        return new PushoverMessage(
+            title: 'Scheduled task succeeded',
+            level: 'success',
+            message: $message,
+            buttons: $buttons,
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         $title = 'Scheduled task succeeded';
diff --git a/app/Notifications/Server/DockerCleanupFailed.php b/app/Notifications/Server/DockerCleanupFailed.php
index 53714925c..0291eed19 100644
--- a/app/Notifications/Server/DockerCleanupFailed.php
+++ b/app/Notifications/Server/DockerCleanupFailed.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Server;
 use App\Models\Server;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -48,6 +49,15 @@ class DockerCleanupFailed extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'Docker cleanup job failed',
+            level: 'error',
+            message: "[ACTION REQUIRED] Docker cleanup job failed on {$this->server->name}!\n\n{$this->message}",
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         return new SlackMessage(
diff --git a/app/Notifications/Server/DockerCleanupSuccess.php b/app/Notifications/Server/DockerCleanupSuccess.php
index 85a819da2..1a652d189 100644
--- a/app/Notifications/Server/DockerCleanupSuccess.php
+++ b/app/Notifications/Server/DockerCleanupSuccess.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Server;
 use App\Models\Server;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -48,6 +49,15 @@ class DockerCleanupSuccess extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'Docker cleanup job succeeded',
+            level: 'success',
+            message: "Docker cleanup job succeeded on {$this->server->name}!\n\n{$this->message}",
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         return new SlackMessage(
diff --git a/app/Notifications/Server/ForceDisabled.php b/app/Notifications/Server/ForceDisabled.php
index e122849da..7a1f7bcbf 100644
--- a/app/Notifications/Server/ForceDisabled.php
+++ b/app/Notifications/Server/ForceDisabled.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Server;
 use App\Models\Server;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -51,6 +52,15 @@ class ForceDisabled extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'Server disabled',
+            level: 'error',
+            message: "Server ({$this->server->name}) disabled because it is not paid!\n All automations and integrations are stopped.<br/>Please update your subscription to enable the server again [here](https://app.coolify.io/subscriptions).",
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         $title = 'Server disabled';
diff --git a/app/Notifications/Server/ForceEnabled.php b/app/Notifications/Server/ForceEnabled.php
index a0e0a8b59..36dad3c60 100644
--- a/app/Notifications/Server/ForceEnabled.php
+++ b/app/Notifications/Server/ForceEnabled.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Server;
 use App\Models\Server;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -47,6 +48,15 @@ class ForceEnabled extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'Server enabled',
+            level: 'success',
+            message: "Server ({$this->server->name}) enabled again!",
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         return new SlackMessage(
diff --git a/app/Notifications/Server/HighDiskUsage.php b/app/Notifications/Server/HighDiskUsage.php
index 9f4826689..aea9abd03 100644
--- a/app/Notifications/Server/HighDiskUsage.php
+++ b/app/Notifications/Server/HighDiskUsage.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Server;
 use App\Models\Server;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -57,6 +58,19 @@ class HighDiskUsage extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'High disk usage detected',
+            level: 'warning',
+            message: "Server '{$this->server->name}' high disk usage detected!<br/><br/><b>Disk usage:</b> {$this->disk_usage}%.<br/><b>Threshold:</b> {$this->server_disk_usage_notification_threshold}%.<br/>Please cleanup your disk to prevent data-loss.",
+            buttons: [
+                'Change settings' => base_url().'/server/'.$this->server->uuid."#advanced",
+                'Tips for cleanup' => "https://coolify.io/docs/knowledge-base/server/automated-cleanup",
+            ],
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         $description = "Server '{$this->server->name}' high disk usage detected!\n";
diff --git a/app/Notifications/Server/Reachable.php b/app/Notifications/Server/Reachable.php
index 4917e04f8..e03aef6b7 100644
--- a/app/Notifications/Server/Reachable.php
+++ b/app/Notifications/Server/Reachable.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Server;
 use App\Models\Server;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -49,6 +50,15 @@ class Reachable extends CustomEmailNotification
         );
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'Server revived',
+            message: "Server '{$this->server->name}' revived. All automations & integrations are turned on again!",
+            level: 'success',
+        );
+    }
+
     public function toTelegram(): array
     {
         return [
diff --git a/app/Notifications/Server/Unreachable.php b/app/Notifications/Server/Unreachable.php
index 43f176d49..fe90cc610 100644
--- a/app/Notifications/Server/Unreachable.php
+++ b/app/Notifications/Server/Unreachable.php
@@ -5,6 +5,7 @@ namespace App\Notifications\Server;
 use App\Models\Server;
 use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -60,6 +61,15 @@ class Unreachable extends CustomEmailNotification
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'Server unreachable',
+            level: 'error',
+            message: "Your server '{$this->server->name}' is unreachable.<br/>All automations & integrations are turned off!<br/><br/><b>IMPORTANT:</b> We automatically try to revive your server and turn on all automations & integrations.",
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         $description = "Your server '{$this->server->name}' is unreachable.\n";
diff --git a/app/Notifications/Test.php b/app/Notifications/Test.php
index da9098500..65971a0ee 100644
--- a/app/Notifications/Test.php
+++ b/app/Notifications/Test.php
@@ -6,7 +6,9 @@ use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\SlackChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\Channels\PushoverChannel;
 use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\PushoverMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -33,6 +35,7 @@ class Test extends Notification implements ShouldQueue
                 'discord' => [DiscordChannel::class],
                 'telegram' => [TelegramChannel::class],
                 'slack' => [SlackChannel::class],
+                'pushover' => [PushoverChannel::class],
                 default => [],
             };
         } else {
@@ -85,6 +88,20 @@ class Test extends Notification implements ShouldQueue
         ];
     }
 
+    public function toPushover(): PushoverMessage
+    {
+        return new PushoverMessage(
+            title: 'Test Pushover Notification',
+            message: 'This is a test Pushover notification from Coolify.',
+            buttons: [
+                [
+                    'text' => 'Go to your dashboard',
+                    'url' => base_url(),
+                ],
+            ],
+        );
+    }
+
     public function toSlack(): SlackMessage
     {
         return new SlackMessage(
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 015434bd2..2ce94201c 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use App\Models\PersonalAccessToken;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Validation\Rules\Password;
@@ -19,6 +20,9 @@ class AppServiceProvider extends ServiceProvider
 
     public function boot(): void
     {
+        Event::listen(function (\SocialiteProviders\Manager\SocialiteWasCalled $event) {
+            $event->extendSocialite('authentik', \SocialiteProviders\Authentik\Provider::class);
+        });
         Sanctum::usePersonalAccessTokenModel(PersonalAccessToken::class);
 
         Password::defaults(function () {
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 7ba72e10d..aa3579f8d 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -9,6 +9,9 @@ use App\Listeners\ProxyStartedNotification;
 use Illuminate\Foundation\Events\MaintenanceModeDisabled;
 use Illuminate\Foundation\Events\MaintenanceModeEnabled;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use SocialiteProviders\Authentik\AuthentikExtendSocialite;
+use SocialiteProviders\Azure\AzureExtendSocialite;
+use SocialiteProviders\Manager\SocialiteWasCalled;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -19,8 +22,9 @@ class EventServiceProvider extends ServiceProvider
         MaintenanceModeDisabled::class => [
             MaintenanceModeDisabledNotification::class,
         ],
-        \SocialiteProviders\Manager\SocialiteWasCalled::class => [
-            \SocialiteProviders\Azure\AzureExtendSocialite::class.'@handle',
+        SocialiteWasCalled::class => [
+            AzureExtendSocialite::class.'@handle',
+            AuthentikExtendSocialite::class.'@handle',
         ],
         ProxyStarted::class => [
             ProxyStartedNotification::class,
diff --git a/app/Traits/HasNotificationSettings.php b/app/Traits/HasNotificationSettings.php
index 82cbda6ad..ef858d0b6 100644
--- a/app/Traits/HasNotificationSettings.php
+++ b/app/Traits/HasNotificationSettings.php
@@ -6,6 +6,7 @@ use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\SlackChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\Channels\PushoverChannel;
 use Illuminate\Database\Eloquent\Model;
 
 trait HasNotificationSettings
@@ -27,6 +28,7 @@ trait HasNotificationSettings
             'discord' => $this->discordNotificationSettings,
             'telegram' => $this->telegramNotificationSettings,
             'slack' => $this->slackNotificationSettings,
+            'pushover' => $this->pushoverNotificationSettings,
             default => null,
         };
     }
@@ -73,6 +75,7 @@ trait HasNotificationSettings
             'discord' => DiscordChannel::class,
             'telegram' => TelegramChannel::class,
             'slack' => SlackChannel::class,
+            'pushover' => PushoverChannel::class,
         ];
 
         if ($event === 'general') {
diff --git a/app/View/Components/Status/Services.php b/app/View/Components/Status/Services.php
index 70db62172..291841854 100644
--- a/app/View/Components/Status/Services.php
+++ b/app/View/Components/Status/Services.php
@@ -17,7 +17,7 @@ class Services extends Component
         public string $complexStatus = 'exited',
         public bool $showRefreshButton = true
     ) {
-        $this->complexStatus = $service->status();
+        $this->complexStatus = $service->status;
     }
 
     /**
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 9f7cc06b0..eeb89addc 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -830,6 +830,12 @@ function generateEnvValue(string $command, Service|Application|null $service = n
         case 'PASSWORD_64':
             $generatedValue = Str::password(length: 64, symbols: false);
             break;
+        case 'PASSWORDWITHSYMBOLS':
+            $generatedValue = Str::password(symbols: true);
+            break;
+        case 'PASSWORDWITHSYMBOLS_64':
+            $generatedValue = Str::password(length: 64, symbols: true);
+            break;
             // This is not base64, it's just a random string
         case 'BASE64_64':
             $generatedValue = Str::random(64);
diff --git a/bootstrap/helpers/socialite.php b/bootstrap/helpers/socialite.php
index cad9de7fa..130227e81 100644
--- a/bootstrap/helpers/socialite.php
+++ b/bootstrap/helpers/socialite.php
@@ -18,6 +18,17 @@ function get_socialite_provider(string $provider)
         return Socialite::driver('azure')->setConfig($azure_config);
     }
 
+    if ($provider == 'authentik') {
+        $authentik_config = new \SocialiteProviders\Manager\Config(
+            $oauth_setting->client_id,
+            $oauth_setting->client_secret,
+            $oauth_setting->redirect_uri,
+            ['base_url' => $oauth_setting->base_url],
+        );
+
+        return Socialite::driver('authentik')->setConfig($authentik_config);
+    }
+
     $config = [
         'client_id' => $oauth_setting->client_id,
         'client_secret' => $oauth_setting->client_secret,
diff --git a/bootstrap/helpers/subscriptions.php b/bootstrap/helpers/subscriptions.php
index ab9ee9b9d..510516a2f 100644
--- a/bootstrap/helpers/subscriptions.php
+++ b/bootstrap/helpers/subscriptions.php
@@ -69,6 +69,7 @@ function allowedPathsForUnsubscribedAccounts()
         'logout',
         'force-password-reset',
         'livewire/update',
+        'admin',
     ];
 }
 function allowedPathsForBoardingAccounts()
diff --git a/composer.json b/composer.json
index d1c6f5e4f..b8dc354c3 100644
--- a/composer.json
+++ b/composer.json
@@ -39,6 +39,7 @@
         "pusher/pusher-php-server": "^7.2",
         "resend/resend-laravel": "^0.15.0",
         "sentry/sentry-laravel": "^4.6",
+        "socialiteproviders/authentik": "^5.2",
         "socialiteproviders/microsoft-azure": "^5.1",
         "spatie/laravel-activitylog": "^4.7.3",
         "spatie/laravel-data": "^4.11",
diff --git a/composer.lock b/composer.lock
index 68044ab56..3fbe72afb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d96fe0aedd865274164c34a1b04195fe",
+    "content-hash": "871067cb42e6347ca53ff36e81ac5079",
     "packages": [
         {
             "name": "3sidedcube/laravel-redoc",
@@ -979,16 +979,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.334.2",
+            "version": "3.334.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "b19afc076bb1cc2617bdef76efd41587596109e7"
+                "reference": "6576a9fcfc6ae7c76aed3c6fa4c3864060f72d04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b19afc076bb1cc2617bdef76efd41587596109e7",
-                "reference": "b19afc076bb1cc2617bdef76efd41587596109e7",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6576a9fcfc6ae7c76aed3c6fa4c3864060f72d04",
+                "reference": "6576a9fcfc6ae7c76aed3c6fa4c3864060f72d04",
                 "shasum": ""
             },
             "require": {
@@ -1071,9 +1071,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.334.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.334.3"
             },
-            "time": "2024-12-09T19:30:23+00:00"
+            "time": "2024-12-10T19:41:55+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -3313,16 +3313,16 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Laravel\\Socialite\\SocialiteServiceProvider"
-                    ],
                     "aliases": {
                         "Socialite": "Laravel\\Socialite\\Facades\\Socialite"
-                    }
+                    },
+                    "providers": [
+                        "Laravel\\Socialite\\SocialiteServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
@@ -4037,16 +4037,16 @@
         },
         {
             "name": "league/oauth1-client",
-            "version": "v1.10.1",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth1-client.git",
-                "reference": "d6365b901b5c287dd41f143033315e2f777e1167"
+                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167",
-                "reference": "d6365b901b5c287dd41f143033315e2f777e1167",
+                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
+                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
                 "shasum": ""
             },
             "require": {
@@ -4107,9 +4107,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth1-client/issues",
-                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.10.1"
+                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.11.0"
             },
-            "time": "2022-04-15T14:02:14+00:00"
+            "time": "2024-12-10T19:59:05+00:00"
         },
         {
             "name": "league/uri",
@@ -5952,64 +5952,6 @@
             },
             "time": "2024-10-13T11:29:49+00:00"
         },
-        {
-            "name": "phpstan/phpstan",
-            "version": "1.12.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2|^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan-shim": "*"
-            },
-            "bin": [
-                "phpstan",
-                "phpstan.phar"
-            ],
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHPStan - PHP Static Analysis Tool",
-            "keywords": [
-                "dev",
-                "static analysis"
-            ],
-            "support": {
-                "docs": "https://phpstan.org/user-guide/getting-started",
-                "forum": "https://github.com/phpstan/phpstan/discussions",
-                "issues": "https://github.com/phpstan/phpstan/issues",
-                "security": "https://github.com/phpstan/phpstan/security/policy",
-                "source": "https://github.com/phpstan/phpstan-src"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/ondrejmirtes",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/phpstan",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-11-28T22:13:23+00:00"
-        },
         {
             "name": "pimple/pimple",
             "version": "v3.5.0",
@@ -7099,65 +7041,6 @@
             ],
             "time": "2024-04-27T21:32:50+00:00"
         },
-        {
-            "name": "rector/rector",
-            "version": "1.2.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/rectorphp/rector.git",
-                "reference": "40f9cf38c05296bd32f444121336a521a293fa61"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/40f9cf38c05296bd32f444121336a521a293fa61",
-                "reference": "40f9cf38c05296bd32f444121336a521a293fa61",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.12.5"
-            },
-            "conflict": {
-                "rector/rector-doctrine": "*",
-                "rector/rector-downgrade-php": "*",
-                "rector/rector-phpunit": "*",
-                "rector/rector-symfony": "*"
-            },
-            "suggest": {
-                "ext-dom": "To manipulate phpunit.xml via the custom-rule command"
-            },
-            "bin": [
-                "bin/rector"
-            ],
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Instant Upgrade and Automated Refactoring of any PHP code",
-            "keywords": [
-                "automation",
-                "dev",
-                "migration",
-                "refactoring"
-            ],
-            "support": {
-                "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/1.2.10"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/tomasvotruba",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-11-08T13:59:10+00:00"
-        },
         {
             "name": "resend/resend-laravel",
             "version": "v0.15.0",
@@ -7534,6 +7417,56 @@
             ],
             "time": "2024-11-24T11:02:20+00:00"
         },
+        {
+            "name": "socialiteproviders/authentik",
+            "version": "5.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Authentik.git",
+                "reference": "4cf129cf04728a38e0531c54454464b162f0fa66"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Authentik/zipball/4cf129cf04728a38e0531c54454464b162f0fa66",
+                "reference": "4cf129cf04728a38e0531c54454464b162f0fa66",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^8.0",
+                "socialiteproviders/manager": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Authentik\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "rf152",
+                    "email": "git@rf152.co.uk"
+                }
+            ],
+            "description": "Authentik OAuth2 Provider for Laravel Socialite",
+            "keywords": [
+                "authentik",
+                "laravel",
+                "oauth",
+                "provider",
+                "socialite"
+            ],
+            "support": {
+                "docs": "https://socialiteproviders.com/authentik",
+                "issues": "https://github.com/socialiteproviders/providers/issues",
+                "source": "https://github.com/socialiteproviders/providers"
+            },
+            "time": "2023-11-07T22:21:16+00:00"
+        },
         {
             "name": "socialiteproviders/manager",
             "version": "v4.7.0",
@@ -7959,40 +7892,41 @@
         },
         {
             "name": "spatie/laravel-ray",
-            "version": "1.37.1",
+            "version": "1.39.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-ray.git",
-                "reference": "c2bedfd1172648df2c80aaceb2541d70f1d9a5b9"
+                "reference": "31b601f98590606d20e76b5dd68578dc1642cd2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/c2bedfd1172648df2c80aaceb2541d70f1d9a5b9",
-                "reference": "c2bedfd1172648df2c80aaceb2541d70f1d9a5b9",
+                "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/31b601f98590606d20e76b5dd68578dc1642cd2c",
+                "reference": "31b601f98590606d20e76b5dd68578dc1642cd2c",
                 "shasum": ""
             },
             "require": {
+                "composer-runtime-api": "^2.2",
                 "ext-json": "*",
-                "illuminate/contracts": "^7.20|^8.19|^9.0|^10.0|^11.0",
-                "illuminate/database": "^7.20|^8.19|^9.0|^10.0|^11.0",
-                "illuminate/queue": "^7.20|^8.19|^9.0|^10.0|^11.0",
-                "illuminate/support": "^7.20|^8.19|^9.0|^10.0|^11.0",
-                "php": "^7.4|^8.0",
-                "rector/rector": "^0.19.2|^1.0",
+                "illuminate/contracts": "^7.20 || ^8.19 || ^9.0 || ^10.0 || ^11.0",
+                "illuminate/database": "^7.20 || ^8.19 || ^9.0 || ^10.0 || ^11.0",
+                "illuminate/queue": "^7.20 || ^8.19 || ^9.0 || ^10.0 || ^11.0",
+                "illuminate/support": "^7.20 || ^8.19 || ^9.0 || ^10.0 || ^11.0",
+                "php": "^7.4 || ^8.0",
                 "spatie/backtrace": "^1.0",
-                "spatie/ray": "^1.41.1",
-                "symfony/stopwatch": "4.2|^5.1|^6.0|^7.0",
-                "zbateson/mail-mime-parser": "^1.3.1|^2.0|^3.0"
+                "spatie/ray": "^1.41.3",
+                "symfony/stopwatch": "4.2 || ^5.1 || ^6.0 || ^7.0",
+                "zbateson/mail-mime-parser": "^1.3.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
                 "guzzlehttp/guzzle": "^7.3",
-                "laravel/framework": "^7.20|^8.19|^9.0|^10.0|^11.0",
-                "orchestra/testbench-core": "^5.0|^6.0|^7.0|^8.0|^9.0",
-                "pestphp/pest": "^1.22|^2.0",
-                "phpstan/phpstan": "^1.10.57",
-                "phpunit/phpunit": "^9.3|^10.1",
-                "spatie/pest-plugin-snapshots": "^1.1|^2.0",
-                "symfony/var-dumper": "^4.2|^5.1|^6.0|^7.0.3"
+                "laravel/framework": "^7.20 || ^8.19 || ^9.0 || ^10.0 || ^11.0",
+                "orchestra/testbench-core": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "pestphp/pest": "^1.22 || ^2.0",
+                "phpstan/phpstan": "^1.10.57 || ^2.0.2",
+                "phpunit/phpunit": "^9.3 || ^10.1",
+                "rector/rector": "dev-main",
+                "spatie/pest-plugin-snapshots": "^1.1 || ^2.0",
+                "symfony/var-dumper": "^4.2 || ^5.1 || ^6.0 || ^7.0.3"
             },
             "type": "library",
             "extra": {
@@ -8030,7 +7964,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-ray/issues",
-                "source": "https://github.com/spatie/laravel-ray/tree/1.37.1"
+                "source": "https://github.com/spatie/laravel-ray/tree/1.39.0"
             },
             "funding": [
                 {
@@ -8042,7 +7976,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-07-12T12:35:17+00:00"
+            "time": "2024-12-11T09:34:41+00:00"
         },
         {
             "name": "spatie/laravel-schemaless-attributes",
@@ -8532,16 +8466,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.0",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
-                "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+                "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
                 "shasum": ""
             },
             "require": {
@@ -8605,7 +8539,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.0"
+                "source": "https://github.com/symfony/console/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -8621,7 +8555,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-06T14:24:19+00:00"
+            "time": "2024-12-11T03:49:26+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -8757,16 +8691,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.2.0",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "672b3dd1ef8b87119b446d67c58c106c43f965fe"
+                "reference": "6150b89186573046167796fa5f3f76601d5145f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/672b3dd1ef8b87119b446d67c58c106c43f965fe",
-                "reference": "672b3dd1ef8b87119b446d67c58c106c43f965fe",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/6150b89186573046167796fa5f3f76601d5145f8",
+                "reference": "6150b89186573046167796fa5f3f76601d5145f8",
                 "shasum": ""
             },
             "require": {
@@ -8812,7 +8746,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.2.0"
+                "source": "https://github.com/symfony/error-handler/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -8828,7 +8762,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-05T15:35:02+00:00"
+            "time": "2024-12-07T08:50:44+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -9130,16 +9064,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.2.0",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "6b4722a25e0aed1ccb4914b9bcbd493cc4676b4d"
+                "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6b4722a25e0aed1ccb4914b9bcbd493cc4676b4d",
-                "reference": "6b4722a25e0aed1ccb4914b9bcbd493cc4676b4d",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d8ae58eecae44c8e66833e76cc50a4ad3c002d97",
+                "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97",
                 "shasum": ""
             },
             "require": {
@@ -9224,7 +9158,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.2.0"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -9240,7 +9174,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-29T08:42:40+00:00"
+            "time": "2024-12-11T12:09:10+00:00"
         },
         {
             "name": "symfony/mailer",
@@ -9324,16 +9258,16 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v7.2.0",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "cc84a4b81f62158c3846ac7ff10f696aae2b524d"
+                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/cc84a4b81f62158c3846ac7ff10f696aae2b524d",
-                "reference": "cc84a4b81f62158c3846ac7ff10f696aae2b524d",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/7f9617fcf15cb61be30f8b252695ed5e2bfac283",
+                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283",
                 "shasum": ""
             },
             "require": {
@@ -9388,7 +9322,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.2.0"
+                "source": "https://github.com/symfony/mime/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -9404,7 +9338,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-23T09:19:39+00:00"
+            "time": "2024-12-07T08:50:44+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -13222,17 +13156,75 @@
             "time": "2024-11-21T15:12:59+00:00"
         },
         {
-            "name": "phpunit/php-code-coverage",
-            "version": "11.0.7",
+            "name": "phpstan/phpstan",
+            "version": "1.12.12",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca"
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7f08030e8811582cc459871d28d6f5a1a4d35ca",
-                "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
+                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "keywords": [
+                "dev",
+                "static analysis"
+            ],
+            "support": {
+                "docs": "https://phpstan.org/user-guide/getting-started",
+                "forum": "https://github.com/phpstan/phpstan/discussions",
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "security": "https://github.com/phpstan/phpstan/security/policy",
+                "source": "https://github.com/phpstan/phpstan-src"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-11-28T22:13:23+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "11.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "418c59fd080954f8c4aa5631d9502ecda2387118"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/418c59fd080954f8c4aa5631d9502ecda2387118",
+                "reference": "418c59fd080954f8c4aa5631d9502ecda2387118",
                 "shasum": ""
             },
             "require": {
@@ -13251,7 +13243,7 @@
                 "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.4.1"
+                "phpunit/phpunit": "^11.5.0"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -13289,7 +13281,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.7"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.8"
             },
             "funding": [
                 {
@@ -13297,7 +13289,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-09T06:21:38+00:00"
+            "time": "2024-12-11T12:34:27+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -14615,16 +14607,16 @@
         },
         {
             "name": "spatie/error-solutions",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/error-solutions.git",
-                "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67"
+                "reference": "d239a65235a1eb128dfa0a4e4c4ef032ea11b541"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/ae7393122eda72eed7cc4f176d1e96ea444f2d67",
-                "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67",
+                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/d239a65235a1eb128dfa0a4e4c4ef032ea11b541",
+                "reference": "d239a65235a1eb128dfa0a4e4c4ef032ea11b541",
                 "shasum": ""
             },
             "require": {
@@ -14677,7 +14669,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/error-solutions/issues",
-                "source": "https://github.com/spatie/error-solutions/tree/1.1.1"
+                "source": "https://github.com/spatie/error-solutions/tree/1.1.2"
             },
             "funding": [
                 {
@@ -14685,7 +14677,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-25T11:06:04+00:00"
+            "time": "2024-12-11T09:51:56+00:00"
         },
         {
             "name": "spatie/flare-client-php",
diff --git a/config/constants.php b/config/constants.php
index 4ea4411b6..99859ffb8 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.377',
+        'version' => '4.0.0-beta.380',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
@@ -33,6 +33,14 @@ return [
         'app_key' => env('PUSHER_APP_KEY'),
     ],
 
+    'migration' => [
+        'is_migration_enabled' => env('MIGRATION_ENABLED', true),
+    ],
+
+    'seeder' => [
+        'is_seeder_enabled' => env('SEEDER_ENABLED', true),
+    ],
+
     'horizon' => [
         'is_horizon_enabled' => env('HORIZON_ENABLED', true),
         'is_scheduler_enabled' => env('SCHEDULER_ENABLED', true),
diff --git a/config/services.php b/config/services.php
index 9fd55870f..46fd12ec3 100644
--- a/config/services.php
+++ b/config/services.php
@@ -38,4 +38,11 @@ return [
         'tenant' => env('AZURE_TENANT_ID'),
         'proxy' => env('AZURE_PROXY'),
     ],
+
+    'authentik' => [
+        'base_url' => env('AUTHENTIK_BASE_URL'),
+        'client_id' => env('AUTHENTIK_CLIENT_ID'),
+        'client_secret' => env('AUTHENTIK_CLIENT_SECRET'),
+        'redirect' => env('AUTHENTIK_REDIRECT_URI'),
+    ],
 ];
diff --git a/database/migrations/2024_10_30_074601_rename_token_permissions.php b/database/migrations/2024_10_30_074601_rename_token_permissions.php
index 2ca98d090..69d774d7f 100644
--- a/database/migrations/2024_10_30_074601_rename_token_permissions.php
+++ b/database/migrations/2024_10_30_074601_rename_token_permissions.php
@@ -40,7 +40,7 @@ return new class extends Migration
             $tokens = PersonalAccessToken::all();
             foreach ($tokens as $token) {
                 $abilities = collect();
-                if (in_array('write', $token->abilities)) {
+                if (in_array('root', $token->abilities)) {
                     $abilities->push('*');
                 } else {
                     if (in_array('read', $token->abilities)) {
diff --git a/database/migrations/2024_12_05_212440_create_telegram_notification_settings_table.php b/database/migrations/2024_12_05_212440_create_telegram_notification_settings_table.php
index 190d148fc..db4d998e3 100644
--- a/database/migrations/2024_12_05_212440_create_telegram_notification_settings_table.php
+++ b/database/migrations/2024_12_05_212440_create_telegram_notification_settings_table.php
@@ -32,18 +32,18 @@ return new class extends Migration
             $table->boolean('server_reachable_telegram_notifications')->default(false);
             $table->boolean('server_unreachable_telegram_notifications')->default(true);
 
-            $table->text('telegram_notifications_deployment_success_topic_id')->nullable();
-            $table->text('telegram_notifications_deployment_failure_topic_id')->nullable();
-            $table->text('telegram_notifications_status_change_topic_id')->nullable();
-            $table->text('telegram_notifications_backup_success_topic_id')->nullable();
-            $table->text('telegram_notifications_backup_failure_topic_id')->nullable();
-            $table->text('telegram_notifications_scheduled_task_success_topic_id')->nullable();
-            $table->text('telegram_notifications_scheduled_task_failure_topic_id')->nullable();
-            $table->text('telegram_notifications_docker_cleanup_success_topic_id')->nullable();
-            $table->text('telegram_notifications_docker_cleanup_failure_topic_id')->nullable();
-            $table->text('telegram_notifications_server_disk_usage_topic_id')->nullable();
-            $table->text('telegram_notifications_server_reachable_topic_id')->nullable();
-            $table->text('telegram_notifications_server_unreachable_topic_id')->nullable();
+            $table->text('telegram_notifications_deployment_success_thread_id')->nullable();
+            $table->text('telegram_notifications_deployment_failure_thread_id')->nullable();
+            $table->text('telegram_notifications_status_change_thread_id')->nullable();
+            $table->text('telegram_notifications_backup_success_thread_id')->nullable();
+            $table->text('telegram_notifications_backup_failure_thread_id')->nullable();
+            $table->text('telegram_notifications_scheduled_task_success_thread_id')->nullable();
+            $table->text('telegram_notifications_scheduled_task_failure_thread_id')->nullable();
+            $table->text('telegram_notifications_docker_cleanup_success_thread_id')->nullable();
+            $table->text('telegram_notifications_docker_cleanup_failure_thread_id')->nullable();
+            $table->text('telegram_notifications_server_disk_usage_thread_id')->nullable();
+            $table->text('telegram_notifications_server_reachable_thread_id')->nullable();
+            $table->text('telegram_notifications_server_unreachable_thread_id')->nullable();
 
             $table->unique(['team_id']);
         });
diff --git a/database/migrations/2024_12_05_212705_migrate_telegram_notification_settings_from_teams_table.php b/database/migrations/2024_12_05_212705_migrate_telegram_notification_settings_from_teams_table.php
index 0c10646b9..df120e273 100644
--- a/database/migrations/2024_12_05_212705_migrate_telegram_notification_settings_from_teams_table.php
+++ b/database/migrations/2024_12_05_212705_migrate_telegram_notification_settings_from_teams_table.php
@@ -4,6 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
@@ -30,17 +31,17 @@ return new class extends Migration
                         'status_change_telegram_notifications' => $team->telegram_notifications_status_changes ?? false,
                         'server_disk_usage_telegram_notifications' => $team->telegram_notifications_server_disk_usage ?? true,
 
-                        'telegram_notifications_deployment_success_topic_id' => $team->telegram_notifications_deployments_message_thread_id ? Crypt::encryptString($team->telegram_notifications_deployments_message_thread_id) : null,
-                        'telegram_notifications_deployment_failure_topic_id' => $team->telegram_notifications_deployments_message_thread_id ? Crypt::encryptString($team->telegram_notifications_deployments_message_thread_id) : null,
-                        'telegram_notifications_backup_success_topic_id' => $team->telegram_notifications_database_backups_message_thread_id ? Crypt::encryptString($team->telegram_notifications_database_backups_message_thread_id) : null,
-                        'telegram_notifications_backup_failure_topic_id' => $team->telegram_notifications_database_backups_message_thread_id ? Crypt::encryptString($team->telegram_notifications_database_backups_message_thread_id) : null,
-                        'telegram_notifications_scheduled_task_success_topic_id' => $team->telegram_notifications_scheduled_tasks_thread_id ? Crypt::encryptString($team->telegram_notifications_scheduled_tasks_thread_id) : null,
-                        'telegram_notifications_scheduled_task_failure_topic_id' => $team->telegram_notifications_scheduled_tasks_thread_id ? Crypt::encryptString($team->telegram_notifications_scheduled_tasks_thread_id) : null,
-                        'telegram_notifications_status_change_topic_id' => $team->telegram_notifications_status_changes_message_thread_id ? Crypt::encryptString($team->telegram_notifications_status_changes_message_thread_id) : null,
+                        'telegram_notifications_deployment_success_thread_id' => $team->telegram_notifications_deployments_message_thread_id ? Crypt::encryptString($team->telegram_notifications_deployments_message_thread_id) : null,
+                        'telegram_notifications_deployment_failure_thread_id' => $team->telegram_notifications_deployments_message_thread_id ? Crypt::encryptString($team->telegram_notifications_deployments_message_thread_id) : null,
+                        'telegram_notifications_backup_success_thread_id' => $team->telegram_notifications_database_backups_message_thread_id ? Crypt::encryptString($team->telegram_notifications_database_backups_message_thread_id) : null,
+                        'telegram_notifications_backup_failure_thread_id' => $team->telegram_notifications_database_backups_message_thread_id ? Crypt::encryptString($team->telegram_notifications_database_backups_message_thread_id) : null,
+                        'telegram_notifications_scheduled_task_success_thread_id' => $team->telegram_notifications_scheduled_tasks_thread_id ? Crypt::encryptString($team->telegram_notifications_scheduled_tasks_thread_id) : null,
+                        'telegram_notifications_scheduled_task_failure_thread_id' => $team->telegram_notifications_scheduled_tasks_thread_id ? Crypt::encryptString($team->telegram_notifications_scheduled_tasks_thread_id) : null,
+                        'telegram_notifications_status_change_thread_id' => $team->telegram_notifications_status_changes_message_thread_id ? Crypt::encryptString($team->telegram_notifications_status_changes_message_thread_id) : null,
                     ]
                 );
             } catch (Exception $e) {
-                \Log::error('Error migrating telegram notification settings from teams table: '.$e->getMessage());
+                Log::error('Error migrating telegram notification settings from teams table: '.$e->getMessage());
             }
         }
 
@@ -101,13 +102,13 @@ return new class extends Migration
                         'telegram_notifications_scheduled_tasks' => $setting->scheduled_task_success_telegram_notifications || $setting->scheduled_task_failure_telegram_notifications,
                         'telegram_notifications_server_disk_usage' => $setting->server_disk_usage_telegram_notifications,
 
-                        'telegram_notifications_deployments_message_thread_id' => $setting->telegram_notifications_deployment_success_topic_id ? Crypt::decryptString($setting->telegram_notifications_deployment_success_topic_id) : null,
-                        'telegram_notifications_status_changes_message_thread_id' => $setting->telegram_notifications_status_change_topic_id ? Crypt::decryptString($setting->telegram_notifications_status_change_topic_id) : null,
-                        'telegram_notifications_database_backups_message_thread_id' => $setting->telegram_notifications_backup_success_topic_id ? Crypt::decryptString($setting->telegram_notifications_backup_success_topic_id) : null,
-                        'telegram_notifications_scheduled_tasks_thread_id' => $setting->telegram_notifications_scheduled_task_success_topic_id ? Crypt::decryptString($setting->telegram_notifications_scheduled_task_success_topic_id) : null,
+                        'telegram_notifications_deployments_message_thread_id' => $setting->telegram_notifications_deployment_success_thread_id ? Crypt::decryptString($setting->telegram_notifications_deployment_success_thread_id) : null,
+                        'telegram_notifications_status_changes_message_thread_id' => $setting->telegram_notifications_status_change_thread_id ? Crypt::decryptString($setting->telegram_notifications_status_change_thread_id) : null,
+                        'telegram_notifications_database_backups_message_thread_id' => $setting->telegram_notifications_backup_success_thread_id ? Crypt::decryptString($setting->telegram_notifications_backup_success_thread_id) : null,
+                        'telegram_notifications_scheduled_tasks_thread_id' => $setting->telegram_notifications_scheduled_task_success_thread_id ? Crypt::decryptString($setting->telegram_notifications_scheduled_task_success_thread_id) : null,
                     ]);
             } catch (Exception $e) {
-                \Log::error('Error migrating telegram notification settings from teams table: '.$e->getMessage());
+                Log::error('Error migrating telegram notification settings from teams table: '.$e->getMessage());
             }
         }
     }
diff --git a/database/migrations/2024_12_06_142014_create_slack_notification_settings_table.php b/database/migrations/2024_12_06_142014_create_slack_notification_settings_table.php
index 790e0f667..8aee40d87 100644
--- a/database/migrations/2024_12_06_142014_create_slack_notification_settings_table.php
+++ b/database/migrations/2024_12_06_142014_create_slack_notification_settings_table.php
@@ -3,6 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
@@ -42,7 +43,7 @@ return new class extends Migration
                     'team_id' => $team->id,
                 ]);
             } catch (\Throwable $e) {
-                \Log::error('Error migrating slack notification settings from teams table: '.$e->getMessage());
+                Log::error('Error creating slack notification settings for existing teams: '.$e->getMessage());
             }
         }
     }
diff --git a/database/migrations/2024_12_10_122142_encrypt_instance_settings_email_columns.php b/database/migrations/2024_12_10_122142_encrypt_instance_settings_email_columns.php
index 44e0f2f47..5602e0ae9 100644
--- a/database/migrations/2024_12_10_122142_encrypt_instance_settings_email_columns.php
+++ b/database/migrations/2024_12_10_122142_encrypt_instance_settings_email_columns.php
@@ -45,11 +45,11 @@ return new class extends Migration
     public function down(): void
     {
         Schema::table('instance_settings', function (Blueprint $table) {
-            $table->string('smtp_from_address')->nullable()->change();
-            $table->string('smtp_from_name')->nullable()->change();
-            $table->string('smtp_recipients')->nullable()->change();
-            $table->string('smtp_host')->nullable()->change();
-            $table->string('smtp_username')->nullable()->change();
+            $table->text('smtp_from_address')->nullable()->change();
+            $table->text('smtp_from_name')->nullable()->change();
+            $table->text('smtp_recipients')->nullable()->change();
+            $table->text('smtp_host')->nullable()->change();
+            $table->text('smtp_username')->nullable()->change();
         });
 
         if (DB::table('instance_settings')->exists()) {
diff --git a/database/migrations/2024_12_11_135026_create_pushover_notification_settings_table.php b/database/migrations/2024_12_11_135026_create_pushover_notification_settings_table.php
new file mode 100644
index 000000000..ad4215a07
--- /dev/null
+++ b/database/migrations/2024_12_11_135026_create_pushover_notification_settings_table.php
@@ -0,0 +1,59 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('pushover_notification_settings', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('team_id')->constrained()->cascadeOnDelete();
+
+            $table->boolean('pushover_enabled')->default(false);
+            $table->text('pushover_user_key')->nullable();
+            $table->text('pushover_api_token')->nullable();
+
+            $table->boolean('deployment_success_pushover_notifications')->default(false);
+            $table->boolean('deployment_failure_pushover_notifications')->default(true);
+            $table->boolean('status_change_pushover_notifications')->default(false);
+            $table->boolean('backup_success_pushover_notifications')->default(false);
+            $table->boolean('backup_failure_pushover_notifications')->default(true);
+            $table->boolean('scheduled_task_success_pushover_notifications')->default(false);
+            $table->boolean('scheduled_task_failure_pushover_notifications')->default(true);
+            $table->boolean('docker_cleanup_success_pushover_notifications')->default(false);
+            $table->boolean('docker_cleanup_failure_pushover_notifications')->default(true);
+            $table->boolean('server_disk_usage_pushover_notifications')->default(true);
+            $table->boolean('server_reachable_pushover_notifications')->default(false);
+            $table->boolean('server_unreachable_pushover_notifications')->default(true);
+
+            $table->unique(['team_id']);
+        });
+        $teams = DB::table('teams')->get();
+
+        foreach ($teams as $team) {
+            try {
+                DB::table('pushover_notification_settings')->insert([
+                    'team_id' => $team->id,
+                ]);
+            } catch (\Throwable $e) {
+                Log::error('Error creating pushover notification settings for existing teams: '.$e->getMessage());
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('pushover_notification_settings');
+    }
+};
diff --git a/database/migrations/2024_12_11_161418_add_authentik_base_url_to_oauth_settings_table.php b/database/migrations/2024_12_11_161418_add_authentik_base_url_to_oauth_settings_table.php
new file mode 100644
index 000000000..44ecb0cde
--- /dev/null
+++ b/database/migrations/2024_12_11_161418_add_authentik_base_url_to_oauth_settings_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('oauth_settings', function (Blueprint $table) {
+            $table->string('base_url')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('oauth_settings', function (Blueprint $table) {
+            $table->dropColumn('base_url');
+        });
+    }
+};
diff --git a/database/migrations/2024_12_13_103007_encrypt_resend_api_key_in_instance_settings.php b/database/migrations/2024_12_13_103007_encrypt_resend_api_key_in_instance_settings.php
new file mode 100644
index 000000000..ab9b3416a
--- /dev/null
+++ b/database/migrations/2024_12_13_103007_encrypt_resend_api_key_in_instance_settings.php
@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        if (DB::table('instance_settings')->exists()) {
+            $settings = DB::table('instance_settings')->get();
+            foreach ($settings as $setting) {
+                try {
+                    DB::table('instance_settings')->where('id', $setting->id)->update([
+                        'resend_api_key' => $setting->resend_api_key ? Crypt::encryptString($setting->resend_api_key) : null,
+                    ]);
+                } catch (Exception $e) {
+                    \Log::error('Error encrypting resend_api_key: '.$e->getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        if (DB::table('instance_settings')->exists()) {
+            $settings = DB::table('instance_settings')->get();
+            foreach ($settings as $setting) {
+                try {
+                    DB::table('instance_settings')->where('id', $setting->id)->update([
+                        'resend_api_key' => $setting->resend_api_key ? Crypt::decryptString($setting->resend_api_key) : null,
+                    ]);
+                } catch (Exception $e) {
+                    \Log::error('Error decrypting resend_api_key: '.$e->getMessage());
+                }
+            }
+        }
+    }
+};
diff --git a/database/seeders/OauthSettingSeeder.php b/database/seeders/OauthSettingSeeder.php
index 16abf9e04..df7619fec 100644
--- a/database/seeders/OauthSettingSeeder.php
+++ b/database/seeders/OauthSettingSeeder.php
@@ -4,6 +4,7 @@ namespace Database\Seeders;
 
 use App\Models\OauthSetting;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Log;
 
 class OauthSettingSeeder extends Seeder
 {
@@ -12,25 +13,53 @@ class OauthSettingSeeder extends Seeder
      */
     public function run(): void
     {
-        OauthSetting::firstOrCreate([
-            'id' => 0,
-            'provider' => 'azure',
-        ]);
-        OauthSetting::firstOrCreate([
-            'id' => 1,
-            'provider' => 'bitbucket',
-        ]);
-        OauthSetting::firstOrCreate([
-            'id' => 2,
-            'provider' => 'github',
-        ]);
-        OauthSetting::firstOrCreate([
-            'id' => 3,
-            'provider' => 'gitlab',
-        ]);
-        OauthSetting::firstOrCreate([
-            'id' => 4,
-            'provider' => 'google',
-        ]);
+        try {
+            $providers = collect([
+                'azure',
+                'bitbucket',
+                'github',
+                'gitlab',
+                'google',
+                'authentik',
+            ]);
+
+            $isOauthSeeded = OauthSetting::count() > 0;
+
+            // We changed how providers are defined in the database, so we authentik does not exists, we need to recreate all of the auth providers
+            // Before authentik was a provider, providers started with 0 id
+
+            $isOauthAuthentik = OauthSetting::where('provider', 'authentik')->exists();
+            if (! $isOauthSeeded || $isOauthAuthentik) {
+                foreach ($providers as $provider) {
+                    OauthSetting::updateOrCreate([
+                        'provider' => $provider,
+                    ]);
+                }
+
+                return;
+            }
+
+            $allProviders = OauthSetting::all();
+            $notFoundProviders = $providers->diff($allProviders->pluck('provider'));
+
+            $allProviders->each(function ($provider) {
+                $provider->delete();
+            });
+            $allProviders->each(function ($provider) {
+                $provider = new OauthSetting;
+                $provider->provider = $provider->provider;
+                unset($provider->id);
+                $provider->save();
+            });
+
+            foreach ($notFoundProviders as $provider) {
+                OauthSetting::create([
+                    'provider' => $provider,
+                ]);
+            }
+
+        } catch (\Exception $e) {
+            Log::error($e->getMessage());
+        }
     }
 }
diff --git a/docker/development/etc/nginx/site-opts.d/http.conf b/docker/development/etc/nginx/site-opts.d/http.conf
index 41735cf06..9f7e49ee2 100644
--- a/docker/development/etc/nginx/site-opts.d/http.conf
+++ b/docker/development/etc/nginx/site-opts.d/http.conf
@@ -39,7 +39,7 @@ location ~ \.php$ {
     fastcgi_index  index.php;
     fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
     include        fastcgi_params;
-    fastcgi_buffers 8 8k;
-    fastcgi_buffer_size 8k;
+    fastcgi_buffers 16 16k;
+    fastcgi_buffer_size 32k;
     fastcgi_read_timeout 99;
 }
diff --git a/docker/development/etc/php/conf.d/zzz-custom-php.ini b/docker/development/etc/php/conf.d/zzz-custom-php.ini
index 33fb865e0..dcf048904 100644
--- a/docker/development/etc/php/conf.d/zzz-custom-php.ini
+++ b/docker/development/etc/php/conf.d/zzz-custom-php.ini
@@ -7,3 +7,4 @@ ignore_repeated_source = On
 
 upload_max_filesize = 256M
 post_max_size = 256M
+memory_limit = ${PHP_MEMORY_LIMIT:-256M}
diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
index 09281a666..aaef29f9d 100644
--- a/docker/production/Dockerfile
+++ b/docker/production/Dockerfile
@@ -99,6 +99,9 @@ RUN mkdir -p /usr/local/bin && \
 COPY docker/production/etc/php/conf.d/zzz-custom-php.ini /usr/local/etc/php/conf.d/zzz-custom-php.ini
 ENV PHP_OPCACHE_ENABLE=1
 
+# Configure entrypoint
+COPY --chmod=755 docker/production/entrypoint.d/ /etc/entrypoint.d
+
 # Copy application files from previous stages
 COPY --from=base --chown=www-data:www-data /var/www/html/vendor ./vendor
 COPY --from=static-assets --chown=www-data:www-data /app/public/build ./public/build
diff --git a/docker/production/entrypoint.d/99-debug-mode.sh b/docker/production/entrypoint.d/99-debug-mode.sh
new file mode 100644
index 000000000..e0a181373
--- /dev/null
+++ b/docker/production/entrypoint.d/99-debug-mode.sh
@@ -0,0 +1,8 @@
+# Debug mode
+if [ "$APP_DEBUG" = "true" ]; then
+    echo "Debug mode is enabled"
+    echo "Installing development dependencies..."
+    composer install --dev --no-scripts
+    echo "Clearing optimized classes..."
+    php artisan optimize:clear
+fi
diff --git a/docker/production/etc/nginx/site-opts.d/http.conf b/docker/production/etc/nginx/site-opts.d/http.conf
index 41735cf06..9f7e49ee2 100644
--- a/docker/production/etc/nginx/site-opts.d/http.conf
+++ b/docker/production/etc/nginx/site-opts.d/http.conf
@@ -39,7 +39,7 @@ location ~ \.php$ {
     fastcgi_index  index.php;
     fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
     include        fastcgi_params;
-    fastcgi_buffers 8 8k;
-    fastcgi_buffer_size 8k;
+    fastcgi_buffers 16 16k;
+    fastcgi_buffer_size 32k;
     fastcgi_read_timeout 99;
 }
diff --git a/docker/production/etc/php/conf.d/zzz-custom-php.ini b/docker/production/etc/php/conf.d/zzz-custom-php.ini
index a2297ad0d..ee18b77e9 100644
--- a/docker/production/etc/php/conf.d/zzz-custom-php.ini
+++ b/docker/production/etc/php/conf.d/zzz-custom-php.ini
@@ -7,3 +7,4 @@ ignore_repeated_source = On
 
 upload_max_filesize = 256M
 post_max_size = 256M
+memory_limit = ${PHP_MEMORY_LIMIT:-256M}
diff --git a/docker/production/etc/s6-overlay/s6-rc.d/db-migration/up b/docker/production/etc/s6-overlay/s6-rc.d/db-migration/up
index f1a5006f1..c2548d136 100644
--- a/docker/production/etc/s6-overlay/s6-rc.d/db-migration/up
+++ b/docker/production/etc/s6-overlay/s6-rc.d/db-migration/up
@@ -6,8 +6,6 @@ cd /var/www/html
 foreground {
     php
     artisan
-    migrate
-    --force
-    --isolated
+    start:migration
 }
 
diff --git a/docker/production/etc/s6-overlay/s6-rc.d/init-seeder/up b/docker/production/etc/s6-overlay/s6-rc.d/init-seeder/up
index 20d17c58b..007f4233e 100644
--- a/docker/production/etc/s6-overlay/s6-rc.d/init-seeder/up
+++ b/docker/production/etc/s6-overlay/s6-rc.d/init-seeder/up
@@ -6,10 +6,7 @@ cd /var/www/html
 foreground {
     php
     artisan
-    db:seed
-    --class
-    ProductionSeeder
-    --force
+    start:seeder
 }
 
 
diff --git a/lang/en.json b/lang/en.json
index 5ea474b02..4e0749ece 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1,5 +1,6 @@
 {
     "auth.login": "Login",
+    "auth.login.authentik": "Login with Authentik",
     "auth.login.azure": "Login with Microsoft",
     "auth.login.bitbucket": "Login with Bitbucket",
     "auth.login.github": "Login with GitHub",
diff --git a/other/logos/internetgarden.ico b/other/logos/internetgarden.ico
new file mode 100644
index 000000000..e555984be
Binary files /dev/null and b/other/logos/internetgarden.ico differ
diff --git a/other/nightly/install.sh b/other/nightly/install.sh
index 4a03a5c98..def105aa7 100755
--- a/other/nightly/install.sh
+++ b/other/nightly/install.sh
@@ -13,6 +13,50 @@ DOCKER_VERSION="27.0"
 # TODO: Ask for a user
 CURRENT_USER=$USER
 
+if [ $EUID != 0 ]; then
+    echo "Please run this script as root or with sudo"
+    exit
+fi
+
+echo -e "Welcome to Coolify Installer!"
+echo -e "This script will install everything for you. Sit back and relax."
+echo -e "Source code: https://github.com/coollabsio/coolify/blob/main/scripts/install.sh\n"
+
+TOTAL_SPACE=$(df -BG / | awk 'NR==2 {print $2}' | sed 's/G//')
+AVAILABLE_SPACE=$(df -BG / | awk 'NR==2 {print $4}' | sed 's/G//')
+REQUIRED_TOTAL_SPACE=30
+REQUIRED_AVAILABLE_SPACE=20
+WARNING_SPACE=false
+
+if [ "$TOTAL_SPACE" -lt "$REQUIRED_TOTAL_SPACE" ]; then
+    WARNING_SPACE=true
+    cat << EOF
+WARNING: Insufficient total disk space!
+
+Total disk space:     ${TOTAL_SPACE}GB
+Required disk space:  ${REQUIRED_TOTAL_SPACE}GB
+
+==================
+EOF
+fi
+
+if [ "$AVAILABLE_SPACE" -lt "$REQUIRED_AVAILABLE_SPACE" ]; then
+    cat << EOF
+WARNING: Insufficient available disk space!
+
+Available disk space:   ${AVAILABLE_SPACE}GB
+Required available space: ${REQUIRED_AVAILABLE_SPACE}GB
+
+==================
+EOF
+WARNING_SPACE=true
+fi
+
+if [ "$WARNING_SPACE" = true ]; then
+    echo "Sleeping for 5 seconds."
+    sleep 5
+fi
+
 mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance,sentinel}
 mkdir -p /data/coolify/ssh/{keys,mux}
 mkdir -p /data/coolify/proxy/dynamic
@@ -39,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"
@@ -83,11 +132,6 @@ if [ -z "$LATEST_REALTIME_VERSION" ]; then
 fi
 
 
-if [ $EUID != 0 ]; then
-    echo "Please run as root"
-    exit
-fi
-
 case "$OS_TYPE" in
 arch | ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed | almalinux | amzn | alpine) ;;
 *)
@@ -103,21 +147,8 @@ if [ "$1" != "" ]; then
     LATEST_VERSION="${LATEST_VERSION#v}"
 fi
 
-echo -e "\033[0;35m"
-cat << "EOF"
-   _____            _ _  __
-  / ____|          | (_)/ _|
- | |     ___   ___ | |_| |_ _   _
- | |    / _ \ / _ \| | |  _| | | |
- | |___| (_) | (_) | | | | | |_| |
-  \_____\___/ \___/|_|_|_|  \__, |
-                             __/ |
-                            |___/
-EOF
-echo -e "\033[0m"
-echo -e "Welcome to Coolify Installer!"
-echo -e "This script will install everything for you. Sit back and relax."
-echo -e "Source code: https://github.com/coollabsio/coolify/blob/main/scripts/install.sh\n"
+
+
 echo -e "---------------------------------------------"
 echo "| Operating System  | $OS_TYPE $OS_VERSION"
 echo "| Docker            | $DOCKER_VERSION"
@@ -125,24 +156,24 @@ echo "| Coolify           | $LATEST_VERSION"
 echo "| Helper            | $LATEST_HELPER_VERSION"
 echo "| Realtime          | $LATEST_REALTIME_VERSION"
 echo -e "---------------------------------------------\n"
-echo -e "1. Installing required packages (curl, wget, git, jq). "
+echo -e "1. Installing required packages (curl, wget, git, jq, openssl). "
 
 case "$OS_TYPE" in
 arch)
-    pacman -Sy --noconfirm --needed curl wget git jq >/dev/null || true
+    pacman -Sy --noconfirm --needed curl wget git jq openssl >/dev/null || true
     ;;
 alpine)
     sed -i '/^#.*\/community/s/^#//' /etc/apk/repositories
     apk update >/dev/null
-    apk add curl wget git jq >/dev/null
+    apk add curl wget git jq openssl >/dev/null
     ;;
 ubuntu | debian | raspbian)
     apt-get update -y >/dev/null
-    apt-get install -y curl wget git jq >/dev/null
+    apt-get install -y curl wget git jq openssl >/dev/null
     ;;
 centos | fedora | rhel | ol | rocky | almalinux | amzn)
     if [ "$OS_TYPE" = "amzn" ]; then
-        dnf install -y wget git jq >/dev/null
+        dnf install -y wget git jq openssl >/dev/null
     else
         if ! command -v dnf >/dev/null; then
             yum install -y dnf >/dev/null
@@ -150,12 +181,12 @@ centos | fedora | rhel | ol | rocky | almalinux | amzn)
         if ! command -v curl >/dev/null; then
             dnf install -y curl >/dev/null
         fi
-        dnf install -y wget git jq >/dev/null
+        dnf install -y wget git jq openssl >/dev/null
     fi
     ;;
 sles | opensuse-leap | opensuse-tumbleweed)
     zypper refresh >/dev/null
-    zypper install -y curl wget git jq >/dev/null
+    zypper install -y curl wget git jq openssl >/dev/null
     ;;
 *)
     echo "This script only supports Debian, Redhat, Arch Linux, or SLES based operating systems for now."
@@ -300,6 +331,22 @@ if ! [ -x "$(command -v docker)" ]; then
                 exit 1
             fi
             ;;
+        "fedora")
+            if [ -x "$(command -v dnf5)" ]; then
+                # dnf5 is available
+                dnf config-manager addrepo --from-repofile=https://download.docker.com/linux/fedora/docker-ce.repo --overwrite >/dev/null 2>&1
+            else
+                # dnf5 is not available, use dnf
+                dnf config-manager --add-repo=https://download.docker.com/linux/fedora/docker-ce.repo >/dev/null 2>&1
+            fi
+            dnf install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin >/dev/null 2>&1
+            if ! [ -x "$(command -v docker)" ]; then
+                echo " - Docker could not be installed automatically. Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
+                exit 1
+            fi
+            systemctl start docker >/dev/null 2>&1
+            systemctl enable docker >/dev/null 2>&1
+            ;;
         *)
             if [ "$OS_TYPE" = "ubuntu" ] && [ "$OS_VERSION" = "24.10" ]; then
                 echo "Docker automated installation is not supported on Ubuntu 24.10 (non-LTS release)."
@@ -490,7 +537,21 @@ echo -e "\033[0;35m
   \____\___/|_| |_|\__, |_|  \__,_|\__|\__,_|_|\__,_|\__|_|\___/|_| |_|___(_)
                    |___/
 \033[0m"
-echo -e "\nYour instance is ready to use."
-echo -e "Please visit http://$(curl -4s https://ifconfig.io):8000 to get started.\n"
-echo -e "WARNING: We recommend you to backup your /data/coolify/source/.env file to a safe location, outside of this server."
+echo -e "\nYour instance is ready to use!\n"
+echo -e "You can access Coolify through your Public IP: http://$(curl -4s https://ifconfig.io):8000"
+
+set +e
+DEFAULT_PRIVATE_IP=$(ip route get 1 | sed -n 's/^.*src \([0-9.]*\) .*$/\1/p')
+PRIVATE_IPS=$(hostname -I)
+set -e
+
+if [ -n "$PRIVATE_IPS" ]; then
+    echo -e "\nIf your Public IP is not accessible, you can use the following Private IPs:\n"
+    for IP in $PRIVATE_IPS; do
+        if [ "$IP" != "$DEFAULT_PRIVATE_IP" ]; then
+            echo -e "http://$IP:8000"
+        fi
+    done
+fi
+echo -e "\nWARNING: It is highly recommended to backup your Environment variables file (/data/coolify/source/.env) to a safe location, outside of this server (e.g. into a Password Manager).\n"
 cp /data/coolify/source/.env /data/coolify/source/.env.backup
diff --git a/other/nightly/versions.json b/other/nightly/versions.json
index 8b10875d0..2d96743f4 100644
--- a/other/nightly/versions.json
+++ b/other/nightly/versions.json
@@ -1,16 +1,16 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.367"
+            "version": "4.0.0-beta.378"
         },
         "nightly": {
-            "version": "4.0.0-beta.368"
+            "version": "4.0.0-beta.379"
         },
         "helper": {
-            "version": "1.0.3"
+            "version": "1.0.4"
         },
         "realtime": {
-            "version": "1.0.4"
+            "version": "1.0.5"
         },
         "sentinel": {
             "version": "0.0.15"
diff --git a/public/svgs/checkmate.png b/public/svgs/checkmate.png
new file mode 100644
index 000000000..f0f31466b
Binary files /dev/null and b/public/svgs/checkmate.png differ
diff --git a/public/svgs/documenso.png b/public/svgs/documenso.png
new file mode 100644
index 000000000..baa636532
Binary files /dev/null and b/public/svgs/documenso.png differ
diff --git a/public/svgs/dolibarr.png b/public/svgs/dolibarr.png
new file mode 100644
index 000000000..f09119afc
Binary files /dev/null and b/public/svgs/dolibarr.png differ
diff --git a/public/svgs/nexus.png b/public/svgs/nexus.png
new file mode 100644
index 000000000..823ea4e86
Binary files /dev/null and b/public/svgs/nexus.png differ
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index d6c3edf84..9404ed2c5 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -12,7 +12,7 @@
                         @endforeach
                     </div>
                 @endif
-                <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
+                <div class="p-6 space-y-4 md:space-y-3 sm:p-8">
                     <form action="/login" method="POST" class="flex flex-col gap-2">
                         @csrf
                         @env('local')
diff --git a/resources/views/components/forms/monaco-editor.blade.php b/resources/views/components/forms/monaco-editor.blade.php
index d3793785b..a4bc88051 100644
--- a/resources/views/components/forms/monaco-editor.blade.php
+++ b/resources/views/components/forms/monaco-editor.blade.php
@@ -7,6 +7,9 @@
         monacoLoader: true,
         monacoFontSize: '15px',
         monacoId: $id('monaco-editor'),
+        isDarkMode() {
+            return document.documentElement.classList.contains('dark') || localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
+        },
         monacoEditor(editor) {
             editor.onDidChangeModelContent((e) => {
                 this.monacoContent = editor.getValue();
@@ -41,357 +44,9 @@
                 let proxy = URL.createObjectURL(new Blob([` self.MonacoEnvironment = { baseUrl: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.39.0/min' }; importScripts('https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.39.0/min/vs/base/worker/workerMain.min.js');`], { type: 'text/javascript' }));
                 window.MonacoEnvironment = { getWorkerUrl: () => proxy };
                 require(['vs/editor/editor.main'], () => {
-                    monaco.editor.defineTheme('blackboard', {
-                        'base': 'vs-dark',
-                        'inherit': true,
-                        'rules': [{
-                                'background': editorBackground,
-                                'token': ''
-                            },
-                            {
-                                'foreground': '959da5',
-                                'token': 'comment'
-                            },
-                            {
-                                'foreground': '959da5',
-                                'token': 'punctuation.definition.comment'
-                            },
-                            {
-                                'foreground': '959da5',
-                                'token': 'string.comment'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'constant'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'entity.name.constant'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'variable.other.constant'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'variable.language'
-                            },
-                            {
-                                'foreground': 'b392f0',
-                                'token': 'entity'
-                            },
-                            {
-                                'foreground': 'b392f0',
-                                'token': 'entity.name'
-                            },
-                            {
-                                'foreground': 'f6f8fa',
-                                'token': 'variable.parameter.function'
-                            },
-                            {
-                                'foreground': '7bcc72',
-                                'token': 'entity.name.tag'
-                            },
-                            {
-                                'foreground': 'ea4a5a',
-                                'token': 'keyword'
-                            },
-                            {
-                                'foreground': 'ea4a5a',
-                                'token': 'storage'
-                            },
-                            {
-                                'foreground': 'ea4a5a',
-                                'token': 'storage.type'
-                            },
-                            {
-                                'foreground': 'f6f8fa',
-                                'token': 'storage.modifier.package'
-                            },
-                            {
-                                'foreground': 'f6f8fa',
-                                'token': 'storage.modifier.import'
-                            },
-                            {
-                                'foreground': 'f6f8fa',
-                                'token': 'storage.type.java'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'token': 'string'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'token': 'punctuation.definition.string'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'token': 'string punctuation.section.embedded source'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'support'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'meta.property-name'
-                            },
-                            {
-                                'foreground': 'fb8532',
-                                'token': 'variable'
-                            },
-                            {
-                                'foreground': 'f6f8fa',
-                                'token': 'variable.other'
-                            },
-                            {
-                                'foreground': 'd73a49',
-                                'fontStyle': 'bold italic underline',
-                                'token': 'invalid.broken'
-                            },
-                            {
-                                'foreground': 'd73a49',
-                                'fontStyle': 'bold italic underline',
-                                'token': 'invalid.deprecated'
-                            },
-                            {
-                                'foreground': 'fafbfc',
-                                'background': 'd73a49',
-                                'fontStyle': 'italic underline',
-                                'token': 'invalid.illegal'
-                            },
-                            {
-                                'foreground': 'fafbfc',
-                                'background': 'd73a49',
-                                'fontStyle': 'italic underline',
-                                'token': 'carriage-return'
-                            },
-                            {
-                                'foreground': 'd73a49',
-                                'fontStyle': 'bold italic underline',
-                                'token': 'invalid.unimplemented'
-                            },
-                            {
-                                'foreground': 'd73a49',
-                                'token': 'message.error'
-                            },
-                            {
-                                'foreground': 'f6f8fa',
-                                'token': 'string source'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'string variable'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'token': 'source.regexp'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'token': 'string.regexp'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'token': 'string.regexp.character-class'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'token': 'string.regexp constant.character.escape'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'token': 'string.regexp source.ruby.embedded'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'token': 'string.regexp string.regexp.arbitrary-repitition'
-                            },
-                            {
-                                'foreground': '7bcc72',
-                                'fontStyle': 'bold',
-                                'token': 'string.regexp constant.character.escape'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'support.constant'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'support.variable'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'meta.module-reference'
-                            },
-                            {
-                                'foreground': 'fb8532',
-                                'token': 'markup.list'
-                            },
-                            {
-                                'foreground': '0366d6',
-                                'fontStyle': 'bold',
-                                'token': 'markup.heading'
-                            },
-                            {
-                                'foreground': '0366d6',
-                                'fontStyle': 'bold',
-                                'token': 'markup.heading entity.name'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'markup.quote'
-                            },
-                            {
-                                'foreground': 'f6f8fa',
-                                'fontStyle': 'italic',
-                                'token': 'markup.italic'
-                            },
-                            {
-                                'foreground': 'f6f8fa',
-                                'fontStyle': 'bold',
-                                'token': 'markup.bold'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'markup.raw'
-                            },
-                            {
-                                'foreground': 'b31d28',
-                                'background': 'ffeef0',
-                                'token': 'markup.deleted'
-                            },
-                            {
-                                'foreground': 'b31d28',
-                                'background': 'ffeef0',
-                                'token': 'meta.diff.header.from-file'
-                            },
-                            {
-                                'foreground': 'b31d28',
-                                'background': 'ffeef0',
-                                'token': 'punctuation.definition.deleted'
-                            },
-                            {
-                                'foreground': '176f2c',
-                                'background': 'f0fff4',
-                                'token': 'markup.inserted'
-                            },
-                            {
-                                'foreground': '176f2c',
-                                'background': 'f0fff4',
-                                'token': 'meta.diff.header.to-file'
-                            },
-                            {
-                                'foreground': '176f2c',
-                                'background': 'f0fff4',
-                                'token': 'punctuation.definition.inserted'
-                            },
-                            {
-                                'foreground': 'b08800',
-                                'background': 'fffdef',
-                                'token': 'markup.changed'
-                            },
-                            {
-                                'foreground': 'b08800',
-                                'background': 'fffdef',
-                                'token': 'punctuation.definition.changed'
-                            },
-                            {
-                                'foreground': '2f363d',
-                                'background': '959da5',
-                                'token': 'markup.ignored'
-                            },
-                            {
-                                'foreground': '2f363d',
-                                'background': '959da5',
-                                'token': 'markup.untracked'
-                            },
-                            {
-                                'foreground': 'b392f0',
-                                'fontStyle': 'bold',
-                                'token': 'meta.diff.range'
-                            },
-                            {
-                                'foreground': 'c8e1ff',
-                                'token': 'meta.diff.header'
-                            },
-                            {
-                                'foreground': '0366d6',
-                                'fontStyle': 'bold',
-                                'token': 'meta.separator'
-                            },
-                            {
-                                'foreground': '0366d6',
-                                'token': 'meta.output'
-                            },
-                            {
-                                'foreground': 'ffeef0',
-                                'token': 'brackethighlighter.tag'
-                            },
-                            {
-                                'foreground': 'ffeef0',
-                                'token': 'brackethighlighter.curly'
-                            },
-                            {
-                                'foreground': 'ffeef0',
-                                'token': 'brackethighlighter.round'
-                            },
-                            {
-                                'foreground': 'ffeef0',
-                                'token': 'brackethighlighter.square'
-                            },
-                            {
-                                'foreground': 'ffeef0',
-                                'token': 'brackethighlighter.angle'
-                            },
-                            {
-                                'foreground': 'ffeef0',
-                                'token': 'brackethighlighter.quote'
-                            },
-                            {
-                                'foreground': 'd73a49',
-                                'token': 'brackethighlighter.unmatched'
-                            },
-                            {
-                                'foreground': 'd73a49',
-                                'token': 'sublimelinter.mark.error'
-                            },
-                            {
-                                'foreground': 'fb8532',
-                                'token': 'sublimelinter.mark.warning'
-                            },
-                            {
-                                'foreground': '6a737d',
-                                'token': 'sublimelinter.gutter-mark'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'fontStyle': 'underline',
-                                'token': 'constant.other.reference.link'
-                            },
-                            {
-                                'foreground': '79b8ff',
-                                'fontStyle': 'underline',
-                                'token': 'string.other.link'
-                            }
-                        ],
-                        'colors': {
-                            'editor.foreground': '#f6f8fa',
-                            'editor.background': editorBackground,
-                            'editor.selectionBackground': '#4c2889',
-                            'editor.inactiveSelectionBackground': '#444d56',
-                            'editor.lineHighlightBackground': '#444d56',
-                            'editorCursor.foreground': '#ffffff',
-                            'editorWhitespace.foreground': '#6a737d',
-                            'editorIndentGuide.background': '#6a737d',
-                            'editorIndentGuide.activeBackground': '#f6f8fa',
-                            'editor.selectionHighlightBorder': '#444d56'
-                        }
-                    });
-
                     const editor = monaco.editor.create($refs.monacoEditorElement, {
                         value: monacoContent,
-                        theme: editorTheme,
+                        theme: document.documentElement.classList.contains('dark') ? 'vs-dark' : 'vs',
                         wordWrap: 'on',
                         readOnly: '{{ $readonly ?? false }}',
                         minimap: { enabled: false },
@@ -399,7 +54,20 @@
                         lineNumbersMinChars: 3,
                         automaticLayout: true,
                         language: '{{ $language }}'
+                    });
 
+                    const observer = new MutationObserver((mutations) => {
+                        mutations.forEach((mutation) => {
+                            if (mutation.attributeName === 'class') {
+                                const isDark = document.documentElement.classList.contains('dark');
+                                monaco.editor.setTheme(isDark ? 'vs-dark' : 'vs');
+                            }
+                        });
+                    });
+
+                    observer.observe(document.documentElement, {
+                        attributes: true,
+                        attributeFilter: ['class']
                     });
 
                     monacoEditor(editor);
@@ -411,7 +79,6 @@
 
                     updatePlaceholder(editor.getValue());
 
-                    // Watch for changes in monacoContent from Livewire
                     $watch('monacoContent', value => {
                         if (editor.getValue() !== value) {
                             editor.setValue(value);
diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index 8495417ac..e98a494c5 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -258,6 +258,7 @@
                                         <input type="text" x-model="confirmationText"
                                             class="p-2 pr-10 w-full text-black rounded cursor-text input" readonly>
                                         <button @click="copyConfirmationText()"
+                                            x-show="window.isSecureContext"
                                             class="absolute right-2 top-1/2 text-gray-500 transform -translate-y-1/2 hover:text-gray-700"
                                             title="Copy confirmation text" x-ref="copyButton">
                                             <template x-if="!copied">
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 7d343c645..9a75200b1 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -340,17 +340,19 @@
                         </li>
                     @endif
 
-                    @if (isCloud() && isInstanceAdmin())
-                        <li>
-                            <a title="Admin" class="menu-item" href="/admin">
-                                <svg class="text-pink-600 icon" viewBox="0 0 256 256"
-                                    xmlns="http://www.w3.org/2000/svg">
-                                    <path fill="currentColor"
-                                        d="M177.62 159.6a52 52 0 0 1-34 34a12.2 12.2 0 0 1-3.6.55a12 12 0 0 1-3.6-23.45a28 28 0 0 0 18.32-18.32a12 12 0 0 1 22.9 7.2ZM220 144a92 92 0 0 1-184 0c0-28.81 11.27-58.18 33.48-87.28a12 12 0 0 1 17.9-1.33l19.69 19.11L127 19.89a12 12 0 0 1 18.94-5.12C168.2 33.25 220 82.85 220 144m-24 0c0-41.71-30.61-78.39-52.52-99.29l-20.21 55.4a12 12 0 0 1-19.63 4.5L80.71 82.36C67 103.38 60 124.06 60 144a68 68 0 0 0 136 0" />
-                                </svg>
-                                Admin
-                            </a>
-                        </li>
+                    @if (isCloud() || isDev())
+                        @if (isInstanceAdmin() || session('impersonating'))
+                            <li>
+                                <a title="Admin" class="menu-item" href="/admin">
+                                    <svg class="text-pink-600 icon" viewBox="0 0 256 256"
+                                        xmlns="http://www.w3.org/2000/svg">
+                                        <path fill="currentColor"
+                                            d="M177.62 159.6a52 52 0 0 1-34 34a12.2 12.2 0 0 1-3.6.55a12 12 0 0 1-3.6-23.45a28 28 0 0 0 18.32-18.32a12 12 0 0 1 22.9 7.2ZM220 144a92 92 0 0 1-184 0c0-28.81 11.27-58.18 33.48-87.28a12 12 0 0 1 17.9-1.33l19.69 19.11L127 19.89a12 12 0 0 1 18.94-5.12C168.2 33.25 220 82.85 220 144m-24 0c0-41.71-30.61-78.39-52.52-99.29l-20.21 55.4a12 12 0 0 1-19.63 4.5L80.71 82.36C67 103.38 60 124.06 60 144a68 68 0 0 0 136 0" />
+                                    </svg>
+                                    Admin
+                                </a>
+                            </li>
+                        @endif
                     @endif
                     <div class="flex-1"></div>
                     @if (isInstanceAdmin() && !isCloud())
diff --git a/resources/views/components/notification/navbar.blade.php b/resources/views/components/notification/navbar.blade.php
index c4dbd25af..447a385c5 100644
--- a/resources/views/components/notification/navbar.blade.php
+++ b/resources/views/components/notification/navbar.blade.php
@@ -7,18 +7,22 @@
                 href="{{ route('notifications.email') }}">
                 <button>Email</button>
             </a>
-            <a class="{{ request()->routeIs('notifications.telegram') ? 'dark:text-white' : '' }}"
-                href="{{ route('notifications.telegram') }}">
-                <button>Telegram</button>
-            </a>
             <a class="{{ request()->routeIs('notifications.discord') ? 'dark:text-white' : '' }}"
                 href="{{ route('notifications.discord') }}">
                 <button>Discord</button>
+            </a>
+             <a class="{{ request()->routeIs('notifications.telegram') ? 'dark:text-white' : '' }}"
+                href="{{ route('notifications.telegram') }}">
+                <button>Telegram</button>
             </a>
             <a class="{{ request()->routeIs('notifications.slack') ? 'dark:text-white' : '' }}"
                 href="{{ route('notifications.slack') }}">
                 <button>Slack</button>
             </a>
+            <a class="{{ request()->routeIs('notifications.pushover') ? 'dark:text-white' : '' }}"
+                href="{{ route('notifications.pushover') }}">
+                <button>Pushover</button>
+            </a>
         </nav>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/livewire/admin/index.blade.php b/resources/views/livewire/admin/index.blade.php
index 06914e1e4..7bf3c7c0c 100644
--- a/resources/views/livewire/admin/index.blade.php
+++ b/resources/views/livewire/admin/index.blade.php
@@ -1,7 +1,12 @@
 <div>
     <h1>Admin Dashboard</h1>
-    <h3 class="pt-4">Who am I now?</h3>
-    <div class="pb-4">{{ auth()->user()->name }}</div>
+    <div class="flex gap-2 pt-4">
+        <h3>Who am I now?</h3>
+        @if (session('impersonating'))
+            <x-forms.button wire:click="back">Go back to root</x-forms.button>
+        @endif
+    </div>
+    <div class="pb-4">{{ auth()->user()->name }} ({{ auth()->user()->email }})</div>
     <form wire:submit="submitSearch" class="flex flex-col gap-2 lg:flex-row">
         <x-forms.input wire:model="search" placeholder="Search for a user" />
         <x-forms.button type="submit">Search</x-forms.button>
diff --git a/resources/views/livewire/notifications/discord.blade.php b/resources/views/livewire/notifications/discord.blade.php
index 1f83ed061..6caf31176 100644
--- a/resources/views/livewire/notifications/discord.blade.php
+++ b/resources/views/livewire/notifications/discord.blade.php
@@ -24,7 +24,7 @@
             <x-forms.checkbox instantSave="instantSaveDiscordEnabled" id="discordEnabled" label="Enabled" />
         </div>
         <x-forms.input type="password"
-            helper="Generate a webhook in Discord.<br>Example: https://discord.com/api/webhooks/...." required
+            helper="Create a Discord Server and generate a Webhook URL. <br><a class='inline-block underline dark:text-white' href='https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks' target='_blank'>Webhook Documentation</a>" required
             id="discordWebhookUrl" label="Webhook" />
     </form>
     <h2 class="mt-4">Notification Settings</h2>
diff --git a/resources/views/livewire/notifications/pushover.blade.php b/resources/views/livewire/notifications/pushover.blade.php
new file mode 100644
index 000000000..c8dd777d8
--- /dev/null
+++ b/resources/views/livewire/notifications/pushover.blade.php
@@ -0,0 +1,86 @@
+<div>
+    <x-slot:title>
+        Notifications | Coolify
+    </x-slot>
+    <x-notification.navbar />
+    <form wire:submit='submit' class="flex flex-col gap-4 pb-4">
+        <div class="flex items-center gap-2">
+            <h2>Pushover</h2>
+            <x-forms.button type="submit">
+                Save
+            </x-forms.button>
+            @if ($pushoverEnabled)
+                <x-forms.button class="normal-case dark:text-white btn btn-xs no-animation btn-primary"
+                    wire:click="sendTestNotification">
+                    Send Test Notification
+                </x-forms.button>
+            @else
+                <x-forms.button disabled class="normal-case dark:text-white btn btn-xs no-animation btn-primary">
+                    Send Test Notification
+                </x-forms.button>
+            @endif
+        </div>
+        <div class="w-32">
+            <x-forms.checkbox instantSave="instantSavePushoverEnabled" id="pushoverEnabled" label="Enabled" />
+        </div>
+        <div class="flex  gap-2">
+            <x-forms.input type="password"
+                helper="Get your User Key in Pushover. You need to be logged in to Pushover to see your user key in the top right corner. <br><a class='inline-block underline dark:text-white' href='https://pushover.net/' target='_blank'>Pushover Dashboard</a>"
+                required id="pushoverUserKey" label="User Key" />
+            <x-forms.input type="password"
+                helper="Generate an API Token/Key in Pushover by creating a new application. <br><a class='inline-block underline dark:text-white' href='https://pushover.net/apps/build' target='_blank'>Create Pushover Application</a>"
+                required id="pushoverApiToken" label="API Token" />
+        </div>
+    </form>
+    <h2 class="mt-4">Notification Settings</h2>
+    <p class="mb-4">
+        Select events for which you would like to receive Pushover notifications.
+    </p>
+    <div class="flex flex-col gap-4 max-w-2xl">
+        <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+            <h3 class="font-medium mb-3">Deployments</h3>
+            <div class="flex flex-col gap-1.5 pl-1">
+                <x-forms.checkbox instantSave="saveModel" id="deploymentSuccessPushoverNotifications"
+                    label="Deployment Success" />
+                <x-forms.checkbox instantSave="saveModel" id="deploymentFailurePushoverNotifications"
+                    label="Deployment Failure" />
+                <x-forms.checkbox instantSave="saveModel"
+                    helper="Send a notification when a container status changes. It will notify for Stopped and Restarted events of a container."
+                    id="statusChangePushoverNotifications" label="Container Status Changes" />
+            </div>
+        </div>
+        <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+            <h3 class="font-medium mb-3">Backups</h3>
+            <div class="flex flex-col gap-1.5 pl-1">
+                <x-forms.checkbox instantSave="saveModel" id="backupSuccessPushoverNotifications"
+                    label="Backup Success" />
+                <x-forms.checkbox instantSave="saveModel" id="backupFailurePushoverNotifications"
+                    label="Backup Failure" />
+            </div>
+        </div>
+        <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+            <h3 class="font-medium mb-3">Scheduled Tasks</h3>
+            <div class="flex flex-col gap-1.5 pl-1">
+                <x-forms.checkbox instantSave="saveModel" id="scheduledTaskSuccessPushoverNotifications"
+                    label="Scheduled Task Success" />
+                <x-forms.checkbox instantSave="saveModel" id="scheduledTaskFailurePushoverNotifications"
+                    label="Scheduled Task Failure" />
+            </div>
+        </div>
+        <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+            <h3 class="font-medium mb-3">Server</h3>
+            <div class="flex flex-col gap-1.5 pl-1">
+                <x-forms.checkbox instantSave="saveModel" id="dockerCleanupSuccessPushoverNotifications"
+                    label="Docker Cleanup Success" />
+                <x-forms.checkbox instantSave="saveModel" id="dockerCleanupFailurePushoverNotifications"
+                    label="Docker Cleanup Failure" />
+                <x-forms.checkbox instantSave="saveModel" id="serverDiskUsagePushoverNotifications"
+                    label="Server Disk Usage" />
+                <x-forms.checkbox instantSave="saveModel" id="serverReachablePushoverNotifications"
+                    label="Server Reachable" />
+                <x-forms.checkbox instantSave="saveModel" id="serverUnreachablePushoverNotifications"
+                    label="Server Unreachable" />
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/livewire/notifications/slack.blade.php b/resources/views/livewire/notifications/slack.blade.php
index 774f8e7e5..28bfe509f 100644
--- a/resources/views/livewire/notifications/slack.blade.php
+++ b/resources/views/livewire/notifications/slack.blade.php
@@ -24,7 +24,7 @@
             <x-forms.checkbox instantSave="instantSaveSlackEnabled" id="slackEnabled" label="Enabled" />
         </div>
         <x-forms.input type="password"
-            helper="Generate a webhook in Slack.<br>Example: https://hooks.slack.com/services/...." required
+            helper="Create a Slack APP and generate a Incoming Webhook URL. <br><a class='inline-block underline dark:text-white' href='https://api.slack.com/apps' target='_blank'>Create Slack APP</a>" required
             id="slackWebhookUrl" label="Webhook" />
     </form>
     <h2 class="mt-4">Notification Settings</h2>
diff --git a/resources/views/livewire/notifications/telegram.blade.php b/resources/views/livewire/notifications/telegram.blade.php
index 5dd859e9e..ecc9360fa 100644
--- a/resources/views/livewire/notifications/telegram.blade.php
+++ b/resources/views/livewire/notifications/telegram.blade.php
@@ -26,8 +26,8 @@
         <div class="flex gap-2">
             <x-forms.input type="password" autocomplete="new-password"
                 helper="Get it from the <a class='inline-block underline dark:text-white' href='https://t.me/botfather' target='_blank'>BotFather Bot</a> on Telegram."
-                required id="telegramToken" label="Token" />
-            <x-forms.input helper="Recommended to add your bot to a group chat and add its Chat ID here." required
+                required id="telegramToken" label="Bot API Token" />
+            <x-forms.input type="password" autocomplete="new-password" helper="Add your bot to a group chat and add its Chat ID here." required
                 id="telegramChatId" label="Chat ID" />
         </div>
     </form>
@@ -44,16 +44,16 @@
                         <x-forms.checkbox instantSave="saveModel" id="deploymentSuccessTelegramNotifications"
                             label="Deployment Success" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsDeploymentSuccessTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsDeploymentSuccessThreadId" />
                 </div>
                 <div class="pl-1 flex gap-2">
                     <div class="w-96">
                         <x-forms.checkbox instantSave="saveModel" id="deploymentFailureTelegramNotifications"
                             label="Deployment Failure" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsDeploymentFailureTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsDeploymentFailureThreadId" />
                 </div>
                 <div class="pl-1 flex gap-2">
                     <div class="w-96">
@@ -61,8 +61,8 @@
                             label="Container Status Changes"
                             helper="Send a notification when a container status changes. It will send a notification for Stopped and Restarted events of a container." />
                     </div>
-                    <x-forms.input type="password" id="telegramNotificationsStatusChangeTopicId"
-                        placeholder="Custom Telegram Topic ID" />
+                    <x-forms.input type="password" id="telegramNotificationsStatusChangeThreadId"
+                        placeholder="Custom Telegram Thread ID" />
                 </div>
             </div>
         </div>
@@ -74,8 +74,8 @@
                         <x-forms.checkbox instantSave="saveModel" id="backupSuccessTelegramNotifications"
                             label="Backup Success" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsBackupSuccessTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsBackupSuccessThreadId" />
                 </div>
 
                 <div class="pl-1 flex gap-2">
@@ -83,8 +83,8 @@
                         <x-forms.checkbox instantSave="saveModel" id="backupFailureTelegramNotifications"
                             label="Backup Failure" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsBackupFailureTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsBackupFailureThreadId" />
                 </div>
             </div>
         </div>
@@ -97,8 +97,8 @@
                         <x-forms.checkbox instantSave="saveModel" id="scheduledTaskSuccessTelegramNotifications"
                             label="Scheduled Task Success" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsScheduledTaskSuccessTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsScheduledTaskSuccessThreadId" />
                 </div>
 
                 <div class="pl-1 flex gap-2">
@@ -106,8 +106,8 @@
                         <x-forms.checkbox instantSave="saveModel" id="scheduledTaskFailureTelegramNotifications"
                             label="Scheduled Task Failure" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsScheduledTaskFailureTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsScheduledTaskFailureThreadId" />
                 </div>
             </div>
         </div>
@@ -120,8 +120,8 @@
                         <x-forms.checkbox instantSave="saveModel" id="dockerCleanupSuccessTelegramNotifications"
                             label="Docker Cleanup Success" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsDockerCleanupSuccessTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsDockerCleanupSuccessThreadId" />
                 </div>
 
                 <div class="pl-1 flex gap-2">
@@ -129,8 +129,8 @@
                         <x-forms.checkbox instantSave="saveModel" id="dockerCleanupFailureTelegramNotifications"
                             label="Docker Cleanup Failure" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsDockerCleanupFailureTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsDockerCleanupFailureThreadId" />
                 </div>
 
                 <div class="pl-1 flex gap-2">
@@ -138,8 +138,8 @@
                         <x-forms.checkbox instantSave="saveModel" id="serverDiskUsageTelegramNotifications"
                             label="Server Disk Usage" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsServerDiskUsageTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsServerDiskUsageThreadId" />
                 </div>
 
                 <div class="pl-1 flex gap-2">
@@ -147,8 +147,8 @@
                         <x-forms.checkbox instantSave="saveModel" id="serverReachableTelegramNotifications"
                             label="Server Reachable" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsServerReachableTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsServerReachableThreadId" />
                 </div>
 
 
@@ -157,8 +157,8 @@
                         <x-forms.checkbox instantSave="saveModel" id="serverUnreachableTelegramNotifications"
                             label="Server Unreachable" />
                     </div>
-                    <x-forms.input type="password" placeholder="Custom Telegram Topic ID"
-                        id="telegramNotificationsServerUnreachableTopicId" />
+                    <x-forms.input type="password" placeholder="Custom Telegram Thread ID"
+                        id="telegramNotificationsServerUnreachableThreadId" />
                 </div>
             </div>
         </div>
diff --git a/resources/views/livewire/profile/index.blade.php b/resources/views/livewire/profile/index.blade.php
index fc367e6f2..087aba319 100644
--- a/resources/views/livewire/profile/index.blade.php
+++ b/resources/views/livewire/profile/index.blade.php
@@ -59,6 +59,7 @@
                                 class="font-mono pr-10"
                             />
                             <button
+                                x-show="window.isSecureContext"
                                 @click="navigator.clipboard.writeText(secretKey); copiedSecretKey = true; setTimeout(() => copiedSecretKey = false, 2000)"
                                 class="absolute right-2 bottom-1 p-1 rounded hover:bg-gray-200 dark:hover:bg-gray-700"
                             >
@@ -78,6 +79,7 @@
                                 class="font-mono pr-10"
                             />
                             <button
+                                x-show="window.isSecureContext"
                                 @click="navigator.clipboard.writeText(otpUrl); copiedOtpUrl = true; setTimeout(() => copiedOtpUrl = false, 2000)"
                                 class="absolute right-2 bottom-1 p-1 rounded hover:bg-gray-200 dark:hover:bg-gray-700"
                             >
diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index b5ba6c822..fc2b8c7c0 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -5,34 +5,36 @@
     <h1>Configuration</h1>
     <livewire:project.shared.configuration-checker :resource="$application" />
     <livewire:project.application.heading :application="$application" />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
+
+    <div class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
         <div class="flex flex-col items-start gap-2 min-w-fit">
-            <a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'"
-                @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.application.configuration', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>General</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.application.advanced', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Advanced</a>
             @if ($application->destination->server->isSwarm())
-                <a class="menu-item" :class="activeTab === 'swarm' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'swarm'; window.location.hash = 'swarm'" href="#">Swarm
+                <a class="menu-item"
+                    wire:current.exact="menu-item-active
+                    href="{{ route('project.application.swarm', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                    wire:navigate>Swarm
                     Configuration</a>
             @endif
-            <a class="menu-item" :class="activeTab === 'advanced' && 'menu-item-active'"
-                @click.prevent="activeTab = 'advanced'; window.location.hash = 'advanced'" href="#">Advanced</a>
-            @if ($application->build_pack !== 'static')
-                <a class="menu-item" :class="activeTab === 'environment-variables' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
-                    href="#">Environment
-                    Variables</a>
-            @endif
-            @if ($application->build_pack !== 'static')
-                <a class="menu-item" :class="activeTab === 'storages' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
-                </a>
-            @endif
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.application.environment-variables', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Environment Variables</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.application.persistent-storage', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Persistent Storage</a>
             @if ($application->git_based())
-                <a class="menu-item" :class="activeTab === 'source' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
+                <a class='menu-item' wire:current.exact="menu-item-active"
+                    href="{{ route('project.application.source', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                    wire:navigate>Git Source</a>
             @endif
-            <a class="menu-item" :class="activeTab === 'servers' && 'menu-item-active'" class="flex items-center gap-2"
-                @click.prevent="activeTab = 'servers'; window.location.hash = 'servers'" href="#">Servers
+            <a class="menu-item flex items-center gap-2" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.servers', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Servers
                 @if (str($application->status)->contains('degraded'))
                     <span title="Some servers are unavailable">
                         <svg class="w-4 h-4 text-error" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
@@ -50,102 +52,74 @@
                     </span>
                 @endif
             </a>
-            <a class="menu-item" :class="activeTab === 'scheduled-tasks' && 'menu-item-active'"
-                @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"
-                href="#">Scheduled Tasks
-            </a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Scheduled Tasks</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.webhooks', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Webhooks</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.preview-deployments', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Preview Deployments</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.healthcheck', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Healthcheck</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.rollback', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Rollback</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.resource-limits', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Resource Limits</a>
 
-            <a class="menu-item" :class="activeTab === 'webhooks' && 'menu-item-active'"
-                @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
-            </a>
-            @if ($application->git_based())
-                <a class="menu-item" :class="activeTab === 'previews' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'previews'; window.location.hash = 'previews'" href="#">Preview
-                    Deployments
-                </a>
-            @endif
-            @if ($application->build_pack !== 'static' && $application->build_pack !== 'dockercompose')
-                <a class="menu-item" :class="activeTab === 'health' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Healthchecks
-                </a>
-            @endif
-            <a class="menu-item" :class="activeTab === 'rollback' && 'menu-item-active'"
-                @click.prevent="activeTab = 'rollback'; window.location.hash = 'rollback'" href="#">Rollback
-            </a>
-            @if ($application->build_pack !== 'dockercompose')
-                <a class="menu-item" :class="activeTab === 'resource-limits' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'resource-limits'; window.location.hash = 'resource-limits'"
-                    href="#">Resource Limits
-                </a>
-            @endif
-            <a class="menu-item" :class="activeTab === 'resource-operations' && 'menu-item-active'"
-                @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
-                href="#">Resource Operations
-            </a>
-            <a class="menu-item" :class="activeTab === 'metrics' && 'menu-item-active'"
-                @click.prevent="activeTab = 'metrics'; window.location.hash = 'metrics'" href="#">Metrics
-            </a>
-            <a class="menu-item" :class="activeTab === 'tags' && 'menu-item-active'"
-                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
-            </a>
-            <a class="menu-item" :class="activeTab === 'danger' && 'menu-item-active'"
-                @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
-            </a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.resource-operations', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Resource Operations</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.metrics', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Metrics</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.tags', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Tags</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.danger', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
-            <div x-cloak x-show="activeTab === 'general'" class="h-full">
+            @if (request()->route()->getName() === 'project.application.configuration')
                 <livewire:project.application.general :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'swarm'" class="h-full">
+            @elseif (request()->route()->getName() === 'project.application.swarm' && $application->destination->server->isSwarm())
                 <livewire:project.application.swarm :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'advanced'" class="h-full">
+            @elseif (request()->route()->getName() === 'project.application.advanced')
                 <livewire:project.application.advanced :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'environment-variables'">
+            @elseif (request()->route()->getName() === 'project.application.environment-variables')
                 <livewire:project.shared.environment-variable.all :resource="$application" />
-            </div>
-            @if ($application->git_based())
-                <div x-cloak x-show="activeTab === 'source'">
-                    <livewire:project.application.source :application="$application" />
-                </div>
-            @endif
-            <div x-cloak x-show="activeTab === 'servers'">
+            @elseif (request()->route()->getName() === 'project.application.persistent-storage')
+                <livewire:project.service.storage :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.source' && $application->git_based())
+                <livewire:project.application.source :application="$application" />
+            @elseif (request()->route()->getName() === 'project.application.servers')
                 <livewire:project.shared.destination :resource="$application" :servers="$servers" />
-            </div>
-            <div x-cloak x-show="activeTab === 'storages'">
-                <livewire:project.service.storage :resource="$application" lazy />
-            </div>
-            <div x-cloak x-show="activeTab === 'webhooks'">
-                <livewire:project.shared.webhooks :resource="$application" lazy />
-            </div>
-            <div x-cloak x-show="activeTab === 'previews'">
-                <livewire:project.application.previews :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'health'">
-                <livewire:project.shared.health-checks :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'rollback'">
-                <livewire:project.application.rollback :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'resource-limits'">
-                <livewire:project.shared.resource-limits :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'scheduled-tasks'">
+            @elseif (request()->route()->getName() === 'project.application.scheduled-tasks.show')
                 <livewire:project.shared.scheduled-task.all :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'resource-operations'">
+            @elseif (request()->route()->getName() === 'project.application.webhooks')
+                <livewire:project.shared.webhooks :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.preview-deployments')
+                <livewire:project.application.previews :application="$application" />
+            @elseif (request()->route()->getName() === 'project.application.healthcheck')
+                <livewire:project.shared.health-checks :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.rollback')
+                <livewire:project.application.rollback :application="$application" />
+            @elseif (request()->route()->getName() === 'project.application.resource-limits')
+                <livewire:project.shared.resource-limits :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.resource-operations')
                 <livewire:project.shared.resource-operations :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'metrics'">
+            @elseif (request()->route()->getName() === 'project.application.metrics')
                 <livewire:project.shared.metrics :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'tags'">
-                <livewire:project.shared.tags :resource="$application" lazy />
-            </div>
-            <div x-cloak x-show="activeTab === 'danger'">
+            @elseif (request()->route()->getName() === 'project.application.tags')
+                <livewire:project.shared.tags :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.danger')
                 <livewire:project.shared.danger :resource="$application" />
-            </div>
+            @endif
         </div>
     </div>
 </div>
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 4812fd4ba..bdcde8deb 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -84,7 +84,7 @@
                         <option value="non-www">Redirect to non-www.</option>
                     </x-forms.select>
                     <x-modal-confirmation title="Confirm Redirection Setting?" buttonTitle="Set Direction"
-                        submitAction="set_redirect" :actions="['All traffic will be redirected to the selected direction.']" confirmationText="{{ $application->fqdn . '/' }}"
+                        submitAction="setRedirect" :actions="['All traffic will be redirected to the selected direction.']" confirmationText="{{ $application->fqdn . '/' }}"
                         confirmationLabel="Please confirm the execution of the action by entering the Application URL below"
                         shortConfirmationLabel="Application URL" :confirmWithPassword="false" step2ButtonText="Set Direction">
                         <x-slot:customButton>
@@ -161,8 +161,7 @@
                             </div>
                             <div class="pt-1 text-xs">Nixpacks will detect the required configuration
                                 automatically.
-                                <a class="underline"
-                                    href="https://coolify.io/docs/applications">Framework
+                                <a class="underline" href="https://coolify.io/docs/applications">Framework
                                     Specific Docs</a>
                             </div>
                         @endif
diff --git a/resources/views/livewire/project/service/navbar.blade.php b/resources/views/livewire/project/service/navbar.blade.php
index 342c071d4..f268096f8 100644
--- a/resources/views/livewire/project/service/navbar.blade.php
+++ b/resources/views/livewire/project/service/navbar.blade.php
@@ -22,7 +22,7 @@
         </nav>
         @if ($service->isDeployable)
             <div class="flex flex-wrap order-first gap-2 items-center sm:order-last">
-                @if (str($service->status())->contains('running'))
+                @if (str($service->status)->contains('running'))
                     <x-dropdown>
                         <x-slot:title>
                             Advanced
@@ -70,7 +70,7 @@
                             Stop
                         </x-slot:button-title>
                     </x-modal-confirmation>
-                @elseif (str($service->status())->contains('degraded'))
+                @elseif (str($service->status)->contains('degraded'))
                     <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
                         <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                             <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
@@ -99,7 +99,7 @@
                             Stop
                         </x-slot:button-title>
                     </x-modal-confirmation>
-                @elseif (str($service->status())->contains('exited'))
+                @elseif (str($service->status)->contains('exited'))
                     <button wire:click='stop(true)' class="gap-2 button">
                         <svg class="w-5 h-5" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
                             <path fill="red" d="M26 20h-6v-2h6zm4 8h-6v-2h6zm-2-4h-6v-2h6z" />
@@ -150,8 +150,7 @@
         @else
             <div class="flex flex-wrap order-first gap-2 items-center sm:order-last">
                 <div class="text-error">
-                    Unable to deploy. <a
-                        class="underline font-bold cursor-pointer"
+                    Unable to deploy. <a class="underline font-bold cursor-pointer"
                         @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'">
                         Required environment variables missing.</a>
                 </div>
diff --git a/resources/views/livewire/settings-oauth.blade.php b/resources/views/livewire/settings-oauth.blade.php
index eefd10c7c..2f0d28cfc 100644
--- a/resources/views/livewire/settings-oauth.blade.php
+++ b/resources/views/livewire/settings-oauth.blade.php
@@ -16,10 +16,10 @@
         <div class="flex flex-col gap-2 pt-4">
             @foreach ($oauth_settings_map as $oauth_setting)
                 <div class="p-4 border dark:border-coolgray-300">
-                    <h3>{{ ucfirst($oauth_setting->provider) }} Oauth</h3>
+                    <h3>{{ ucfirst($oauth_setting->provider) }}</h3>
                     <div class="w-32">
-                        <x-forms.checkbox instantSave id="oauth_settings_map.{{ $oauth_setting->provider }}.enabled"
-                            label="Enabled" />
+                        <x-forms.checkbox instantSave="instantSave('{{ $oauth_setting->provider }}')"
+                            id="oauth_settings_map.{{ $oauth_setting->provider }}.enabled" label="Enabled" />
                     </div>
                     <div class="flex flex-col w-full gap-2 xl:flex-row">
                         <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.client_id"
@@ -32,6 +32,10 @@
                             <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.tenant"
                                 label="Tenant" />
                         @endif
+                        @if ($oauth_setting->provider == 'authentik')
+                            <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.base_url"
+                                label="Base URL" />
+                        @endif
                     </div>
                 </div>
             @endforeach
diff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.php
index 6f9810215..9b53b9be6 100644
--- a/resources/views/livewire/settings/index.blade.php
+++ b/resources/views/livewire/settings/index.blade.php
@@ -154,7 +154,7 @@
                         <x-modal-confirmation title="Disable Two Step Confirmation?"
                             buttonTitle="Disable Two Step Confirmation" isErrorButton
                             submitAction="toggleTwoStepConfirmation" :actions="[
-                                'Tow Step confimation will be disabled globally.',
+                                'Two Step confimation will be disabled globally.',
                                 'Disabling two step confirmation reduces security (as anyone can easily delete anything).',
                                 'The risk of accidental actions will increase.',
                             ]"
diff --git a/routes/web.php b/routes/web.php
index 3570fe0ed..18adc0467 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,6 +12,7 @@ use App\Livewire\Destination\Show as DestinationShow;
 use App\Livewire\ForcePasswordReset;
 use App\Livewire\Notifications\Discord as NotificationDiscord;
 use App\Livewire\Notifications\Email as NotificationEmail;
+use App\Livewire\Notifications\Pushover as NotificationPushover;
 use App\Livewire\Notifications\Slack as NotificationSlack;
 use App\Livewire\Notifications\Telegram as NotificationTelegram;
 use App\Livewire\Profile\Index as ProfileIndex;
@@ -133,6 +134,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
         Route::get('/telegram', NotificationTelegram::class)->name('notifications.telegram');
         Route::get('/discord', NotificationDiscord::class)->name('notifications.discord');
         Route::get('/slack', NotificationSlack::class)->name('notifications.slack');
+        Route::get('/pushover', NotificationPushover::class)->name('notifications.pushover');
     });
 
     Route::prefix('storages')->group(function () {
@@ -181,6 +183,23 @@ Route::middleware(['auth', 'verified'])->group(function () {
     });
     Route::prefix('project/{project_uuid}/{environment_name}/application/{application_uuid}')->group(function () {
         Route::get('/', ApplicationConfiguration::class)->name('project.application.configuration');
+        Route::get('/swarm', ApplicationConfiguration::class)->name('project.application.swarm');
+        Route::get('/advanced', ApplicationConfiguration::class)->name('project.application.advanced');
+        Route::get('/environment-variables', ApplicationConfiguration::class)->name('project.application.environment-variables');
+        Route::get('/persistent-storage', ApplicationConfiguration::class)->name('project.application.persistent-storage');
+        Route::get('/source', ApplicationConfiguration::class)->name('project.application.source');
+        Route::get('/servers', ApplicationConfiguration::class)->name('project.application.servers');
+        Route::get('/scheduled-tasks', ApplicationConfiguration::class)->name('project.application.scheduled-tasks.show');
+        Route::get('/webhooks', ApplicationConfiguration::class)->name('project.application.webhooks');
+        Route::get('/preview-deployments', ApplicationConfiguration::class)->name('project.application.preview-deployments');
+        Route::get('/healthcheck', ApplicationConfiguration::class)->name('project.application.healthcheck');
+        Route::get('/rollback', ApplicationConfiguration::class)->name('project.application.rollback');
+        Route::get('/resource-limits', ApplicationConfiguration::class)->name('project.application.resource-limits');
+        Route::get('/resource-operations', ApplicationConfiguration::class)->name('project.application.resource-operations');
+        Route::get('/metrics', ApplicationConfiguration::class)->name('project.application.metrics');
+        Route::get('/tags', ApplicationConfiguration::class)->name('project.application.tags');
+        Route::get('/danger', ApplicationConfiguration::class)->name('project.application.danger');
+
         Route::get('/deployment', DeploymentIndex::class)->name('project.application.deployment.index');
         Route::get('/deployment/{deployment_uuid}', DeploymentShow::class)->name('project.application.deployment.show');
         Route::get('/logs', Logs::class)->name('project.application.logs');
diff --git a/templates/compose/checkmate.yaml b/templates/compose/checkmate.yaml
new file mode 100644
index 000000000..91018b3b9
--- /dev/null
+++ b/templates/compose/checkmate.yaml
@@ -0,0 +1,46 @@
+# documentation: https://bluewavelabs.gitbook.io/checkmate
+# slogan: An open source server monitoring application
+# tags: monitoring,server,uptime,healthcheck
+# logo: svgs/checkmate.png
+# port: 80
+
+services:
+  client:
+    image: bluewaveuptime/uptime_client:latest
+    environment:
+      - SERVICE_FQDN_CHECKMATE_80
+      - UPTIME_APP_API_BASE_URL=${SERVICE_FQDN_CHECKMATESERVER_5000}/api/v1
+    depends_on:
+      - server
+  server:
+    image: bluewaveuptime/uptime_server:latest
+    environment:
+      - SERVICE_FQDN_CHECKMATESERVER_5000
+      - JWT_SECRET=${SERVICE_PASSWORD_64_JWT}
+      - REFRESH_TOKEN_SECRET=${SERVICE_PASSWORD_64_REFRESH}
+      - SYSTEM_EMAIL_ADDRESS=${SYSTEM_EMAIL_ADDRESS:-test@example.com}
+      - SYSTEM_EMAIL_PASSWORD=${SERVICE_PASSWORD_64_EMAIL}
+      - SYSTEM_EMAIL_HOST=${SYSTEM_EMAIL_HOST}
+      - SYSTEM_EMAIL_PORT=${SYSTEM_EMAIL_PORT}
+      - PAGESPEED_API_KEY=${PAGESPEED_API_KEY}
+      - DB_CONNECTION_STRING=${DB_CONNECTION_STRING:-mongodb://mongodb:27017/uptime_db}
+      - REDIS_HOST=${REDIS_HOST:-redis}
+      - REDIS_PORT=${REDIS_PORT:-6379}
+      - DB_TYPE=${DB_TYPE:-MongoDB}
+      - TOKEN_TTL=${TOKEN_TTL:-99d}
+      - REFRESH_TOKEN_TTL=${REFRESH_TOKEN_TTL:-99d}
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      - redis
+      - mongodb
+  redis:
+    image: bluewaveuptime/uptime_redis:latest
+    volumes:
+      - redis:/data
+  mongodb:
+    image: bluewaveuptime/uptime_database_mongo:latest
+    volumes:
+      - mongodb:/data/db
+    command: ["mongod", "--quiet"]
+
diff --git a/templates/compose/documenso.yaml b/templates/compose/documenso.yaml
new file mode 100644
index 000000000..38b6b4f74
--- /dev/null
+++ b/templates/compose/documenso.yaml
@@ -0,0 +1,42 @@
+# documentation: https://docs.documenso.com/
+# slogan: Document signing, finally open source
+# tags: signing, opensource, document, pdf, e-signature, digital-signature, document-signing, pdf-signing, docusign
+# logo: svgs/documenso.png
+# port: 3000
+
+services:
+  documenso:
+    image: documenso/documenso
+    depends_on:
+      database:
+        condition: service_healthy
+    environment:
+      - SERVICE_FQDN_DOCUMENSO_3000
+      - NEXTAUTH_URL=${SERVICE_FQDN_DOCUMENSO_3000}
+      - NEXTAUTH_SECRET=${SERVICE_BASE64_AUTHSECRET}
+      - NEXT_PRIVATE_ENCRYPTION_KEY=${SERVICE_BASE64_ENCRYPTIONKEY}
+      - NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY=${SERVICE_BASE64_SECONDARYENCRYPTIONKEY}
+      - NEXT_PUBLIC_WEBAPP_URL=${SERVICE_FQDN_DOCUMENSO_3000}
+      - NEXT_PRIVATE_DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@database/${POSTGRES_DB:-documenso-db}?schema=public
+      - NEXT_PRIVATE_DIRECT_DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@database/${POSTGRES_DB:-documenso-db}?schema=public
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - "wget -q -O - http://documenso:3000/ | grep -q 'Sign in to your account'"
+      interval: 2s
+      timeout: 10s
+      retries: 20
+
+  database:
+    image: postgres:16-alpine
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-documenso-db}
+    volumes:
+      - documenso_postgresql_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
diff --git a/templates/compose/dolibarr.yaml b/templates/compose/dolibarr.yaml
new file mode 100644
index 000000000..6c32d0f92
--- /dev/null
+++ b/templates/compose/dolibarr.yaml
@@ -0,0 +1,43 @@
+# documentation: https://www.dolibarr.org/documentation-home.php
+# slogan: Dolibarr is a modern software package to manage your organization's activity (contacts, quotes, invoices, orders, stocks, agenda, hr, expense reports, accountancy, ecm, manufacturing, ...).
+# tags: crm,ERP
+# logo: svgs/dolibarr.png
+# port: 80
+
+services:
+  dolibarr:
+    image: dolibarr/dolibarr:latest
+    environment:
+      - SERVICE_FQDN_DOLIBARR_80
+      - WWW_USER_ID=${WWW_USER_ID:-1000}
+      - WWW_GROUP_ID=${WWW_GROUP_ID:-1000}
+      - DOLI_DB_HOST=mariadb
+      - DOLI_DB_NAME=${MYSQL_DATABASE:-dolibarr-db}
+      - DOLI_DB_USER=${SERVICE_USER_MYSQL}
+      - DOLI_DB_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+      - DOLI_URL_ROOT=${SERVICE_URL_DOLIBARR}
+      - DOLI_ADMIN_LOGIN=${SERVICE_USER_DOLIBARR}
+      - DOLI_ADMIN_PASSWORD=${SERVICE_PASSWORD_DOLIBARR}
+      - DOLI_CRON=${DOLI_CRON:-0}
+      - DOLI_INIT_DEMO=${DOLI_INIT_DEMO:-0}
+      - DOLI_COMPANY_NAME=${DOLI_COMPANY_NAME:-MyBigCompany}
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
+      interval: 2s
+      timeout: 10s
+      retries: 15
+
+  mariadb:
+    image: mariadb:latest
+    environment:
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-dolibarr-db}
+      - MYSQL_USER=${SERVICE_USER_MYSQL}
+      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_ROOT}
+    volumes:
+      - dolibarr_mariadb_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
diff --git a/templates/compose/fileflows.yaml b/templates/compose/fileflows.yaml
index 9beebb74e..2cfafb83f 100644
--- a/templates/compose/fileflows.yaml
+++ b/templates/compose/fileflows.yaml
@@ -5,7 +5,7 @@
 # port: 5000
 
 services:
-  radarr:
+  fileflows:
     image: revenz/fileflows
     environment:
       - SERVICE_FQDN_FILEFLOWS_5000
@@ -16,10 +16,10 @@ services:
     #devices:
     #  - "/dev/dri:/dev/dri" # Enable hardware transcoding
     volumes:
-      - fileflows-temp:/temp
-      - fileflows-configs:/app/Data
-      - fileflows-logs:/app/Logs
-      - fileflows-common:/app/common
+      - fileflows_temp:/temp
+      - fileflows_configs:/app/Data
+      - fileflows_logs:/app/Logs
+      - fileflows_common:/app/common
 
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:5000/api/system/version"]
diff --git a/templates/compose/getoutline.yaml b/templates/compose/getoutline.yaml
index ae8d26682..8c15d8499 100644
--- a/templates/compose/getoutline.yaml
+++ b/templates/compose/getoutline.yaml
@@ -57,6 +57,10 @@ services:
       - GITHUB_APP_NAME=${GITHUB_APP_NAME}
       - GITHUB_APP_ID=${GITHUB_APP_ID}
       - GITHUB_APP_PRIVATE_KEY=${GITHUB_APP_PRIVATE_KEY}
+      - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID}
+      - DISCORD_CLIENT_SECRET=${DISCORD_CLIENT_SECRET}
+      - DISCORD_SERVER_ID=${DISCORD_SERVER_ID}
+      - DISCORD_SERVER_ROLES=${DISCORD_SERVER_ROLES}
       - PGSSLMODE=${PGSSLMODE:-disable}
       - FORCE_HTTPS=${FORCE_HTTPS:-true}
     healthcheck:
diff --git a/templates/compose/nexus-arm.yaml b/templates/compose/nexus-arm.yaml
new file mode 100644
index 000000000..b9a426309
--- /dev/null
+++ b/templates/compose/nexus-arm.yaml
@@ -0,0 +1,21 @@
+# documentation: https://help.sonatype.com/en/sonatype-nexus-repository.html
+# slogan: Open source Universal Repository Manager (ARM version, community edition), default credentials: admin/admin123
+# tags: repository, manager, open source, docker, docker, registry, container
+# logo: svgs/nexus.png
+# port: 8081
+
+services:
+  nexus:
+    image: sonatypecommunity/nexus3
+    environment:
+      - SERVICE_FQDN_NEXUS_8081
+      - NEXUS_SECURITY_RANDOMPASSWORD=false
+      - INSTALL4J_ADD_VM_PARAMS=-Xms2703m -Xmx2703m -XX:MaxDirectMemorySize=2703m -Djava.util.prefs.userRoot=/nexus-data/javaprefs
+    volumes:
+      - nexus_data:/nexus-data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8081/service/rest/v1/status"]
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
diff --git a/templates/compose/nexus.yaml b/templates/compose/nexus.yaml
new file mode 100644
index 000000000..a23601c1d
--- /dev/null
+++ b/templates/compose/nexus.yaml
@@ -0,0 +1,22 @@
+# documentation: https://help.sonatype.com/en/sonatype-nexus-repository.html
+# slogan: Open source Universal Repository Manager (x86_64 version, official), default credentials: admin/admin123
+# tags: repository, manager, open source, docker, docker, registry, container
+# logo: svgs/nexus.png
+# port: 8081
+
+services:
+  nexus:
+    image: sonatype/nexus3
+    platform: linux/amd64
+    environment:
+      - SERVICE_FQDN_NEXUS_8081
+      - NEXUS_SECURITY_RANDOMPASSWORD=${NEXUS_SECURITY_RANDOMPASSWORD:-false}
+      - INSTALL4J_ADD_VM_PARAMS=-Xms2703m -Xmx2703m -XX:MaxDirectMemorySize=2703m -Djava.util.prefs.userRoot=/nexus-data/javaprefs
+    volumes:
+      - nexus_data:/nexus-data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8081/service/rest/v1/status"]
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
diff --git a/templates/compose/prowlarr.yaml b/templates/compose/prowlarr.yaml
index f173ee1ca..0bcb42c5e 100644
--- a/templates/compose/prowlarr.yaml
+++ b/templates/compose/prowlarr.yaml
@@ -1,5 +1,5 @@
 # documentation: https://hub.docker.com/r/linuxserver/prowlarr
-# slogan: Prowlarr⁠ is a indexer manager/proxy built on the popular arr .net/reactjs base stack to integrate with your various PVR apps. Prowlarr supports both Torrent Trackers and Usenet Indexers. It integrates seamlessly with Sonarr, Radarr, Lidarr, and Readarr offering complete management of your indexers with no per app Indexer setup required (we do it all).
+# slogan: Prowlarr⁠ is a indexer manager/proxy built on the popular arr .net/reactjs base stack to integrate with your various PVR apps.
 # tags: media, server, movies, tv, indexer, torrent, nzb, usenet
 # logo: svgs/prowlarr.svg
 # port: 9696
diff --git a/templates/compose/twenty.yaml b/templates/compose/twenty.yaml
index 44ee1f6d6..c76616d5a 100644
--- a/templates/compose/twenty.yaml
+++ b/templates/compose/twenty.yaml
@@ -1,3 +1,4 @@
+# ignore: true
 # documentation: https://docs.twenty.com
 # slogan: Twenty is a CRM designed to fit your unique business needs.
 # tags: crm, self-hosted, dashboard
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 514d995c5..9f1f6a7cc 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -338,6 +338,20 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "checkmate": {
+        "documentation": "https://bluewavelabs.gitbook.io/checkmate?utm_source=coolify.io",
+        "slogan": "An open source server monitoring application",
+        "compose": "c2VydmljZXM6CiAgY2xpZW50OgogICAgaW1hZ2U6ICdibHVld2F2ZXVwdGltZS91cHRpbWVfY2xpZW50OmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9DSEVDS01BVEVfODAKICAgICAgLSAnVVBUSU1FX0FQUF9BUElfQkFTRV9VUkw9JHtTRVJWSUNFX0ZRRE5fQ0hFQ0tNQVRFU0VSVkVSXzUwMDB9L2FwaS92MScKICAgIGRlcGVuZHNfb246CiAgICAgIC0gc2VydmVyCiAgc2VydmVyOgogICAgaW1hZ2U6ICdibHVld2F2ZXVwdGltZS91cHRpbWVfc2VydmVyOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9DSEVDS01BVEVTRVJWRVJfNTAwMAogICAgICAtICdKV1RfU0VDUkVUPSR7U0VSVklDRV9QQVNTV09SRF82NF9KV1R9JwogICAgICAtICdSRUZSRVNIX1RPS0VOX1NFQ1JFVD0ke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUkVGUkVTSH0nCiAgICAgIC0gJ1NZU1RFTV9FTUFJTF9BRERSRVNTPSR7U1lTVEVNX0VNQUlMX0FERFJFU1M6LXRlc3RAZXhhbXBsZS5jb219JwogICAgICAtICdTWVNURU1fRU1BSUxfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEXzY0X0VNQUlMfScKICAgICAgLSAnU1lTVEVNX0VNQUlMX0hPU1Q9JHtTWVNURU1fRU1BSUxfSE9TVH0nCiAgICAgIC0gJ1NZU1RFTV9FTUFJTF9QT1JUPSR7U1lTVEVNX0VNQUlMX1BPUlR9JwogICAgICAtICdQQUdFU1BFRURfQVBJX0tFWT0ke1BBR0VTUEVFRF9BUElfS0VZfScKICAgICAgLSAnREJfQ09OTkVDVElPTl9TVFJJTkc9JHtEQl9DT05ORUNUSU9OX1NUUklORzotbW9uZ29kYjovL21vbmdvZGI6MjcwMTcvdXB0aW1lX2RifScKICAgICAgLSAnUkVESVNfSE9TVD0ke1JFRElTX0hPU1Q6LXJlZGlzfScKICAgICAgLSAnUkVESVNfUE9SVD0ke1JFRElTX1BPUlQ6LTYzNzl9JwogICAgICAtICdEQl9UWVBFPSR7REJfVFlQRTotTW9uZ29EQn0nCiAgICAgIC0gJ1RPS0VOX1RUTD0ke1RPS0VOX1RUTDotOTlkfScKICAgICAgLSAnUkVGUkVTSF9UT0tFTl9UVEw9JHtSRUZSRVNIX1RPS0VOX1RUTDotOTlkfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJy92YXIvcnVuL2RvY2tlci5zb2NrOi92YXIvcnVuL2RvY2tlci5zb2NrJwogICAgZGVwZW5kc19vbjoKICAgICAgLSByZWRpcwogICAgICAtIG1vbmdvZGIKICByZWRpczoKICAgIGltYWdlOiAnYmx1ZXdhdmV1cHRpbWUvdXB0aW1lX3JlZGlzOmxhdGVzdCcKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3JlZGlzOi9kYXRhJwogIG1vbmdvZGI6CiAgICBpbWFnZTogJ2JsdWV3YXZldXB0aW1lL3VwdGltZV9kYXRhYmFzZV9tb25nbzpsYXRlc3QnCiAgICB2b2x1bWVzOgogICAgICAtICdtb25nb2RiOi9kYXRhL2RiJwogICAgY29tbWFuZDoKICAgICAgLSBtb25nb2QKICAgICAgLSAnLS1xdWlldCcK",
+        "tags": [
+            "monitoring",
+            "server",
+            "uptime",
+            "healthcheck"
+        ],
+        "logo": "svgs/checkmate.png",
+        "minversion": "0.0.0",
+        "port": "80"
+    },
     "classicpress-with-mariadb": {
         "documentation": "https://www.classicpress.net/?utm_source=coolify.io",
         "slogan": "A lightweight, stable, instantly familiar free open-source content management system, based on WordPress without the block editor (Gutenberg).",
@@ -523,6 +537,25 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "documenso": {
+        "documentation": "https://docs.documenso.com/?utm_source=coolify.io",
+        "slogan": "Document signing, finally open source",
+        "compose": "c2VydmljZXM6CiAgZG9jdW1lbnNvOgogICAgaW1hZ2U6IGRvY3VtZW5zby9kb2N1bWVuc28KICAgIGRlcGVuZHNfb246CiAgICAgIGRhdGFiYXNlOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fRE9DVU1FTlNPXzMwMDAKICAgICAgLSAnTkVYVEFVVEhfVVJMPSR7U0VSVklDRV9GUUROX0RPQ1VNRU5TT18zMDAwfScKICAgICAgLSAnTkVYVEFVVEhfU0VDUkVUPSR7U0VSVklDRV9CQVNFNjRfQVVUSFNFQ1JFVH0nCiAgICAgIC0gJ05FWFRfUFJJVkFURV9FTkNSWVBUSU9OX0tFWT0ke1NFUlZJQ0VfQkFTRTY0X0VOQ1JZUFRJT05LRVl9JwogICAgICAtICdORVhUX1BSSVZBVEVfRU5DUllQVElPTl9TRUNPTkRBUllfS0VZPSR7U0VSVklDRV9CQVNFNjRfU0VDT05EQVJZRU5DUllQVElPTktFWX0nCiAgICAgIC0gJ05FWFRfUFVCTElDX1dFQkFQUF9VUkw9JHtTRVJWSUNFX0ZRRE5fRE9DVU1FTlNPXzMwMDB9JwogICAgICAtICdORVhUX1BSSVZBVEVfREFUQUJBU0VfVVJMPXBvc3RncmVzcWw6Ly8ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU306JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfUBkYXRhYmFzZS8ke1BPU1RHUkVTX0RCOi1kb2N1bWVuc28tZGJ9P3NjaGVtYT1wdWJsaWMnCiAgICAgIC0gJ05FWFRfUFJJVkFURV9ESVJFQ1RfREFUQUJBU0VfVVJMPXBvc3RncmVzcWw6Ly8ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU306JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfUBkYXRhYmFzZS8ke1BPU1RHUkVTX0RCOi1kb2N1bWVuc28tZGJ9P3NjaGVtYT1wdWJsaWMnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gIndnZXQgLXEgLU8gLSBodHRwOi8vZG9jdW1lbnNvOjMwMDAvIHwgZ3JlcCAtcSAnU2lnbiBpbiB0byB5b3VyIGFjY291bnQnIgogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDIwCiAgZGF0YWJhc2U6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfREI9JHtQT1NUR1JFU19EQjotZG9jdW1lbnNvLWRifScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RvY3VtZW5zb19wb3N0Z3Jlc3FsX2RhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
+        "tags": [
+            "signing",
+            "opensource",
+            "document",
+            "pdf",
+            "e-signature",
+            "digital-signature",
+            "document-signing",
+            "pdf-signing",
+            "docusign"
+        ],
+        "logo": "svgs/documenso.png",
+        "minversion": "0.0.0",
+        "port": "3000"
+    },
     "docuseal-with-postgres": {
         "documentation": "https://www.docuseal.co/?utm_source=coolify.io",
         "slogan": "Document Signing for Everyone free forever for individuals, extensible for businesses and developers. Open Source Alternative to DocuSign, PandaDoc and more.",
@@ -558,6 +591,18 @@
         "logo": "svgs/dokuwiki.png",
         "minversion": "0.0.0"
     },
+    "dolibarr": {
+        "documentation": "https://www.dolibarr.org/documentation-home.php?utm_source=coolify.io",
+        "slogan": "Dolibarr is a modern software package to manage your organization's activity (contacts, quotes, invoices, orders, stocks, agenda, hr, expense reports, accountancy, ecm, manufacturing, ...).",
+        "compose": "c2VydmljZXM6CiAgZG9saWJhcnI6CiAgICBpbWFnZTogJ2RvbGliYXJyL2RvbGliYXJyOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9ET0xJQkFSUl84MAogICAgICAtICdXV1dfVVNFUl9JRD0ke1dXV19VU0VSX0lEOi0xMDAwfScKICAgICAgLSAnV1dXX0dST1VQX0lEPSR7V1dXX0dST1VQX0lEOi0xMDAwfScKICAgICAgLSBET0xJX0RCX0hPU1Q9bWFyaWFkYgogICAgICAtICdET0xJX0RCX05BTUU9JHtNWVNRTF9EQVRBQkFTRTotZG9saWJhcnItZGJ9JwogICAgICAtICdET0xJX0RCX1VTRVI9JHtTRVJWSUNFX1VTRVJfTVlTUUx9JwogICAgICAtICdET0xJX0RCX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTH0nCiAgICAgIC0gJ0RPTElfVVJMX1JPT1Q9JHtTRVJWSUNFX1VSTF9ET0xJQkFSUn0nCiAgICAgIC0gJ0RPTElfQURNSU5fTE9HSU49JHtTRVJWSUNFX1VTRVJfRE9MSUJBUlJ9JwogICAgICAtICdET0xJX0FETUlOX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9ET0xJQkFSUn0nCiAgICAgIC0gJ0RPTElfQ1JPTj0ke0RPTElfQ1JPTjotMH0nCiAgICAgIC0gJ0RPTElfSU5JVF9ERU1PPSR7RE9MSV9JTklUX0RFTU86LTB9JwogICAgICAtICdET0xJX0NPTVBBTllfTkFNRT0ke0RPTElfQ09NUEFOWV9OQU1FOi1NeUJpZ0NvbXBhbnl9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjgwJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1CiAgbWFyaWFkYjoKICAgIGltYWdlOiAnbWFyaWFkYjpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRTotZG9saWJhcnItZGJ9JwogICAgICAtICdNWVNRTF9VU0VSPSR7U0VSVklDRV9VU0VSX01ZU1FMfScKICAgICAgLSAnTVlTUUxfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMfScKICAgICAgLSAnTVlTUUxfUk9PVF9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUk9PVH0nCiAgICB2b2x1bWVzOgogICAgICAtICdkb2xpYmFycl9tYXJpYWRiX2RhdGE6L3Zhci9saWIvbXlzcWwnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gaGVhbHRoY2hlY2suc2gKICAgICAgICAtICctLWNvbm5lY3QnCiAgICAgICAgLSAnLS1pbm5vZGJfaW5pdGlhbGl6ZWQnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "tags": [
+            "crm",
+            "erp"
+        ],
+        "logo": "svgs/dolibarr.png",
+        "minversion": "0.0.0",
+        "port": "80"
+    },
     "dozzle-with-auth": {
         "documentation": "https://dozzle.dev/?utm_source=coolify.io",
         "slogan": "Dozzle is a simple and lightweight web UI for Docker logs.",
@@ -698,7 +743,7 @@
     "fileflows": {
         "documentation": "https://fileflows.com/docs/?utm_source=coolify.io",
         "slogan": "FileFlows can drastically reduce your files, up to 90%, saving you space and money. No need to buy more hard drives, just shrink your files and start saving.",
-        "compose": "c2VydmljZXM6CiAgcmFkYXJyOgogICAgaW1hZ2U6IHJldmVuei9maWxlZmxvd3MKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9GSUxFRkxPV1NfNTAwMAogICAgICAtIF9BUFBfVVJMPSRTRVJWSUNFX0ZRRE5fRklMRV9GTE9XUwogICAgICAtIFBVSUQ9MTAwMAogICAgICAtIFBHSUQ9MTAwMAogICAgICAtICdUWj0ke1RaOi1BbWVyaWNhL1Rvcm9udG99JwogICAgdm9sdW1lczoKICAgICAgLSAnZmlsZWZsb3dzLXRlbXA6L3RlbXAnCiAgICAgIC0gJ2ZpbGVmbG93cy1jb25maWdzOi9hcHAvRGF0YScKICAgICAgLSAnZmlsZWZsb3dzLWxvZ3M6L2FwcC9Mb2dzJwogICAgICAtICdmaWxlZmxvd3MtY29tbW9uOi9hcHAvY29tbW9uJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjUwMDAvYXBpL3N5c3RlbS92ZXJzaW9uJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1Cg==",
+        "compose": "c2VydmljZXM6CiAgZmlsZWZsb3dzOgogICAgaW1hZ2U6IHJldmVuei9maWxlZmxvd3MKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9GSUxFRkxPV1NfNTAwMAogICAgICAtIF9BUFBfVVJMPSRTRVJWSUNFX0ZRRE5fRklMRV9GTE9XUwogICAgICAtIFBVSUQ9MTAwMAogICAgICAtIFBHSUQ9MTAwMAogICAgICAtICdUWj0ke1RaOi1BbWVyaWNhL1Rvcm9udG99JwogICAgdm9sdW1lczoKICAgICAgLSAnZmlsZWZsb3dzX3RlbXA6L3RlbXAnCiAgICAgIC0gJ2ZpbGVmbG93c19jb25maWdzOi9hcHAvRGF0YScKICAgICAgLSAnZmlsZWZsb3dzX2xvZ3M6L2FwcC9Mb2dzJwogICAgICAtICdmaWxlZmxvd3NfY29tbW9uOi9hcHAvY29tbW9uJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjUwMDAvYXBpL3N5c3RlbS92ZXJzaW9uJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1Cg==",
         "tags": [
             "media",
             "transcode",
@@ -1922,6 +1967,40 @@
         "minversion": "0.0.0",
         "port": "80"
     },
+    "nexus-arm": {
+        "documentation": "https://help.sonatype.com/en/sonatype-nexus-repository.html?utm_source=coolify.io",
+        "slogan": "Open source Universal Repository Manager (ARM version, community edition), default credentials: admin/admin123",
+        "compose": "c2VydmljZXM6CiAgbmV4dXM6CiAgICBpbWFnZTogc29uYXR5cGVjb21tdW5pdHkvbmV4dXMzCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTkVYVVNfODA4MQogICAgICAtIE5FWFVTX1NFQ1VSSVRZX1JBTkRPTVBBU1NXT1JEPWZhbHNlCiAgICAgIC0gJ0lOU1RBTEw0Sl9BRERfVk1fUEFSQU1TPS1YbXMyNzAzbSAtWG14MjcwM20gLVhYOk1heERpcmVjdE1lbW9yeVNpemU9MjcwM20gLURqYXZhLnV0aWwucHJlZnMudXNlclJvb3Q9L25leHVzLWRhdGEvamF2YXByZWZzJwogICAgdm9sdW1lczoKICAgICAgLSAnbmV4dXNfZGF0YTovbmV4dXMtZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDo4MDgxL3NlcnZpY2UvcmVzdC92MS9zdGF0dXMnCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDMKICAgICAgc3RhcnRfcGVyaW9kOiA2MHMK",
+        "tags": [
+            "repository",
+            "manager",
+            "open source",
+            "docker",
+            "docker",
+            "registry",
+            "container"
+        ],
+        "logo": "svgs/nexus.png",
+        "minversion": "0.0.0",
+        "port": "8081"
+    },
+    "nexus": {
+        "documentation": "https://help.sonatype.com/en/sonatype-nexus-repository.html?utm_source=coolify.io",
+        "slogan": "Open source Universal Repository Manager (x86_64 version, official), default credentials: admin/admin123",
+        "compose": "c2VydmljZXM6CiAgbmV4dXM6CiAgICBpbWFnZTogc29uYXR5cGUvbmV4dXMzCiAgICBwbGF0Zm9ybTogbGludXgvYW1kNjQKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9ORVhVU184MDgxCiAgICAgIC0gJ05FWFVTX1NFQ1VSSVRZX1JBTkRPTVBBU1NXT1JEPSR7TkVYVVNfU0VDVVJJVFlfUkFORE9NUEFTU1dPUkQ6LWZhbHNlfScKICAgICAgLSAnSU5TVEFMTDRKX0FERF9WTV9QQVJBTVM9LVhtczI3MDNtIC1YbXgyNzAzbSAtWFg6TWF4RGlyZWN0TWVtb3J5U2l6ZT0yNzAzbSAtRGphdmEudXRpbC5wcmVmcy51c2VyUm9vdD0vbmV4dXMtZGF0YS9qYXZhcHJlZnMnCiAgICB2b2x1bWVzOgogICAgICAtICduZXh1c19kYXRhOi9uZXh1cy1kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgwODEvc2VydmljZS9yZXN0L3YxL3N0YXR1cycKICAgICAgaW50ZXJ2YWw6IDEwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgICBzdGFydF9wZXJpb2Q6IDYwcwo=",
+        "tags": [
+            "repository",
+            "manager",
+            "open source",
+            "docker",
+            "docker",
+            "registry",
+            "container"
+        ],
+        "logo": "svgs/nexus.png",
+        "minversion": "0.0.0",
+        "port": "8081"
+    },
     "nitropage-with-postgresql": {
         "documentation": "https://nitropage.com?utm_source=coolify.io",
         "slogan": "Nitropage is an extensible visual website builder, offering a growing collection of versatile building blocks, focal-point image cropping and sovereign font management.",
@@ -2301,7 +2380,7 @@
     },
     "prowlarr": {
         "documentation": "https://hub.docker.com/r/linuxserver/prowlarr?utm_source=coolify.io",
-        "slogan": "Prowlarr\u2060 is a indexer manager/proxy built on the popular arr .net/reactjs base stack to integrate with your various PVR apps. Prowlarr supports both Torrent Trackers and Usenet Indexers. It integrates seamlessly with Sonarr, Radarr, Lidarr, and Readarr offering complete management of your indexers with no per app Indexer setup required (we do it all).",
+        "slogan": "Prowlarr\u2060 is a indexer manager/proxy built on the popular arr .net/reactjs base stack to integrate with your various PVR apps.",
         "compose": "c2VydmljZXM6CiAgcHJvd2xhcnI6CiAgICBpbWFnZTogJ2xzY3IuaW8vbGludXhzZXJ2ZXIvcHJvd2xhcnI6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX1BST1dMQVJSXzk2OTYKICAgICAgLSBfQVBQX1VSTD0kU0VSVklDRV9GUUROX1BST1dMQVJSCiAgICAgIC0gUFVJRD0xMDAwCiAgICAgIC0gUEdJRD0xMDAwCiAgICAgIC0gJ1RaPSR7VFo6LUFtZXJpY2EvVG9yb250b30nCiAgICB2b2x1bWVzOgogICAgICAtICdwcm93bGFyci1jb25maWc6L2NvbmZpZycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDo5Njk2L3BpbmcnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUK",
         "tags": [
             "media",
@@ -2724,19 +2803,6 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
-    "twenty": {
-        "documentation": "https://docs.twenty.com?utm_source=coolify.io",
-        "slogan": "Twenty is a CRM designed to fit your unique business needs.",
-        "compose": "c2VydmljZXM6CiAgdHdlbnR5OgogICAgaW1hZ2U6ICd0d2VudHljcm0vdHdlbnR5OmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9UV0VOVFlfMzAwMAogICAgICAtIFNFUlZFUl9VUkw9JFNFUlZJQ0VfRlFETl9UV0VOVFkKICAgICAgLSBGUk9OVF9CQVNFX1VSTD0kU0VSVklDRV9GUUROX1RXRU5UWQogICAgICAtIEVOQUJMRV9EQl9NSUdSQVRJT05TPXRydWUKICAgICAgLSAnQ0FDSEVfU1RPUkFHRV9UWVBFPSR7Q0FDSEVfU1RPUkFHRV9UWVBFOi1yZWRpc30nCiAgICAgIC0gJ1JFRElTX1VSTD1yZWRpczovL3JlZGlzOjYzNzknCiAgICAgIC0gJ0FQSV9SQVRFX0xJTUlUSU5HX1RUTD0ke0FQSV9SQVRFX0xJTUlUSU5HX1RUTDotMTAwfScKICAgICAgLSAnQVBJX1JBVEVfTElNSVRJTkdfTElNSVQ9JHtBUElfUkFURV9MSU1JVElOR19MSU1JVDotMTAwfScKICAgICAgLSBBUFBfU0VDUkVUPSRTRVJWSUNFX0JBU0U2NF8zMl9TRUNSRVQKICAgICAgLSBQT1NUR1JFU19BRE1JTl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdQR19EQVRBQkFTRV9VUkw9cG9zdGdyZXM6Ly9wb3N0Z3JlczokU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU0Bwb3N0Z3Jlczo1NDMyL2RlZmF1bHQnCiAgICAgIC0gJ0lTX1NJR05fVVBfRElTQUJMRUQ9JHtJU19TSUdOX1VQX0RJU0FCTEVEOi1mYWxzZX0nCiAgICAgIC0gJ1BBU1NXT1JEX1JFU0VUX1RPS0VOX0VYUElSRVNfSU49JHtQQVNTV09SRF9SRVNFVF9UT0tFTl9FWFBJUkVTX0lOOi01bX0nCiAgICAgIC0gV09SS1NQQUNFX0lOQUNUSVZFX0RBWVNfQkVGT1JFX05PVElGSUNBVElPTj0kV09SS1NQQUNFX0lOQUNUSVZFX0RBWVNfQkVGT1JFX05PVElGSUNBVElPTgogICAgICAtIFdPUktTUEFDRV9JTkFDVElWRV9EQVlTX0JFRk9SRV9ERUxFVElPTj0kV09SS1NQQUNFX0lOQUNUSVZFX0RBWVNfQkVGT1JFX0RFTEVUSU9OCiAgICAgIC0gJ1NUT1JBR0VfVFlQRT0ke1NUT1JBR0VfVFlQRTotbG9jYWx9JwogICAgICAtIFNUT1JBR0VfUzNfUkVHSU9OPSRTVE9SQUdFX1MzX1JFR0lPTgogICAgICAtIFNUT1JBR0VfUzNfTkFNRT0kU1RPUkFHRV9TM19OQU1FCiAgICAgIC0gU1RPUkFHRV9TM19FTkRQT0lOVD0kU1RPUkFHRV9TM19FTkRQT0lOVAogICAgICAtIFNUT1JBR0VfUzNfQUNDRVNTX0tFWV9JRD0kU1RPUkFHRV9TM19BQ0NFU1NfS0VZX0lECiAgICAgIC0gU1RPUkFHRV9TM19TRUNSRVRfQUNDRVNTX0tFWT0kU1RPUkFHRV9TM19TRUNSRVRfQUNDRVNTX0tFWQogICAgICAtICdNRVNTQUdFX1FVRVVFX1RZUEU9JHtNRVNTQUdFX1FVRVVFX1RZUEU6LXBnLWJvc3N9JwogICAgICAtIEVNQUlMX0ZST01fQUREUkVTUz0kRU1BSUxfRlJPTV9BRERSRVNTCiAgICAgIC0gRU1BSUxfRlJPTV9OQU1FPSRFTUFJTF9GUk9NX05BTUUKICAgICAgLSBFTUFJTF9TWVNURU1fQUREUkVTUz0kRU1BSUxfU1lTVEVNX0FERFJFU1MKICAgICAgLSAnRU1BSUxfRFJJVkVSPSR7RU1BSUxfRFJJVkVSOi1sb2dnZXJ9JwogICAgICAtIEVNQUlMX1NNVFBfSE9TVD0kRU1BSUxfU01UUF9IT1NUCiAgICAgIC0gRU1BSUxfU01UUF9QT1JUPSRFTUFJTF9TTVRQX1BPUlQKICAgICAgLSBFTUFJTF9TTVRQX1VTRVI9JEVNQUlMX1NNVFBfVVNFUgogICAgICAtIEVNQUlMX1NNVFBfUEFTU1dPUkQ9JEVNQUlMX1NNVFBfUEFTU1dPUkQKICAgICAgLSBTSUdOX0lOX1BSRUZJTExFRD1mYWxzZQogICAgICAtICdERUJVR19NT0RFPSR7REVCVUdfTU9ERTotZmFsc2V9JwogICAgICAtICdURUxFTUVUUllfRU5BQkxFRD0ke1RFTEVNRVRSWV9FTkFCTEVEOi1mYWxzZX0nCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3JlczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjMwMDAvaGVhbHRoeicKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxNQogIHBvc3RncmVzOgogICAgaW1hZ2U6ICd0d2VudHljcm0vdHdlbnR5LXBvc3RncmVzOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9cG9zdGdyZXMKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX0RCPWRlZmF1bHQKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3BnLWRhdGE6L2JpdG5hbWkvcG9zdGdyZXNxbCcKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAncmVkaXMtZGF0YTovZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSByZWRpcy1jbGkKICAgICAgICAtIHBpbmcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
-        "tags": [
-            "crm",
-            "self-hosted",
-            "dashboard"
-        ],
-        "logo": "svgs/twenty.svg",
-        "minversion": "0.0.0",
-        "port": "3000"
-    },
     "umami": {
         "documentation": "https://umami.is?utm_source=coolify.io",
         "slogan": "Umami is web analytics platform which provides insights into visitor behavior without compromising user privacy.",
diff --git a/versions.json b/versions.json
index b6f301ebc..d00272987 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.377"
+            "version": "4.0.0-beta.380"
         },
         "nightly": {
-            "version": "4.0.0-beta.378"
+            "version": "4.0.0-beta.381"
         },
         "helper": {
             "version": "1.0.4"