diff --git a/app/Actions/Proxy/CheckProxy.php b/app/Actions/Proxy/CheckProxy.php
index 51303d87a..6c8dd5234 100644
--- a/app/Actions/Proxy/CheckProxy.php
+++ b/app/Actions/Proxy/CheckProxy.php
@@ -30,7 +30,7 @@ class CheckProxy
         if (is_null($proxyType) || $proxyType === 'NONE' || $server->proxy->force_stop) {
             return false;
         }
-        ['uptime' => $uptime, 'error' => $error] = $server->validateConnection(false);
+        ['uptime' => $uptime, 'error' => $error] = $server->validateConnection();
         if (! $uptime) {
             throw new \Exception($error);
         }
diff --git a/app/Http/Controllers/Webhook/Stripe.php b/app/Http/Controllers/Webhook/Stripe.php
index e94209b23..83ba16699 100644
--- a/app/Http/Controllers/Webhook/Stripe.php
+++ b/app/Http/Controllers/Webhook/Stripe.php
@@ -3,21 +3,26 @@
 namespace App\Http\Controllers\Webhook;
 
 use App\Http\Controllers\Controller;
-use App\Jobs\ServerLimitCheckJob;
-use App\Jobs\SubscriptionInvoiceFailedJob;
-use App\Models\Subscription;
-use App\Models\Team;
+use App\Jobs\StripeProcessJob;
 use App\Models\Webhook;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 
 class Stripe extends Controller
 {
+    protected $webhook;
+
     public function events(Request $request)
     {
         try {
+            $webhookSecret = config('subscription.stripe_webhook_secret');
+            $signature = $request->header('Stripe-Signature');
+            $event = \Stripe\Webhook::constructEvent(
+                $request->getContent(),
+                $signature,
+                $webhookSecret
+            );
             if (app()->isDownForMaintenance()) {
                 $epoch = now()->valueOf();
                 $data = [
@@ -33,241 +38,17 @@ class Stripe extends Controller
                 $json = json_encode($data);
                 Storage::disk('webhooks-during-maintenance')->put("{$epoch}_Stripe::events_stripe", $json);
 
-                return;
+                return response('Webhook received. Cool cool cool cool cool.', 200);
             }
-            $webhookSecret = config('subscription.stripe_webhook_secret');
-            $signature = $request->header('Stripe-Signature');
-            $excludedPlans = config('subscription.stripe_excluded_plans');
-            $event = \Stripe\Webhook::constructEvent(
-                $request->getContent(),
-                $signature,
-                $webhookSecret
-            );
-            $webhook = Webhook::create([
+            $this->webhook = Webhook::create([
                 'type' => 'stripe',
                 'payload' => $request->getContent(),
             ]);
-            $type = data_get($event, 'type');
-            $data = data_get($event, 'data.object');
-            switch ($type) {
-                case 'radar.early_fraud_warning.created':
-                    $stripe = new \Stripe\StripeClient(config('subscription.stripe_api_key'));
-                    $id = data_get($data, 'id');
-                    $charge = data_get($data, 'charge');
-                    if ($charge) {
-                        $stripe->refunds->create(['charge' => $charge]);
-                    }
-                    $pi = data_get($data, 'payment_intent');
-                    $piData = $stripe->paymentIntents->retrieve($pi, []);
-                    $customerId = data_get($piData, 'customer');
-                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    if ($subscription) {
-                        $subscriptionId = data_get($subscription, 'stripe_subscription_id');
-                        $stripe->subscriptions->cancel($subscriptionId, []);
-                        $subscription->update([
-                            'stripe_invoice_paid' => false,
-                        ]);
-                        send_internal_notification("Early fraud warning created Refunded, subscription canceled. Charge: {$charge}, id: {$id}, pi: {$pi}");
-                    } else {
-                        send_internal_notification("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}");
+            StripeProcessJob::dispatch($event);
 
-                        return response("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}", 400);
-                    }
-                    break;
-                case 'checkout.session.completed':
-                    $clientReferenceId = data_get($data, 'client_reference_id');
-                    if (is_null($clientReferenceId)) {
-                        send_internal_notification('Checkout session completed without client reference id.');
-                        break;
-                    }
-                    $userId = Str::before($clientReferenceId, ':');
-                    $teamId = Str::after($clientReferenceId, ':');
-                    $subscriptionId = data_get($data, 'subscription');
-                    $customerId = data_get($data, 'customer');
-                    $team = Team::find($teamId);
-                    $found = $team->members->where('id', $userId)->first();
-                    if (! $found->isAdmin()) {
-                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
-
-                        return response("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.", 400);
-                    }
-                    $subscription = Subscription::where('team_id', $teamId)->first();
-                    if ($subscription) {
-                        // send_internal_notification('Old subscription activated for team: '.$teamId);
-                        $subscription->update([
-                            'stripe_subscription_id' => $subscriptionId,
-                            'stripe_customer_id' => $customerId,
-                            'stripe_invoice_paid' => true,
-                        ]);
-                    } else {
-                        // send_internal_notification('New subscription for team: '.$teamId);
-                        Subscription::create([
-                            'team_id' => $teamId,
-                            'stripe_subscription_id' => $subscriptionId,
-                            'stripe_customer_id' => $customerId,
-                            'stripe_invoice_paid' => true,
-                        ]);
-                    }
-                    break;
-                case 'invoice.paid':
-                    $customerId = data_get($data, 'customer');
-                    $planId = data_get($data, 'lines.data.0.plan.id');
-                    if (Str::contains($excludedPlans, $planId)) {
-                        // send_internal_notification('Subscription excluded.');
-                        break;
-                    }
-                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    if ($subscription) {
-                        $subscription->update([
-                            'stripe_invoice_paid' => true,
-                        ]);
-                    } else {
-                        return response("No subscription found for customer: {$customerId}", 400);
-                    }
-                    break;
-                case 'invoice.payment_failed':
-                    $customerId = data_get($data, 'customer');
-                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    if (! $subscription) {
-                        // send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: '.$customerId);
-
-                        return response('No subscription found in Coolify.');
-                    }
-                    $team = data_get($subscription, 'team');
-                    if (! $team) {
-                        // send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: '.$customerId);
-
-                        return response('No team found in Coolify.');
-                    }
-                    if (! $subscription->stripe_invoice_paid) {
-                        SubscriptionInvoiceFailedJob::dispatch($team);
-                        // send_internal_notification('Invoice payment failed: '.$customerId);
-                    } else {
-                        // send_internal_notification('Invoice payment failed but already paid: '.$customerId);
-                    }
-                    break;
-                case 'payment_intent.payment_failed':
-                    $customerId = data_get($data, 'customer');
-                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    if (! $subscription) {
-                        // send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: '.$customerId);
-
-                        return response('No subscription found in Coolify.');
-                    }
-                    if ($subscription->stripe_invoice_paid) {
-                        // send_internal_notification('payment_intent.payment_failed but invoice is active for customer: '.$customerId);
-
-                        return;
-                    }
-                    send_internal_notification('Subscription payment failed for customer: '.$customerId);
-                    break;
-                case 'customer.subscription.created':
-                    $customerId = data_get($data, 'customer');
-                    $subscriptionId = data_get($data, 'id');
-                    $teamId = data_get($data, 'metadata.team_id');
-                    $userId = data_get($data, 'metadata.user_id');
-                    if (! $teamId || ! $userId) {
-                        $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                        if ($subscription) {
-                            return response("Subscription already exists for customer: {$customerId}", 200);
-                        }
-
-                        return response('No team id or user id found', 400);
-                    }
-                    $team = Team::find($teamId);
-                    $found = $team->members->where('id', $userId)->first();
-                    if (! $found->isAdmin()) {
-                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
-
-                        return response("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.", 400);
-                    }
-                    $subscription = Subscription::where('team_id', $teamId)->first();
-                    if ($subscription) {
-                        return response("Subscription already exists for team: {$teamId}", 200);
-                    } else {
-                        Subscription::create([
-                            'team_id' => $teamId,
-                            'stripe_subscription_id' => $subscriptionId,
-                            'stripe_customer_id' => $customerId,
-                            'stripe_invoice_paid' => false,
-                        ]);
-
-                        return response('Subscription created');
-                    }
-                case 'customer.subscription.updated':
-                    $teamId = data_get($data, 'metadata.team_id');
-                    $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');
-                    if (Str::contains($excludedPlans, $planId)) {
-                        // send_internal_notification('Subscription excluded.');
-                        break;
-                    }
-                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                    if (! $subscription) {
-                        if ($status === 'incomplete_expired') {
-                            return response('Subscription incomplete expired', 200);
-                        }
-                        if ($teamId) {
-                            $subscription = Subscription::create([
-                                'team_id' => $teamId,
-                                'stripe_subscription_id' => $subscriptionId,
-                                'stripe_customer_id' => $customerId,
-                                'stripe_invoice_paid' => false,
-                            ]);
-                        } else {
-                            return response('No subscription and team id found', 400);
-                        }
-                    }
-                    $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
-                    $feedback = data_get($data, 'cancellation_details.feedback');
-                    $comment = data_get($data, 'cancellation_details.comment');
-                    $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
-                    if (str($lookup_key)->contains('dynamic')) {
-                        $quantity = data_get($data, 'items.data.0.quantity', 2);
-                        $team = data_get($subscription, 'team');
-                        if ($team) {
-                            $team->update([
-                                'custom_server_limit' => $quantity,
-                            ]);
-                        }
-                        ServerLimitCheckJob::dispatch($team);
-                    }
-                    $subscription->update([
-                        'stripe_feedback' => $feedback,
-                        'stripe_comment' => $comment,
-                        'stripe_plan_id' => $planId,
-                        'stripe_cancel_at_period_end' => $cancelAtPeriodEnd,
-                    ]);
-                    if ($status === 'paused' || $status === 'incomplete_expired') {
-                        $subscription->update([
-                            'stripe_invoice_paid' => false,
-                        ]);
-                    }
-                    if ($feedback) {
-                        $reason = "Cancellation feedback for {$customerId}: '".$feedback."'";
-                        if ($comment) {
-                            $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();
-                    break;
-                default:
-                    // Unhandled event type
-            }
+            return response('Webhook received. Cool cool cool cool cool.', 200);
         } catch (Exception $e) {
-            if ($type !== 'payment_intent.payment_failed') {
-                send_internal_notification("Subscription webhook ($type) failed: ".$e->getMessage());
-            }
-            $webhook->update([
+            $this->webhook->update([
                 'status' => 'failed',
                 'failure_reason' => $e->getMessage(),
             ]);
diff --git a/app/Jobs/SendMessageToTelegramJob.php b/app/Jobs/SendMessageToTelegramJob.php
index 6c581e1d3..85f4fc934 100644
--- a/app/Jobs/SendMessageToTelegramJob.php
+++ b/app/Jobs/SendMessageToTelegramJob.php
@@ -72,7 +72,7 @@ class SendMessageToTelegramJob implements ShouldBeEncrypted, ShouldQueue
         }
         $response = Http::post($url, $payload);
         if ($response->failed()) {
-            throw new \Exception('Telegram notification failed with '.$response->status().' status code.'.$response->body());
+            throw new \RuntimeException('Telegram notification failed with '.$response->status().' status code.'.$response->body());
         }
     }
 }
diff --git a/app/Jobs/StripeProcessJob.php b/app/Jobs/StripeProcessJob.php
new file mode 100644
index 000000000..2a1a5313c
--- /dev/null
+++ b/app/Jobs/StripeProcessJob.php
@@ -0,0 +1,242 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Subscription;
+use App\Models\Team;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Support\Str;
+
+class StripeProcessJob implements ShouldQueue
+{
+    use Queueable;
+
+    public $type;
+
+    public $webhook;
+
+    public $tries = 3;
+
+    public function __construct(public $event)
+    {
+        $this->onQueue('high');
+    }
+
+    public function handle(): void
+    {
+        $excludedPlans = config('subscription.stripe_excluded_plans');
+
+        $type = data_get($this->event, 'type');
+        $this->type = $type;
+        $data = data_get($this->event, 'data.object');
+        switch ($type) {
+            case 'radar.early_fraud_warning.created':
+                $stripe = new \Stripe\StripeClient(config('subscription.stripe_api_key'));
+                $id = data_get($data, 'id');
+                $charge = data_get($data, 'charge');
+                if ($charge) {
+                    $stripe->refunds->create(['charge' => $charge]);
+                }
+                $pi = data_get($data, 'payment_intent');
+                $piData = $stripe->paymentIntents->retrieve($pi, []);
+                $customerId = data_get($piData, 'customer');
+                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                if ($subscription) {
+                    $subscriptionId = data_get($subscription, 'stripe_subscription_id');
+                    $stripe->subscriptions->cancel($subscriptionId, []);
+                    $subscription->update([
+                        'stripe_invoice_paid' => false,
+                    ]);
+                    send_internal_notification("Early fraud warning created Refunded, subscription canceled. Charge: {$charge}, id: {$id}, pi: {$pi}");
+                } else {
+                    send_internal_notification("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}");
+                    throw new \Exception("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}");
+                }
+                break;
+            case 'checkout.session.completed':
+                $clientReferenceId = data_get($data, 'client_reference_id');
+                if (is_null($clientReferenceId)) {
+                    send_internal_notification('Checkout session completed without client reference id.');
+                    break;
+                }
+                $userId = Str::before($clientReferenceId, ':');
+                $teamId = Str::after($clientReferenceId, ':');
+                $subscriptionId = data_get($data, 'subscription');
+                $customerId = data_get($data, 'customer');
+                $team = Team::find($teamId);
+                $found = $team->members->where('id', $userId)->first();
+                if (! $found->isAdmin()) {
+                    send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                    throw new \Exception("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                }
+                $subscription = Subscription::where('team_id', $teamId)->first();
+                if ($subscription) {
+                    send_internal_notification('Old subscription activated for team: '.$teamId);
+                    $subscription->update([
+                        'stripe_subscription_id' => $subscriptionId,
+                        'stripe_customer_id' => $customerId,
+                        'stripe_invoice_paid' => true,
+                    ]);
+                } else {
+                    send_internal_notification('New subscription for team: '.$teamId);
+                    Subscription::create([
+                        'team_id' => $teamId,
+                        'stripe_subscription_id' => $subscriptionId,
+                        'stripe_customer_id' => $customerId,
+                        'stripe_invoice_paid' => true,
+                    ]);
+                }
+                break;
+            case 'invoice.paid':
+                $customerId = data_get($data, 'customer');
+                $planId = data_get($data, 'lines.data.0.plan.id');
+                if (Str::contains($excludedPlans, $planId)) {
+                    send_internal_notification('Subscription excluded.');
+                    break;
+                }
+                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                if ($subscription) {
+                    $subscription->update([
+                        'stripe_invoice_paid' => true,
+                    ]);
+                } else {
+                    throw new \Exception("No subscription found for customer: {$customerId}");
+                }
+                break;
+            case 'invoice.payment_failed':
+                $customerId = data_get($data, 'customer');
+                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                if (! $subscription) {
+                    send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: '.$customerId);
+                    throw new \Exception("No subscription found for customer: {$customerId}");
+                }
+                $team = data_get($subscription, 'team');
+                if (! $team) {
+                    send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: '.$customerId);
+                    throw new \Exception("No team found in Coolify for customer: {$customerId}");
+                }
+                if (! $subscription->stripe_invoice_paid) {
+                    SubscriptionInvoiceFailedJob::dispatch($team);
+                    send_internal_notification('Invoice payment failed: '.$customerId);
+                } else {
+                    send_internal_notification('Invoice payment failed but already paid: '.$customerId);
+                }
+                break;
+            case 'payment_intent.payment_failed':
+                $customerId = data_get($data, 'customer');
+                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                if (! $subscription) {
+                    send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: '.$customerId);
+                    throw new \Exception("No subscription found in Coolify for customer: {$customerId}");
+                }
+                if ($subscription->stripe_invoice_paid) {
+                    send_internal_notification('payment_intent.payment_failed but invoice is active for customer: '.$customerId);
+
+                    return;
+                }
+                send_internal_notification('Subscription payment failed for customer: '.$customerId);
+                break;
+            case 'customer.subscription.created':
+                $customerId = data_get($data, 'customer');
+                $subscriptionId = data_get($data, 'id');
+                $teamId = data_get($data, 'metadata.team_id');
+                $userId = data_get($data, 'metadata.user_id');
+                if (! $teamId || ! $userId) {
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if ($subscription) {
+                        throw new \Exception("Subscription already exists for customer: {$customerId}");
+                    }
+                    throw new \Exception('No team id or user id found');
+                }
+                $team = Team::find($teamId);
+                $found = $team->members->where('id', $userId)->first();
+                if (! $found->isAdmin()) {
+                    send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
+                    throw new \Exception("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
+                }
+                $subscription = Subscription::where('team_id', $teamId)->first();
+                if ($subscription) {
+                    send_internal_notification("Subscription already exists for team: {$teamId}");
+                    throw new \Exception("Subscription already exists for team: {$teamId}");
+                } else {
+                    Subscription::create([
+                        'team_id' => $teamId,
+                        'stripe_subscription_id' => $subscriptionId,
+                        'stripe_customer_id' => $customerId,
+                        'stripe_invoice_paid' => false,
+                    ]);
+                }
+            case 'customer.subscription.updated':
+                $teamId = data_get($data, 'metadata.team_id');
+                $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');
+                if (Str::contains($excludedPlans, $planId)) {
+                    send_internal_notification('Subscription excluded.');
+                    break;
+                }
+                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                if (! $subscription) {
+                    if ($status === 'incomplete_expired') {
+                        send_internal_notification('Subscription incomplete expired');
+                        throw new \Exception('Subscription incomplete expired');
+                    }
+                    if ($teamId) {
+                        $subscription = Subscription::create([
+                            'team_id' => $teamId,
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => false,
+                        ]);
+                    } else {
+                        send_internal_notification('No subscription and team id found');
+                        throw new \Exception('No subscription and team id found');
+                    }
+                }
+                $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
+                $feedback = data_get($data, 'cancellation_details.feedback');
+                $comment = data_get($data, 'cancellation_details.comment');
+                $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
+                if (str($lookup_key)->contains('dynamic')) {
+                    $quantity = data_get($data, 'items.data.0.quantity', 2);
+                    $team = data_get($subscription, 'team');
+                    if ($team) {
+                        $team->update([
+                            'custom_server_limit' => $quantity,
+                        ]);
+                    }
+                    ServerLimitCheckJob::dispatch($team);
+                }
+                $subscription->update([
+                    'stripe_feedback' => $feedback,
+                    'stripe_comment' => $comment,
+                    'stripe_plan_id' => $planId,
+                    'stripe_cancel_at_period_end' => $cancelAtPeriodEnd,
+                ]);
+                if ($status === 'paused' || $status === 'incomplete_expired') {
+                    $subscription->update([
+                        'stripe_invoice_paid' => false,
+                    ]);
+                }
+                if ($feedback) {
+                    $reason = "Cancellation feedback for {$customerId}: '".$feedback."'";
+                    if ($comment) {
+                        $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();
+                break;
+            default:
+                // Unhandled event type
+        }
+    }
+}
diff --git a/app/Livewire/NavbarDeleteTeam.php b/app/Livewire/NavbarDeleteTeam.php
index cc5d78f60..e97cceb0d 100644
--- a/app/Livewire/NavbarDeleteTeam.php
+++ b/app/Livewire/NavbarDeleteTeam.php
@@ -3,7 +3,6 @@
 namespace App\Livewire;
 
 use App\Models\InstanceSettings;
-use Illuminate\Container\Attributes\Auth as AttributesAuth;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
@@ -32,7 +31,7 @@ class NavbarDeleteTeam extends Component
         $currentTeam->delete();
 
         $currentTeam->members->each(function ($user) use ($currentTeam) {
-            if ($user->id === AttributesAuth::id()) {
+            if ($user->id === Auth::id()) {
                 return;
             }
             $user->teams()->detach($currentTeam);
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 5bbd13ac7..e6e2ffbe1 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -988,7 +988,7 @@ $schema://$host {
 
     public function status(): bool
     {
-        ['uptime' => $uptime] = $this->validateConnection(false);
+        ['uptime' => $uptime] = $this->validateConnection();
         if ($uptime === false) {
             foreach ($this->applications() as $application) {
                 $application->status = 'exited';
@@ -1051,9 +1051,9 @@ $schema://$host {
         $this->team->notify(new Unreachable($this));
     }
 
-    public function validateConnection(bool $isManualCheck = true, bool $justCheckingNewKey = false)
+    public function validateConnection(bool $justCheckingNewKey = false)
     {
-        config()->set('constants.ssh.mux_enabled', ! $isManualCheck);
+        config()->set('constants.ssh.mux_enabled', false);
 
         if ($this->skipServer()) {
             return ['uptime' => false, 'error' => 'Server skipped.'];
diff --git a/config/constants.php b/config/constants.php
index dcd49b177..b29adfff3 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.371',
+        'version' => '4.0.0-beta.372',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
diff --git a/config/version.php b/config/version.php
index fcda1b4ac..21119de4a 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.371';
+return '4.0.0-beta.372';
diff --git a/public/svgs/beszel.svg b/public/svgs/beszel.svg
new file mode 100644
index 000000000..c6836479c
--- /dev/null
+++ b/public/svgs/beszel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 285 75"><path d="M146.4 73.1h-30.5V59.8h30.5a3.2 3.2 0 0 0 2.3-1 3.2 3.2 0 0 0 1-2.3q0-.8-.3-1.3a1.5 1.5 0 0 0-.7-.6 4.7 4.7 0 0 0-1-.3l-1.3-.1h-13.9q-3.4 0-6.5-1.3-3-1.3-5.2-3.6a16.9 16.9 0 0 1-3.6-5.3 16.3 16.3 0 0 1-1.3-6.5 16.4 16.4 0 0 1 1.3-6.4q1.3-3.1 3.6-5.4 2.2-2.2 5.2-3.5a16.3 16.3 0 0 1 6.5-1.3h27v13.3h-27a3.2 3.2 0 0 0-2.3 1 3.2 3.2 0 0 0-1 2.3 3.3 3.3 0 0 0 1 2.4 3.3 3.3 0 0 0 1.2.8 3.2 3.2 0 0 0 1.1.2h13.9a18.1 18.1 0 0 1 6 1 17.3 17.3 0 0 1 .4.2q3 1.1 5.3 3.2a15.1 15.1 0 0 1 3.6 4.9 14.7 14.7 0 0 1 1.3 5.4 17.2 17.2 0 0 1 0 .9 16 16 0 0 1-1 5.8 15.4 15.4 0 0 1-.3.7 17.3 17.3 0 0 1-3.6 5.2 16.4 16.4 0 0 1-5.3 3.6 16.2 16.2 0 0 1-6.4 1.3Zm64.5-13.3v13.3h-43.6l22-39h-22V21h43.6l-22 39h22ZM35 73.1H0v-70h35q4.4 0 8.2 1.6a21.4 21.4 0 0 1 6.6 4.6q2.9 2.8 4.5 6.6 1.7 3.8 1.7 8.2a15.4 15.4 0 0 1-.3 3.2 17.6 17.6 0 0 1-.2.8 19.4 19.4 0 0 1-1.5 4 17 17 0 0 1-2.4 3.4 13.5 13.5 0 0 1-2.6 2.3 12.5 12.5 0 0 1-.4.3q1.7 1 3 2.5 1.4 1.6 2.4 3.5a18.3 18.3 0 0 1 1.5 4A17.4 17.4 0 0 1 56 51a15.3 15.3 0 0 1 0 1.1q0 4.3-1.7 8.2a21.4 21.4 0 0 1-4.5 6.6q-2.8 2.9-6.6 4.5-3.8 1.7-8.2 1.7Zm76-43L86 60.4l1.5.3a16.7 16.7 0 0 0 1.6 0q2 0 3.8-.4 1.8-.6 3.4-1.6 1.6-1 2.8-2.4a12.8 12.8 0 0 0 2-3.2l9.8 9.8q-1.9 2.6-4.3 4.7a27 27 0 0 1-5.2 3.6 26.1 26.1 0 0 1-6 2.2 26.8 26.8 0 0 1-6.3.8 26.4 26.4 0 0 1-10.4-2 26.2 26.2 0 0 1-8.5-5.8 26.7 26.7 0 0 1-5.5-8.3 30.4 30.4 0 0 1-.2-.4q-2.1-5-2.1-11.1a31.9 31.9 0 0 1 .7-7 27 27 0 0 1 1.4-4.3 27 27 0 0 1 3.8-6.6 24.5 24.5 0 0 1 2-2.2 26 26 0 0 1 8.4-5.6 27 27 0 0 1 10.4-2 26.3 26.3 0 0 1 6.4.8 26.9 26.9 0 0 1 6 2.2q2.7 1.5 5.2 3.6 2.4 2.1 4.3 4.8Zm152.3 0-25 30.2 1.5.3a16.7 16.7 0 0 0 1.6 0q2 0 3.8-.4 1.8-.6 3.4-1.6 1.5-1 2.8-2.4a12.8 12.8 0 0 0 2-3.2l9.8 9.8q-1.9 2.6-4.3 4.7a27 27 0 0 1-5.2 3.6 26.1 26.1 0 0 1-6 2.2 26.8 26.8 0 0 1-6.3.8 26.4 26.4 0 0 1-10.4-2 26.2 26.2 0 0 1-8.5-5.8A26.7 26.7 0 0 1 217 58a30.4 30.4 0 0 1-.2-.4q-2.1-5-2.1-11.1a31.9 31.9 0 0 1 .7-7 27 27 0 0 1 1.4-4.3 27 27 0 0 1 3.8-6.6 24.5 24.5 0 0 1 2-2.2 26 26 0 0 1 8.4-5.6 27 27 0 0 1 10.4-2 26.3 26.3 0 0 1 6.4.8 26.9 26.9 0 0 1 6 2.2q2.7 1.5 5.2 3.6 2.4 2.1 4.3 4.8ZM283.4 0v73.1H270V0h13.4ZM14 17v14.1h21a7 7 0 0 0 2.3-.4 6.6 6.6 0 0 0 .4-.1Q39 30 40 29a6.9 6.9 0 0 0 1.5-2.3q.5-1.3.5-2.7a7 7 0 0 0-.4-2.3 6.6 6.6 0 0 0-.1-.5q-.6-1.2-1.5-2.2a7 7 0 0 0-2.3-1.5 6.9 6.9 0 0 0-2.5-.5 7.9 7.9 0 0 0-.2 0H14Zm0 28.1v14h21a7 7 0 0 0 2.3-.4 6.6 6.6 0 0 0 .4-.2Q39 58 40 57.1a7 7 0 0 0 1.5-2.3 6.9 6.9 0 0 0 .5-2.5 7.9 7.9 0 0 0 0-.2 7 7 0 0 0-.4-2.3 6.6 6.6 0 0 0-.1-.4Q40.9 48 40 47a7 7 0 0 0-2.3-1.4 6.9 6.9 0 0 0-2.5-.6 7.9 7.9 0 0 0-.2 0H14Zm63.3 8.3 15.5-20.6a8 8 0 0 0-1.4-.4 7 7 0 0 0-.4 0 17.2 17.2 0 0 0-1.6-.1 19.2 19.2 0 0 0-.3 0 13.3 13.3 0 0 0-5.1 1q-2.5 1-4.2 2.8a13.1 13.1 0 0 0-2.5 3.6 15.5 15.5 0 0 0-.3.9 14.7 14.7 0 0 0-1 3.5 18.7 18.7 0 0 0 0 2.4 17.6 17.6 0 0 0 0 .7v.8a29.4 29.4 0 0 0 0 .1 19.2 19.2 0 0 0 .2 2 20.2 20.2 0 0 0 .4 1.6 18.6 18.6 0 0 0 0 .2 7.5 7.5 0 0 0 .4.9 6 6 0 0 0 .3.6Zm152.3 0L245 32.8a8 8 0 0 0-1.4-.4 7 7 0 0 0-.4 0 17.2 17.2 0 0 0-1.6-.1 19.2 19.2 0 0 0-.3 0 13.3 13.3 0 0 0-5.1 1q-2.5 1-4.2 2.8a13.1 13.1 0 0 0-2.5 3.6 15.5 15.5 0 0 0-.4.9 14.7 14.7 0 0 0-.8 3.5 18.7 18.7 0 0 0-.2 2.4 17.6 17.6 0 0 0 0 .7v.8a29.4 29.4 0 0 0 .1.1 19.2 19.2 0 0 0 .2 2 20.2 20.2 0 0 0 .4 1.6 18.6 18.6 0 0 0 0 .2 7.5 7.5 0 0 0 .4.9 6 6 0 0 0 .3.6Z"></path></svg>
diff --git a/resources/views/components/resources/breadcrumbs.blade.php b/resources/views/components/resources/breadcrumbs.blade.php
index f9733f63a..f91e04037 100644
--- a/resources/views/components/resources/breadcrumbs.blade.php
+++ b/resources/views/components/resources/breadcrumbs.blade.php
@@ -8,7 +8,7 @@
         <li class="inline-flex items-center">
             <div class="flex items-center">
                 <a class="text-xs truncate lg:text-sm"
-                    href="{{ route('project.show', ['project_uuid' => $this->parameters['project_uuid']]) }}">
+                    href="{{ route('project.show', ['project_uuid' => data_get($resource, 'environment.project.uuid')]) }}">
                     {{ data_get($resource, 'environment.project.name', 'Undefined Name') }}</a>
                 <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
                     viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
@@ -21,7 +21,7 @@
         <li>
             <div class="flex items-center">
                 <a class="text-xs truncate lg:text-sm"
-                    href="{{ route('project.resource.index', ['environment_name' => $this->parameters['environment_name'], 'project_uuid' => $this->parameters['project_uuid']]) }}">{{ $this->parameters['environment_name'] }}</a>
+                    href="{{ route('project.resource.index', ['environment_name' => data_get($resource, 'environment.name'), 'project_uuid' => data_get($resource, 'environment.project.uuid')]) }}">{{ data_get($resource, 'environment.name') }}</a>
                 <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
                     viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd"
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 8c5017e03..57f1807c8 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -34,11 +34,13 @@
     </style>
     @if (config('app.name') == 'Coolify Cloud')
         <script defer data-domain="app.coolify.io" src="https://analytics.coollabs.io/js/plausible.js"></script>
+        <script src="https://js.sentry-cdn.com/0f8593910512b5cdd48c6da78d4093be.min.js" crossorigin="anonymous"></script>
     @endif
     @auth
         <script type="text/javascript" src="{{ URL::asset('js/echo.js') }}"></script>
         <script type="text/javascript" src="{{ URL::asset('js/pusher.js') }}"></script>
         <script type="text/javascript" src="{{ URL::asset('js/apexcharts.js') }}"></script>
+
     @endauth
 </head>
 @section('body')
diff --git a/templates/compose/beszel.yaml b/templates/compose/beszel.yaml
new file mode 100644
index 000000000..b40d1f10e
--- /dev/null
+++ b/templates/compose/beszel.yaml
@@ -0,0 +1,24 @@
+# documentation: https://github.com/henrygd/beszel?tab=readme-ov-file#getting-started
+# slogan: A lightweight server resource monitoring hub with historical data, docker stats, and alerts.
+# tags: beszel,monitoring,server,stats,alerts
+# logo: svgs/beszel.svg
+# port: 8090
+
+# When adding a System in the UI, the Host/IP must be beszel-agent (or the container name, ex: beszel-agent-pswog4s8wks4o8osw44cw0k8)
+# Add the public Key in "Key" env variable below
+services:
+  beszel:
+    image: henrygd/beszel:latest
+    environment:
+      - SERVICE_FQDN_BESZEL_8090
+    volumes:
+      - "beszel-data:/beszel_data"
+
+  beszel-agent:
+    image: henrygd/beszel-agent
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+    environment:
+      PORT: 45876
+      # Public Key from "Add a new system" in the UI and restart the agent
+      # KEY: ""
diff --git a/versions.json b/versions.json
index 7bffcd1ff..20b06b4de 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.371"
+            "version": "4.0.0-beta.372"
         },
         "nightly": {
-            "version": "4.0.0-beta.372"
+            "version": "4.0.0-beta.373"
         },
         "helper": {
             "version": "1.0.4"