From 8f2800a9e5196d96c75536ec88568883f8c25b42 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Thu, 26 Feb 2026 18:22:03 +0100
Subject: [PATCH 1/3] chore: prepare for PR

---
 .../Stripe/CancelSubscriptionAtPeriodEnd.php  |  60 ++++
 app/Actions/Stripe/RefundSubscription.php     | 141 +++++++++
 app/Actions/Stripe/ResumeSubscription.php     |  56 ++++
 app/Livewire/Subscription/Actions.php         | 138 ++++++++-
 app/Models/Subscription.php                   |   7 +
 ...ipe_refunded_at_to_subscriptions_table.php |  25 ++
 .../components/modal-confirmation.blade.php   |  31 +-
 resources/views/livewire/dashboard.blade.php  |   6 -
 .../views/livewire/layout-popups.blade.php    |  27 ++
 .../livewire/subscription/actions.blade.php   | 185 +++++++++---
 .../livewire/subscription/index.blade.php     |  53 ++--
 .../subscription/pricing-plans.blade.php      | 271 ++++++++----------
 .../livewire/subscription/show.blade.php      |   2 +-
 .../CancelSubscriptionActionsTest.php         |  96 +++++++
 .../Subscription/RefundSubscriptionTest.php   | 271 ++++++++++++++++++
 .../Subscription/ResumeSubscriptionTest.php   |  85 ++++++
 16 files changed, 1212 insertions(+), 242 deletions(-)
 create mode 100644 app/Actions/Stripe/CancelSubscriptionAtPeriodEnd.php
 create mode 100644 app/Actions/Stripe/RefundSubscription.php
 create mode 100644 app/Actions/Stripe/ResumeSubscription.php
 create mode 100644 database/migrations/2026_02_26_163035_add_stripe_refunded_at_to_subscriptions_table.php
 create mode 100644 tests/Feature/Subscription/CancelSubscriptionActionsTest.php
 create mode 100644 tests/Feature/Subscription/RefundSubscriptionTest.php
 create mode 100644 tests/Feature/Subscription/ResumeSubscriptionTest.php

diff --git a/app/Actions/Stripe/CancelSubscriptionAtPeriodEnd.php b/app/Actions/Stripe/CancelSubscriptionAtPeriodEnd.php
new file mode 100644
index 000000000..34c7d194a
--- /dev/null
+++ b/app/Actions/Stripe/CancelSubscriptionAtPeriodEnd.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Actions\Stripe;
+
+use App\Models\Team;
+use Stripe\StripeClient;
+
+class CancelSubscriptionAtPeriodEnd
+{
+    private StripeClient $stripe;
+
+    public function __construct(?StripeClient $stripe = null)
+    {
+        $this->stripe = $stripe ?? new StripeClient(config('subscription.stripe_api_key'));
+    }
+
+    /**
+     * Cancel the team's subscription at the end of the current billing period.
+     *
+     * @return array{success: bool, error: string|null}
+     */
+    public function execute(Team $team): array
+    {
+        $subscription = $team->subscription;
+
+        if (! $subscription?->stripe_subscription_id) {
+            return ['success' => false, 'error' => 'No active subscription found.'];
+        }
+
+        if (! $subscription->stripe_invoice_paid) {
+            return ['success' => false, 'error' => 'Subscription is not active.'];
+        }
+
+        if ($subscription->stripe_cancel_at_period_end) {
+            return ['success' => false, 'error' => 'Subscription is already set to cancel at the end of the billing period.'];
+        }
+
+        try {
+            $this->stripe->subscriptions->update($subscription->stripe_subscription_id, [
+                'cancel_at_period_end' => true,
+            ]);
+
+            $subscription->update([
+                'stripe_cancel_at_period_end' => true,
+            ]);
+
+            \Log::info("Subscription {$subscription->stripe_subscription_id} set to cancel at period end for team {$team->name}");
+
+            return ['success' => true, 'error' => null];
+        } catch (\Stripe\Exception\InvalidRequestException $e) {
+            \Log::error("Stripe cancel at period end error for team {$team->id}: ".$e->getMessage());
+
+            return ['success' => false, 'error' => 'Stripe error: '.$e->getMessage()];
+        } catch (\Exception $e) {
+            \Log::error("Cancel at period end error for team {$team->id}: ".$e->getMessage());
+
+            return ['success' => false, 'error' => 'An unexpected error occurred. Please contact support.'];
+        }
+    }
+}
diff --git a/app/Actions/Stripe/RefundSubscription.php b/app/Actions/Stripe/RefundSubscription.php
new file mode 100644
index 000000000..021cba13e
--- /dev/null
+++ b/app/Actions/Stripe/RefundSubscription.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace App\Actions\Stripe;
+
+use App\Models\Team;
+use Stripe\StripeClient;
+
+class RefundSubscription
+{
+    private StripeClient $stripe;
+
+    private const REFUND_WINDOW_DAYS = 30;
+
+    public function __construct(?StripeClient $stripe = null)
+    {
+        $this->stripe = $stripe ?? new StripeClient(config('subscription.stripe_api_key'));
+    }
+
+    /**
+     * Check if the team's subscription is eligible for a refund.
+     *
+     * @return array{eligible: bool, days_remaining: int, reason: string}
+     */
+    public function checkEligibility(Team $team): array
+    {
+        $subscription = $team->subscription;
+
+        if ($subscription?->stripe_refunded_at) {
+            return $this->ineligible('A refund has already been processed for this team.');
+        }
+
+        if (! $subscription?->stripe_subscription_id) {
+            return $this->ineligible('No active subscription found.');
+        }
+
+        if (! $subscription->stripe_invoice_paid) {
+            return $this->ineligible('Subscription invoice is not paid.');
+        }
+
+        try {
+            $stripeSubscription = $this->stripe->subscriptions->retrieve($subscription->stripe_subscription_id);
+        } catch (\Stripe\Exception\InvalidRequestException $e) {
+            return $this->ineligible('Subscription not found in Stripe.');
+        }
+
+        if (! in_array($stripeSubscription->status, ['active', 'trialing'])) {
+            return $this->ineligible("Subscription status is '{$stripeSubscription->status}'.");
+        }
+
+        $startDate = \Carbon\Carbon::createFromTimestamp($stripeSubscription->start_date);
+        $daysSinceStart = (int) $startDate->diffInDays(now());
+        $daysRemaining = self::REFUND_WINDOW_DAYS - $daysSinceStart;
+
+        if ($daysRemaining <= 0) {
+            return $this->ineligible('The 30-day refund window has expired.');
+        }
+
+        return [
+            'eligible' => true,
+            'days_remaining' => $daysRemaining,
+            'reason' => 'Eligible for refund.',
+        ];
+    }
+
+    /**
+     * Process a full refund and cancel the subscription.
+     *
+     * @return array{success: bool, error: string|null}
+     */
+    public function execute(Team $team): array
+    {
+        $eligibility = $this->checkEligibility($team);
+
+        if (! $eligibility['eligible']) {
+            return ['success' => false, 'error' => $eligibility['reason']];
+        }
+
+        $subscription = $team->subscription;
+
+        try {
+            $invoices = $this->stripe->invoices->all([
+                'subscription' => $subscription->stripe_subscription_id,
+                'status' => 'paid',
+                'limit' => 1,
+            ]);
+
+            if (empty($invoices->data)) {
+                return ['success' => false, 'error' => 'No paid invoice found to refund.'];
+            }
+
+            $invoice = $invoices->data[0];
+            $paymentIntentId = $invoice->payment_intent;
+
+            if (! $paymentIntentId) {
+                return ['success' => false, 'error' => 'No payment intent found on the invoice.'];
+            }
+
+            $this->stripe->refunds->create([
+                'payment_intent' => $paymentIntentId,
+            ]);
+
+            $this->stripe->subscriptions->cancel($subscription->stripe_subscription_id);
+
+            $subscription->update([
+                'stripe_cancel_at_period_end' => false,
+                'stripe_invoice_paid' => false,
+                'stripe_trial_already_ended' => false,
+                'stripe_past_due' => false,
+                'stripe_feedback' => 'Refund requested by user',
+                'stripe_comment' => 'Full refund processed within 30-day window at '.now()->toDateTimeString(),
+                'stripe_refunded_at' => now(),
+            ]);
+
+            $team->subscriptionEnded();
+
+            \Log::info("Refunded and cancelled subscription {$subscription->stripe_subscription_id} for team {$team->name}");
+
+            return ['success' => true, 'error' => null];
+        } catch (\Stripe\Exception\InvalidRequestException $e) {
+            \Log::error("Stripe refund error for team {$team->id}: ".$e->getMessage());
+
+            return ['success' => false, 'error' => 'Stripe error: '.$e->getMessage()];
+        } catch (\Exception $e) {
+            \Log::error("Refund error for team {$team->id}: ".$e->getMessage());
+
+            return ['success' => false, 'error' => 'An unexpected error occurred. Please contact support.'];
+        }
+    }
+
+    /**
+     * @return array{eligible: bool, days_remaining: int, reason: string}
+     */
+    private function ineligible(string $reason): array
+    {
+        return [
+            'eligible' => false,
+            'days_remaining' => 0,
+            'reason' => $reason,
+        ];
+    }
+}
diff --git a/app/Actions/Stripe/ResumeSubscription.php b/app/Actions/Stripe/ResumeSubscription.php
new file mode 100644
index 000000000..d8019def7
--- /dev/null
+++ b/app/Actions/Stripe/ResumeSubscription.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Actions\Stripe;
+
+use App\Models\Team;
+use Stripe\StripeClient;
+
+class ResumeSubscription
+{
+    private StripeClient $stripe;
+
+    public function __construct(?StripeClient $stripe = null)
+    {
+        $this->stripe = $stripe ?? new StripeClient(config('subscription.stripe_api_key'));
+    }
+
+    /**
+     * Resume a subscription that was set to cancel at the end of the billing period.
+     *
+     * @return array{success: bool, error: string|null}
+     */
+    public function execute(Team $team): array
+    {
+        $subscription = $team->subscription;
+
+        if (! $subscription?->stripe_subscription_id) {
+            return ['success' => false, 'error' => 'No active subscription found.'];
+        }
+
+        if (! $subscription->stripe_cancel_at_period_end) {
+            return ['success' => false, 'error' => 'Subscription is not set to cancel.'];
+        }
+
+        try {
+            $this->stripe->subscriptions->update($subscription->stripe_subscription_id, [
+                'cancel_at_period_end' => false,
+            ]);
+
+            $subscription->update([
+                'stripe_cancel_at_period_end' => false,
+            ]);
+
+            \Log::info("Subscription {$subscription->stripe_subscription_id} resumed for team {$team->name}");
+
+            return ['success' => true, 'error' => null];
+        } catch (\Stripe\Exception\InvalidRequestException $e) {
+            \Log::error("Stripe resume subscription error for team {$team->id}: ".$e->getMessage());
+
+            return ['success' => false, 'error' => 'Stripe error: '.$e->getMessage()];
+        } catch (\Exception $e) {
+            \Log::error("Resume subscription error for team {$team->id}: ".$e->getMessage());
+
+            return ['success' => false, 'error' => 'An unexpected error occurred. Please contact support.'];
+        }
+    }
+}
diff --git a/app/Livewire/Subscription/Actions.php b/app/Livewire/Subscription/Actions.php
index 1388d3244..4ac95adfb 100644
--- a/app/Livewire/Subscription/Actions.php
+++ b/app/Livewire/Subscription/Actions.php
@@ -2,21 +2,155 @@
 
 namespace App\Livewire\Subscription;
 
+use App\Actions\Stripe\CancelSubscriptionAtPeriodEnd;
+use App\Actions\Stripe\RefundSubscription;
+use App\Actions\Stripe\ResumeSubscription;
 use App\Models\Team;
+use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
+use Stripe\StripeClient;
 
 class Actions extends Component
 {
     public $server_limits = 0;
 
-    public function mount()
+    public bool $isRefundEligible = false;
+
+    public int $refundDaysRemaining = 0;
+
+    public bool $refundCheckLoading = true;
+
+    public bool $refundAlreadyUsed = false;
+
+    public function mount(): void
     {
         $this->server_limits = Team::serverLimit();
     }
 
-    public function stripeCustomerPortal()
+    public function loadRefundEligibility(): void
+    {
+        $this->checkRefundEligibility();
+        $this->refundCheckLoading = false;
+    }
+
+    public function stripeCustomerPortal(): void
     {
         $session = getStripeCustomerPortalSession(currentTeam());
         redirect($session->url);
     }
+
+    public function refundSubscription(string $password): bool|string
+    {
+        if (! shouldSkipPasswordConfirmation() && ! Hash::check($password, auth()->user()->password)) {
+            return 'Invalid password.';
+        }
+
+        $result = (new RefundSubscription)->execute(currentTeam());
+
+        if ($result['success']) {
+            $this->dispatch('success', 'Subscription refunded successfully.');
+            $this->redirect(route('subscription.index'), navigate: true);
+
+            return true;
+        }
+
+        $this->dispatch('error', 'Something went wrong with the refund. Please <a href="'.config('constants.urls.contact').'" target="_blank" class="underline">contact us</a>.');
+
+        return true;
+    }
+
+    public function cancelImmediately(string $password): bool|string
+    {
+        if (! shouldSkipPasswordConfirmation() && ! Hash::check($password, auth()->user()->password)) {
+            return 'Invalid password.';
+        }
+
+        $team = currentTeam();
+        $subscription = $team->subscription;
+
+        if (! $subscription?->stripe_subscription_id) {
+            $this->dispatch('error', 'Something went wrong with the cancellation. Please <a href="'.config('constants.urls.contact').'" target="_blank" class="underline">contact us</a>.');
+
+            return true;
+        }
+
+        try {
+            $stripe = new StripeClient(config('subscription.stripe_api_key'));
+            $stripe->subscriptions->cancel($subscription->stripe_subscription_id);
+
+            $subscription->update([
+                'stripe_cancel_at_period_end' => false,
+                'stripe_invoice_paid' => false,
+                'stripe_trial_already_ended' => false,
+                'stripe_past_due' => false,
+                'stripe_feedback' => 'Cancelled immediately by user',
+                'stripe_comment' => 'Subscription cancelled immediately by user at '.now()->toDateTimeString(),
+            ]);
+
+            $team->subscriptionEnded();
+
+            \Log::info("Subscription {$subscription->stripe_subscription_id} cancelled immediately for team {$team->name}");
+
+            $this->dispatch('success', 'Subscription cancelled successfully.');
+            $this->redirect(route('subscription.index'), navigate: true);
+
+            return true;
+        } catch (\Exception $e) {
+            \Log::error("Immediate cancellation error for team {$team->id}: ".$e->getMessage());
+
+            $this->dispatch('error', 'Something went wrong with the cancellation. Please <a href="'.config('constants.urls.contact').'" target="_blank" class="underline">contact us</a>.');
+
+            return true;
+        }
+    }
+
+    public function cancelAtPeriodEnd(string $password): bool|string
+    {
+        if (! shouldSkipPasswordConfirmation() && ! Hash::check($password, auth()->user()->password)) {
+            return 'Invalid password.';
+        }
+
+        $result = (new CancelSubscriptionAtPeriodEnd)->execute(currentTeam());
+
+        if ($result['success']) {
+            $this->dispatch('success', 'Subscription will be cancelled at the end of the billing period.');
+
+            return true;
+        }
+
+        $this->dispatch('error', 'Something went wrong with the cancellation. Please <a href="'.config('constants.urls.contact').'" target="_blank" class="underline">contact us</a>.');
+
+        return true;
+    }
+
+    public function resumeSubscription(): bool
+    {
+        $result = (new ResumeSubscription)->execute(currentTeam());
+
+        if ($result['success']) {
+            $this->dispatch('success', 'Subscription resumed successfully.');
+
+            return true;
+        }
+
+        $this->dispatch('error', 'Something went wrong resuming the subscription. Please <a href="'.config('constants.urls.contact').'" target="_blank" class="underline">contact us</a>.');
+
+        return true;
+    }
+
+    private function checkRefundEligibility(): void
+    {
+        if (! isCloud() || ! currentTeam()->subscription?->stripe_subscription_id) {
+            return;
+        }
+
+        try {
+            $this->refundAlreadyUsed = currentTeam()->subscription?->stripe_refunded_at !== null;
+            $result = (new RefundSubscription)->checkEligibility(currentTeam());
+            $this->isRefundEligible = $result['eligible'];
+            $this->refundDaysRemaining = $result['days_remaining'];
+        } catch (\Exception $e) {
+            \Log::warning('Refund eligibility check failed: '.$e->getMessage());
+        }
+    }
 }
diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index 1bd84a664..00f85ced5 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -8,6 +8,13 @@ class Subscription extends Model
 {
     protected $guarded = [];
 
+    protected function casts(): array
+    {
+        return [
+            'stripe_refunded_at' => 'datetime',
+        ];
+    }
+
     public function team()
     {
         return $this->belongsTo(Team::class);
diff --git a/database/migrations/2026_02_26_163035_add_stripe_refunded_at_to_subscriptions_table.php b/database/migrations/2026_02_26_163035_add_stripe_refunded_at_to_subscriptions_table.php
new file mode 100644
index 000000000..76420fb5c
--- /dev/null
+++ b/database/migrations/2026_02_26_163035_add_stripe_refunded_at_to_subscriptions_table.php
@@ -0,0 +1,25 @@
+<?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('subscriptions', function (Blueprint $table) {
+            $table->timestamp('stripe_refunded_at')->nullable()->after('stripe_past_due');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('subscriptions', function (Blueprint $table) {
+            $table->dropColumn('stripe_refunded_at');
+        });
+    }
+};
diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index 73939092e..b14888040 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -59,6 +59,7 @@
     confirmWithPassword: @js($confirmWithPassword && !$skipPasswordConfirmation),
     submitAction: @js($submitAction),
     dispatchAction: @js($dispatchAction),
+    submitting: false,
     passwordError: '',
     selectedActions: @js(collect($checkboxes)->pluck('id')->filter(fn($id) => $this->$id)->values()->all()),
     dispatchEvent: @js($dispatchEvent),
@@ -70,6 +71,7 @@
         this.step = this.initialStep;
         this.deleteText = '';
         this.password = '';
+        this.submitting = false;
         this.userConfirmationText = '';
         this.selectedActions = @js(collect($checkboxes)->pluck('id')->filter(fn($id) => $this->$id)->values()->all());
         $wire.$refresh();
@@ -320,8 +322,8 @@ class="w-24 dark:bg-coolgray-200 dark:hover:bg-coolgray-300">
                                 </x-forms.button>
                             @endif
                             <x-forms.button
-                                x-bind:disabled="!disableTwoStepConfirmation && confirmWithText && userConfirmationText !==
-                                    confirmationText"
+                                x-bind:disabled="submitting || (!disableTwoStepConfirmation && confirmWithText && userConfirmationText !==
+                                    confirmationText)"
                                 class="w-auto" isError
                                 @click="
                                     if (dispatchEvent) {
@@ -330,12 +332,18 @@ class="w-auto" isError
                                     if (confirmWithPassword && !skipPasswordConfirmation) {
                                         step++;
                                     } else {
-                                        modalOpen = false;
-                                        resetModal();
-                                        submitForm();
+                                        submitting = true;
+                                        submitForm().then((result) => {
+                                            submitting = false;
+                                            modalOpen = false;
+                                            resetModal();
+                                        }).catch(() => {
+                                            submitting = false;
+                                        });
                                     }
                                 ">
-                                <span x-text="step2ButtonText"></span>
+                                <span x-show="!submitting" x-text="step2ButtonText"></span>
+                                <x-loading x-show="submitting" text="Processing..." />
                             </x-forms.button>
                         </div>
                     </div>
@@ -373,22 +381,27 @@ class="block text-sm font-medium text-gray-700 dark:text-gray-300">
                                     class="w-24 dark:bg-coolgray-200 dark:hover:bg-coolgray-300">
                                     Back
                                 </x-forms.button>
-                                <x-forms.button x-bind:disabled="!password" class="w-auto" isError
+                                <x-forms.button x-bind:disabled="!password || submitting" class="w-auto" isError
                                     @click="
                                     if (dispatchEvent) {
                                         $wire.dispatch(dispatchEventType, dispatchEventMessage);
                                     }
+                                    submitting = true;
                                     submitForm().then((result) => {
+                                        submitting = false;
                                         if (result === true) {
                                             modalOpen = false;
                                             resetModal();
                                         } else {
                                             passwordError = result;
-                                            password = ''; // Clear the password field
+                                            password = '';
                                         }
+                                    }).catch(() => {
+                                        submitting = false;
                                     });
                                     ">
-                                    <span x-text="step3ButtonText"></span>
+                                    <span x-show="!submitting" x-text="step3ButtonText"></span>
+                                    <x-loading x-show="submitting" text="Processing..." />
                                 </x-forms.button>
                             </div>
                         </div>
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index a58ca0a00..908c4a98a 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -7,12 +7,6 @@
     @endif
     <h1>Dashboard</h1>
     <div class="subtitle">Your self-hosted infrastructure.</div>
-    @if (request()->query->get('success'))
-        <div class=" mb-10 font-bold alert alert-success">
-            Your subscription has been activated! Welcome onboard! It could take a few seconds before your
-            subscription is activated.<br> Please be patient.
-        </div>
-    @endif
 
     <section class="-mt-2">
         <div class="flex items-center gap-2 pb-2">
diff --git a/resources/views/livewire/layout-popups.blade.php b/resources/views/livewire/layout-popups.blade.php
index 51ca80fde..1aa533c03 100644
--- a/resources/views/livewire/layout-popups.blade.php
+++ b/resources/views/livewire/layout-popups.blade.php
@@ -132,6 +132,33 @@ class="font-bold dark:text-white">Stripe</a></x-forms.button>
             </x-popup>
         </span>
     @endif
+    @if (request()->query->get('cancelled'))
+        <x-banner>
+            <div class="flex items-center gap-2">
+                <svg class="w-5 h-5 text-red-500 shrink-0" fill="currentColor" viewBox="0 0 20 20">
+                    <path fill-rule="evenodd"
+                        d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
+                        clip-rule="evenodd" />
+                </svg>
+                <span><span class="font-bold text-red-500">Subscription Error.</span> Something went wrong. Please try
+                    again or <a class="underline dark:text-white"
+                        href="{{ config('constants.urls.contact') }}" target="_blank">contact support</a>.</span>
+            </div>
+        </x-banner>
+    @endif
+    @if (request()->query->get('success'))
+        <x-banner>
+            <div class="flex items-center gap-2">
+                <svg class="w-5 h-5 text-green-500 shrink-0" fill="currentColor" viewBox="0 0 20 20">
+                    <path fill-rule="evenodd"
+                        d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
+                        clip-rule="evenodd" />
+                </svg>
+                <span><span class="font-bold text-green-500">Welcome onboard!</span> Your subscription has been
+                    activated. It could take a few seconds before it's fully active.</span>
+            </div>
+        </x-banner>
+    @endif
     @if (currentTeam()->subscriptionPastOverDue())
         <x-banner :closable=false>
             <div><span class="font-bold text-red-500">WARNING:</span> Your subscription is in over-due. If your
diff --git a/resources/views/livewire/subscription/actions.blade.php b/resources/views/livewire/subscription/actions.blade.php
index 516a57dd3..2f33d4f70 100644
--- a/resources/views/livewire/subscription/actions.blade.php
+++ b/resources/views/livewire/subscription/actions.blade.php
@@ -1,53 +1,154 @@
-<div>
+<div wire:init="loadRefundEligibility">
     @if (subscriptionProvider() === 'stripe')
-        <div class="pt-4">
-            <h2>Your current plan</h2>
-            <div class="pb-4">Tier: <strong class="dark:text-warning">
-                    @if (data_get(currentTeam(), 'subscription')->type() == 'dynamic')
-                        Pay-as-you-go
-                    @else
-                        {{ data_get(currentTeam(), 'subscription')->type() }}
-                    @endif
+        {{-- Plan Overview --}}
+        <section class="-mt-2">
+            <h3 class="pb-2">Plan Overview</h3>
+            <div class="grid grid-cols-1 gap-4 xl:grid-cols-3">
+                {{-- Current Plan Card --}}
+                <div class="p-5 rounded border dark:bg-coolgray-100 bg-white border-neutral-200 dark:border-coolgray-400">
+                    <div class="text-xs font-bold text-neutral-500 uppercase tracking-wide pb-1">Current Plan</div>
+                    <div class="text-xl font-bold dark:text-warning">
+                        @if (data_get(currentTeam(), 'subscription')->type() == 'dynamic')
+                            Pay-as-you-go
+                        @else
+                            {{ data_get(currentTeam(), 'subscription')->type() }}
+                        @endif
+                    </div>
+                    <div class="pt-2 text-sm">
+                        @if (currentTeam()->subscription->stripe_cancel_at_period_end)
+                            <span class="text-red-500 font-medium">Cancelling at end of period</span>
+                        @else
+                            <span class="text-green-500 font-medium">Active</span>
+                            <span class="text-neutral-500"> &middot; Invoice
+                                {{ currentTeam()->subscription->stripe_invoice_paid ? 'paid' : 'not paid' }}</span>
+                        @endif
+                    </div>
+                </div>
 
-                </strong></div>
+                {{-- Server Limit Card --}}
+                <div class="p-5 rounded border dark:bg-coolgray-100 bg-white border-neutral-200 dark:border-coolgray-400">
+                    <div class="text-xs font-bold text-neutral-500 uppercase tracking-wide pb-1">Paid Servers</div>
+                    <div class="text-xl font-bold dark:text-white">{{ $server_limits }}</div>
+                    <div class="pt-2 text-sm text-neutral-500">Included in your plan</div>
+                </div>
 
-            @if (currentTeam()->subscription->stripe_cancel_at_period_end)
-                <div class="pb-2">Subscription is active but on cancel period.</div>
-            @else
-                <div class="pb-2">Subscription is active. Last invoice is
-                    {{ currentTeam()->subscription->stripe_invoice_paid ? 'paid' : 'not paid' }}.</div>
-            @endif
-            <div class="flex items-center gap-2">
-                <div class="w-48">Number of paid servers:</div>
-                <div class="text-xl font-bold dark:text-white">{{ $server_limits }}</div>
-            </div>
-            <div class="flex items-center gap-2">
-                <div class="w-48">Currently active servers:</div>
-                <div class="text-xl font-bold dark:text-white">{{ currentTeam()->servers->count() }}</div>
+                {{-- Active Servers Card --}}
+                <div
+                    class="p-5 rounded border dark:bg-coolgray-100 bg-white border-neutral-200 dark:border-coolgray-400 {{ currentTeam()->serverOverflow() ? 'border-red-500 dark:border-red-500' : '' }}">
+                    <div class="text-xs font-bold text-neutral-500 uppercase tracking-wide pb-1">Active Servers</div>
+                    <div class="text-xl font-bold {{ currentTeam()->serverOverflow() ? 'text-red-500' : 'dark:text-white' }}">
+                        {{ currentTeam()->servers->count() }}
+                    </div>
+                    <div class="pt-2 text-sm text-neutral-500">Currently running</div>
+                </div>
             </div>
+
             @if (currentTeam()->serverOverflow())
-                <x-callout type="danger" title="WARNING" class="my-4">
-                    You must delete {{ currentTeam()->servers->count() - $server_limits }} servers,
-                    or upgrade your subscription. {{ currentTeam()->servers->count() - $server_limits }} servers will be
-                    deactivated.
+                <x-callout type="danger" title="Server limit exceeded" class="mt-4">
+                    You must delete {{ currentTeam()->servers->count() - $server_limits }} servers or upgrade your
+                    subscription. Excess servers will be deactivated.
                 </x-callout>
             @endif
-            <x-forms.button class="gap-2" wire:click='stripeCustomerPortal'>Change Server Quantity
-            </x-forms.button>
-            <h2 class="pt-4">Manage your subscription</h2>
-            <div class="pb-4">Cancel, upgrade or downgrade your subscription.</div>
-            <div class="flex gap-2">
-                <x-forms.button class="gap-2" wire:click='stripeCustomerPortal'>Go to <svg
-                        xmlns="http://www.w3.org/2000/svg" class="w-12 " viewBox="0 0 512 214">
-                        <path fill="#635BFF"
-                            d="M512 110.08c0-36.409-17.636-65.138-51.342-65.138c-33.85 0-54.33 28.73-54.33 64.854c0 42.808 24.179 64.426 58.88 64.426c16.925 0 29.725-3.84 39.396-9.244v-28.445c-9.67 4.836-20.764 7.823-34.844 7.823c-13.796 0-26.027-4.836-27.591-21.618h69.547c0-1.85.284-9.245.284-12.658Zm-70.258-13.511c0-16.071 9.814-22.756 18.774-22.756c8.675 0 17.92 6.685 17.92 22.756h-36.694Zm-90.31-51.627c-13.939 0-22.899 6.542-27.876 11.094l-1.85-8.818h-31.288v165.83l35.555-7.537l.143-40.249c5.12 3.698 12.657 8.96 25.173 8.96c25.458 0 48.64-20.48 48.64-65.564c-.142-41.245-23.609-63.716-48.498-63.716Zm-8.534 97.991c-8.391 0-13.37-2.986-16.782-6.684l-.143-52.765c3.698-4.124 8.818-6.968 16.925-6.968c12.942 0 21.902 14.506 21.902 33.137c0 19.058-8.818 33.28-21.902 33.28ZM241.493 36.551l35.698-7.68V0l-35.698 7.538V36.55Zm0 10.809h35.698v124.444h-35.698V47.36Zm-38.257 10.524L200.96 47.36h-30.72v124.444h35.556V87.467c8.39-10.951 22.613-8.96 27.022-7.396V47.36c-4.551-1.707-21.191-4.836-29.582 10.524Zm-71.112-41.386l-34.702 7.395l-.142 113.92c0 21.05 15.787 36.551 36.836 36.551c11.662 0 20.195-2.133 24.888-4.693V140.8c-4.55 1.849-27.022 8.391-27.022-12.658V77.653h27.022V47.36h-27.022l.142-30.862ZM35.982 83.484c0-5.546 4.551-7.68 12.09-7.68c10.808 0 24.461 3.272 35.27 9.103V51.484c-11.804-4.693-23.466-6.542-35.27-6.542C19.2 44.942 0 60.018 0 85.192c0 39.252 54.044 32.995 54.044 49.92c0 6.541-5.688 8.675-13.653 8.675c-11.804 0-26.88-4.836-38.827-11.378v33.849c13.227 5.689 26.596 8.106 38.827 8.106c29.582 0 49.92-14.648 49.92-40.106c-.142-42.382-54.329-34.845-54.329-50.774Z" />
-                    </svg>
-                </x-forms.button>
+        </section>
+
+        {{-- Manage Plan --}}
+        <section>
+            <h3 class="pb-2">Manage Plan</h3>
+            <div class="flex flex-col gap-3">
+                <div class="flex items-center gap-4">
+                    <x-forms.button class="gap-2" wire:click='stripeCustomerPortal'>
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" fill="none" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M2.25 8.25h19.5M2.25 9h19.5m-16.5 5.25h6m-6 2.25h3m-3.75 3h15a2.25 2.25 0 0 0 2.25-2.25V6.75A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25v10.5A2.25 2.25 0 0 0 4.5 19.5Z" />
+                        </svg>
+                        Manage Billing on Stripe
+                    </x-forms.button>
+                </div>
+                <p class="text-sm text-neutral-500">Change your server quantity, update payment methods, or view
+                    invoices.</p>
             </div>
-        </div>
-        <div class="pt-4">
-            If you have any problems, please <a class="underline dark:text-white" href="{{ config('constants.urls.contact') }}"
-                target="_blank">contact us.</a>
+        </section>
+
+        {{-- Refund Section --}}
+        @if ($refundCheckLoading)
+            <section>
+                <h3 class="pb-2">Refund</h3>
+                <x-loading text="Checking refund eligibility..." />
+            </section>
+        @elseif ($isRefundEligible && !currentTeam()->subscription->stripe_cancel_at_period_end)
+            <section>
+                <h3 class="pb-2">Refund</h3>
+                <div class="flex flex-col gap-3">
+                    <div class="flex items-center gap-4">
+                        <x-modal-confirmation title="Request Full Refund?" buttonTitle="Request Full Refund"
+                            isErrorButton submitAction="refundSubscription"
+                            :actions="[
+                                'Your latest payment will be fully refunded.',
+                                'Your subscription will be cancelled immediately.',
+                                'All servers will be deactivated.',
+                            ]" confirmationText="{{ currentTeam()->name }}"
+                            confirmationLabel="Enter your team name to confirm" shortConfirmationLabel="Team Name"
+                            step2ButtonText="Confirm Refund & Cancel" />
+                    </div>
+                    <p class="text-sm text-neutral-500">You are eligible for a full refund.
+                        <strong class="dark:text-warning">{{ $refundDaysRemaining }}</strong> days remaining
+                        in the 30-day refund window.</p>
+                </div>
+            </section>
+        @elseif ($refundAlreadyUsed)
+            <section>
+                <h3 class="pb-2">Refund</h3>
+                <p class="text-sm text-neutral-500">A refund has already been processed for this team. Each team is
+                    eligible for one refund only to prevent abuse.</p>
+            </section>
+        @endif
+
+        {{-- Resume / Cancel Subscription Section --}}
+        @if (currentTeam()->subscription->stripe_cancel_at_period_end)
+            <section>
+                <h3 class="pb-2">Resume Subscription</h3>
+                <div class="flex flex-col gap-3">
+                    <div class="flex items-center gap-4">
+                        <x-forms.button wire:click="resumeSubscription">Resume Subscription</x-forms.button>
+                    </div>
+                    <p class="text-sm text-neutral-500">Your subscription is set to cancel at the end of the billing
+                        period. Resume to continue your plan.</p>
+                </div>
+            </section>
+        @else
+            <section>
+                <h3 class="pb-2">Cancel Subscription</h3>
+                <div class="flex flex-col gap-3">
+                    <div class="flex flex-wrap items-center gap-2">
+                        <x-modal-confirmation title="Cancel at End of Billing Period?"
+                            buttonTitle="Cancel at Period End" submitAction="cancelAtPeriodEnd"
+                            :actions="[
+                                'Your subscription will remain active until the end of the current billing period.',
+                                'No further charges will be made after the current period.',
+                                'You can resubscribe at any time.',
+                            ]" confirmationText="{{ currentTeam()->name }}"
+                            confirmationLabel="Enter your team name to confirm"
+                            shortConfirmationLabel="Team Name" step2ButtonText="Confirm Cancellation" />
+                        <x-modal-confirmation title="Cancel Immediately?" buttonTitle="Cancel Immediately"
+                            isErrorButton submitAction="cancelImmediately"
+                            :actions="[
+                                'Your subscription will be cancelled immediately.',
+                                'All servers will be deactivated.',
+                                'No refund will be issued for the remaining period.',
+                            ]" confirmationText="{{ currentTeam()->name }}"
+                            confirmationLabel="Enter your team name to confirm"
+                            shortConfirmationLabel="Team Name" step2ButtonText="Permanently Cancel" />
+                    </div>
+                    <p class="text-sm text-neutral-500">Cancel your subscription immediately or at the end of the
+                        current billing period.</p>
+                </div>
+            </section>
+        @endif
+
+        <div class="text-sm text-neutral-500">
+            Need help? <a class="underline dark:text-white" href="{{ config('constants.urls.contact') }}"
+                target="_blank">Contact us.</a>
         </div>
     @endif
 </div>
diff --git a/resources/views/livewire/subscription/index.blade.php b/resources/views/livewire/subscription/index.blade.php
index d1d933e04..c78af77f9 100644
--- a/resources/views/livewire/subscription/index.blade.php
+++ b/resources/views/livewire/subscription/index.blade.php
@@ -3,29 +3,26 @@
         Subscribe | Coolify
     </x-slot>
     @if (auth()->user()->isAdminFromSession())
-        @if (request()->query->get('cancelled'))
-            <div class="mb-6 rounded-sm alert-error">
-                <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
-                    viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                        d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
-                </svg>
-                <span>Something went wrong with your subscription. Please try again or contact
-                    support.</span>
-            </div>
-        @endif
         <div class="flex gap-2">
             <h1>Subscriptions</h1>
         </div>
         @if ($loading)
-            <div class="flex gap-2" wire:init="getStripeStatus">
-                Loading your subscription status...
+            <div class="flex items-center justify-center min-h-[60vh]" wire:init="getStripeStatus">
+                <x-loading text="Loading your subscription status..." />
             </div>
         @else
             @if ($isUnpaid)
-                <div class="mb-6 rounded-sm alert-error">
-                    <span>Your last payment was failed for Coolify Cloud.</span>
-                </div>
+                <x-banner :closable="false">
+                    <div class="flex items-center gap-2">
+                        <svg class="w-5 h-5 text-red-500 shrink-0" fill="currentColor" viewBox="0 0 20 20">
+                            <path fill-rule="evenodd"
+                                d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
+                                clip-rule="evenodd" />
+                        </svg>
+                        <span><span class="font-bold text-red-500">Payment Failed.</span> Your last payment for Coolify
+                            Cloud has failed.</span>
+                    </div>
+                </x-banner>
                 <div>
                     <p class="mb-2">Open the following link, navigate to the button and pay your unpaid/past due
                         subscription.
@@ -34,18 +31,20 @@
                 </div>
             @else
                 @if (config('subscription.provider') === 'stripe')
-                    <div @class([
-                        'pb-4' => $isCancelled,
-                        'pb-10' => !$isCancelled,
-                    ])>
-                        @if ($isCancelled)
-                            <div class="alert-error">
-                                <span>It looks like your previous subscription has been cancelled, because you forgot to
-                                    pay
-                                    the bills.<br />Please subscribe again to continue using Coolify.</span>
+                    @if ($isCancelled)
+                        <x-banner :closable="false">
+                            <div class="flex items-center gap-2">
+                                <svg class="w-5 h-5 text-red-500 shrink-0" fill="currentColor" viewBox="0 0 20 20">
+                                    <path fill-rule="evenodd"
+                                        d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
+                                        clip-rule="evenodd" />
+                                </svg>
+                                <span><span class="font-bold text-red-500">No Active Subscription.</span> Subscribe to
+                                    a plan to start using Coolify Cloud.</span>
                             </div>
-                        @endif
-                    </div>
+                        </x-banner>
+                    @endif
+                    <div @class(['pt-4 pb-4' => $isCancelled, 'pb-10' => !$isCancelled])></div>
                     <livewire:subscription.pricing-plans />
                 @endif
             @endif
diff --git a/resources/views/livewire/subscription/pricing-plans.blade.php b/resources/views/livewire/subscription/pricing-plans.blade.php
index 52811f288..45edc39ad 100644
--- a/resources/views/livewire/subscription/pricing-plans.blade.php
+++ b/resources/views/livewire/subscription/pricing-plans.blade.php
@@ -1,162 +1,123 @@
-<div x-data="{ selected: 'monthly' }" class="w-full pb-20">
-    <div class="px-6 mx-auto lg:px-8">
-        <div class="flex justify-center">
-            <fieldset
-                class="grid grid-cols-2 p-1 text-xs font-semibold leading-5 text-center rounded-sm dark:text-white gap-x-1 dark:bg-white/5 bg-black/5">
-                <legend class="sr-only">Payment frequency</legend>
-                <label
-                    :class="selected === 'monthly' ?
-                        'dark:bg-coollabs-100 bg-warning dark:text-white cursor-pointer rounded-sm px-2.5 py-1' :
-                        'cursor-pointer rounded-sm px-2.5 py-1'">
-                    <input type="radio" x-on:click="selected = 'monthly'" name="frequency" value="monthly"
-                        class="sr-only">
-                    <span :class="selected === 'monthly' ? 'dark:text-white' : ''">Monthly</span>
-                </label>
-                <label
-                    :class="selected === 'yearly' ?
-                        'dark:bg-coollabs-100 bg-warning dark:text-white cursor-pointer rounded-sm px-2.5 py-1' :
-                        'cursor-pointer rounded-sm px-2.5 py-1'">
-                    <input type="radio" x-on:click="selected = 'yearly'" name="frequency" value="annually"
-                        class="sr-only">
-                    <span :class="selected === 'yearly' ? 'dark:text-white' : ''">Annually <span
-                            class="text-xs dark:text-warning text-coollabs">(save ~20%)</span></span>
-                </label>
-            </fieldset>
+<div x-data="{ selected: 'monthly' }" class="w-full">
+    {{-- Frequency Toggle --}}
+    <div class="flex justify-center mb-8">
+        <fieldset
+            class="grid grid-cols-2 p-1 text-xs font-semibold leading-5 text-center rounded-sm dark:text-white gap-x-1 dark:bg-white/5 bg-black/5">
+            <legend class="sr-only">Payment frequency</legend>
+            <label
+                :class="selected === 'monthly' ?
+                    'dark:bg-coollabs-100 bg-warning dark:text-white cursor-pointer rounded-sm px-2.5 py-1' :
+                    'cursor-pointer rounded-sm px-2.5 py-1'">
+                <input type="radio" x-on:click="selected = 'monthly'" name="frequency" value="monthly"
+                    class="sr-only">
+                <span :class="selected === 'monthly' ? 'dark:text-white' : ''">Monthly</span>
+            </label>
+            <label
+                :class="selected === 'yearly' ?
+                    'dark:bg-coollabs-100 bg-warning dark:text-white cursor-pointer rounded-sm px-2.5 py-1' :
+                    'cursor-pointer rounded-sm px-2.5 py-1'">
+                <input type="radio" x-on:click="selected = 'yearly'" name="frequency" value="annually"
+                    class="sr-only">
+                <span :class="selected === 'yearly' ? 'dark:text-white' : ''">Annually <span
+                        class="text-xs dark:text-warning text-coollabs">(save ~20%)</span></span>
+            </label>
+        </fieldset>
+    </div>
+
+    <div class="max-w-xl mx-auto">
+        {{-- Plan Header + Pricing --}}
+        <h3 id="tier-dynamic" class="text-2xl font-bold dark:text-white">Pay-as-you-go</h3>
+        <p class="mt-1 text-sm dark:text-neutral-400">Dynamic pricing based on the number of servers you connect.</p>
+
+        <div class="mt-4 flex items-baseline gap-x-1">
+            <span x-show="selected === 'monthly'" x-cloak>
+                <span class="text-4xl font-bold tracking-tight dark:text-white">$5</span>
+                <span class="text-sm dark:text-neutral-400">/ mo base</span>
+            </span>
+            <span x-show="selected === 'yearly'" x-cloak>
+                <span class="text-4xl font-bold tracking-tight dark:text-white">$4</span>
+                <span class="text-sm dark:text-neutral-400">/ mo base</span>
+            </span>
         </div>
-        <div class="flow-root mt-12">
-            <div
-                class="grid grid-cols-1 -mt-16 divide-y divide-neutral-200 dark:divide-coolgray-500 isolate gap-y-16 sm:mx-auto lg:-mx-8 lg:mt-0 lg:max-w-none lg:grid-cols-1 lg:divide-x lg:divide-y-0 xl:-mx-4">
-                <div class="pt-16 lg:px-8 lg:pt-0 xl:px-14">
-                    <h3 id="tier-dynamic" class="text-4xl font-semibold leading-7 dark:text-white">Pay-as-you-go</h3>
-                    <p class="mt-4 text-sm leading-6 dark:text-neutral-400">
-                        Dynamic pricing based on the number of servers you connect.
-                    </p>
-                    <p class="flex items-baseline mt-6 gap-x-1">
-                        <span x-show="selected === 'monthly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight dark:text-white">$5</span>
-                            <span class="text-sm font-semibold leading-6 "> base price</span>
-                        </span>
+        <p class="mt-1 text-sm dark:text-neutral-400">
+            <span x-show="selected === 'monthly'" x-cloak>
+                + <span class="font-semibold dark:text-white">$3</span> per additional server, billed monthly (+VAT)
+            </span>
+            <span x-show="selected === 'yearly'" x-cloak>
+                + <span class="font-semibold dark:text-white">$2.7</span> per additional server, billed annually (+VAT)
+            </span>
+        </p>
 
-                        <span x-show="selected === 'yearly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight dark:text-white">$4</span>
-                            <span class="text-sm font-semibold leading-6 "> base price</span>
-                        </span>
-                    </p>
-                    <p class="flex items-baseline mb-4 gap-x-1">
-                        <span x-show="selected === 'monthly'" x-cloak>
-                            <span class="text-base font-semibold tracking-tight dark:text-white">$3</span>
-                            <span class="text-sm font-semibold leading-6 "> per additional servers <span
-                                    class="font-normal dark:text-white">billed monthly (+VAT)</span></span>
-                        </span>
+        {{-- Subscribe Button --}}
+        <div class="flex mt-6">
+            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-dynamic"
+                class="w-full" wire:click="subscribeStripe('dynamic-monthly')">
+                Subscribe
+            </x-forms.button>
+            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-dynamic"
+                class="w-full" wire:click="subscribeStripe('dynamic-yearly')">
+                Subscribe
+            </x-forms.button>
+        </div>
 
-                        <span x-show="selected === 'yearly'" x-cloak>
-                            <span class="text-base font-semibold tracking-tight dark:text-white">$2.7</span>
-                            <span class="text-sm font-semibold leading-6 "> per additional servers <span
-                                    class="font-normal dark:text-white">billed annually (+VAT)</span></span>
-                        </span>
-                    </p>
-                    <div class="flex items-center pt-6">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="flex-none w-8 h-8 mr-3 dark:text-warning"
-                            fill="currentColor" viewBox="0 0 256 256">
-                            <path
-                                d="M236.8,188.09,149.35,36.22h0a24.76,24.76,0,0,0-42.7,0L19.2,188.09a23.51,23.51,0,0,0,0,23.72A24.35,24.35,0,0,0,40.55,224h174.9a24.35,24.35,0,0,0,21.33-12.19A23.51,23.51,0,0,0,236.8,188.09ZM222.93,203.8a8.5,8.5,0,0,1-7.48,4.2H40.55a8.5,8.5,0,0,1-7.48-4.2,7.59,7.59,0,0,1,0-7.72L120.52,44.21a8.75,8.75,0,0,1,15,0l87.45,151.87A7.59,7.59,0,0,1,222.93,203.8ZM120,144V104a8,8,0,0,1,16,0v40a8,8,0,0,1-16,0Zm20,36a12,12,0,1,1-12-12A12,12,0,0,1,140,180Z">
-                            </path>
-                        </svg>
+        {{-- Features --}}
+        <div class="mt-8 pt-6 border-t dark:border-coolgray-400 border-neutral-200">
+            <ul role="list" class="space-y-2.5 text-sm">
+                <li class="flex items-center gap-2.5">
+                    <svg class="w-4 h-4 shrink-0 dark:text-warning" viewBox="0 0 20 20" fill="currentColor"
+                        aria-hidden="true">
+                        <path fill-rule="evenodd"
+                            d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                            clip-rule="evenodd" />
+                    </svg>
+                    <span class="dark:text-neutral-300">Connect <span
+                            class="font-bold dark:text-white">unlimited</span> servers</span>
+                </li>
+                <li class="flex items-center gap-2.5">
+                    <svg class="w-4 h-4 shrink-0 dark:text-warning" viewBox="0 0 20 20" fill="currentColor"
+                        aria-hidden="true">
+                        <path fill-rule="evenodd"
+                            d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                            clip-rule="evenodd" />
+                    </svg>
+                    <span class="dark:text-neutral-300">Deploy <span
+                            class="font-bold dark:text-white">unlimited</span> applications per server</span>
+                </li>
+                <li class="flex items-center gap-2.5">
+                    <svg class="w-4 h-4 shrink-0 dark:text-warning" viewBox="0 0 20 20" fill="currentColor"
+                        aria-hidden="true">
+                        <path fill-rule="evenodd"
+                            d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                            clip-rule="evenodd" />
+                    </svg>
+                    <span class="dark:text-neutral-300">Free email notifications</span>
+                </li>
+                <li class="flex items-center gap-2.5">
+                    <svg class="w-4 h-4 shrink-0 dark:text-warning" viewBox="0 0 20 20" fill="currentColor"
+                        aria-hidden="true">
+                        <path fill-rule="evenodd"
+                            d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
+                            clip-rule="evenodd" />
+                    </svg>
+                    <span class="dark:text-neutral-300">Support by email</span>
+                </li>
+                <li class="flex items-center gap-2.5 font-bold dark:text-white">
+                    <svg class="w-4 h-4 shrink-0 text-green-500" viewBox="0 0 24 24"
+                        xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor"
+                        stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+                        <path
+                            d="M4 13a8 8 0 0 1 7 7a6 6 0 0 0 3-5a9 9 0 0 0 6-8a3 3 0 0 0-3-3a9 9 0 0 0-8 6a6 6 0 0 0-5 3" />
+                        <path d="M7 14a6 6 0 0 0-3 6a6 6 0 0 0 6-3m4-8a1 1 0 1 0 2 0a1 1 0 1 0-2 0" />
+                    </svg>
+                    + All Upcoming Features
+                </li>
+            </ul>
+        </div>
 
-                        <div class="flex flex-col text-sm dark:text-white">
-                            <div>
-                                You need to bring your own servers from any cloud provider (such as <a class="underline"
-                                    href="https://coolify.io/hetzner" target="_blank">Hetzner</a>, DigitalOcean, AWS,
-                                etc.)
-                            </div>
-                            <div>
-                                (You can connect your RPi, old laptop, or any other device that runs
-                                the <a class="underline"
-                                    href="https://coolify.io/docs/installation#supported-operating-systems"
-                                    target="_blank">supported operating systems</a>.)
-                            </div>
-                        </div>
-                    </div>
-                    <div class="flex pt-4 h-14">
-                        <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-basic"
-                            class="w-full" wire:click="subscribeStripe('dynamic-monthly')">
-                            Subscribe
-                        </x-forms.button>
-                        <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-basic"
-                            class="w-full" wire:click="subscribeStripe('dynamic-yearly')">
-                            Subscribe
-                        </x-forms.button>
-                    </div>
-                    <ul role="list" class="mt-8 space-y-3 text-sm leading-6 dark:text-neutral-400">
-                        <li class="flex">
-                            <svg class="flex-none w-5 h-6 mr-3 dark:text-warning" viewBox="0 0 20 20"
-                                fill="currentColor" aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            Connect
-                            <span class="px-1 font-bold dark:text-white">unlimited</span> servers
-                        </li>
-                        <li class="flex">
-                            <svg class="flex-none w-5 h-6 mr-3 dark:text-warning" viewBox="0 0 20 20"
-                                fill="currentColor" aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            Deploy
-                            <span class="px-1 font-bold dark:text-white">unlimited</span> applications per server
-                        </li>
-                        <li class="flex gap-x-3">
-                            <svg class="flex-none w-5 h-6 dark:text-warning" viewBox="0 0 20 20" fill="currentColor"
-                                aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            Free email notifications
-                        </li>
-                        <li class="flex gap-x-3">
-                            <svg class="flex-none w-5 h-6 dark:text-warning" viewBox="0 0 20 20" fill="currentColor"
-                                aria-hidden="true">
-                                <path fill-rule="evenodd"
-                                    d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
-                                    clip-rule="evenodd" />
-                            </svg>
-                            Support by email
-                        </li>
-                        <li class="flex font-bold dark:text-white gap-x-3">
-                            <svg width="512" height="512" class="flex-none w-5 h-6 text-green-500"
-                                viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                <g fill="none" stroke="currentColor" stroke-linecap="round"
-                                    stroke-linejoin="round" stroke-width="2">
-                                    <path
-                                        d="M4 13a8 8 0 0 1 7 7a6 6 0 0 0 3-5a9 9 0 0 0 6-8a3 3 0 0 0-3-3a9 9 0 0 0-8 6a6 6 0 0 0-5 3" />
-                                    <path d="M7 14a6 6 0 0 0-3 6a6 6 0 0 0 6-3m4-8a1 1 0 1 0 2 0a1 1 0 1 0-2 0" />
-                                </g>
-                            </svg>
-                            + All Upcoming Features
-                        </li>
-                        <li class="flex dark:text-white gap-x-3">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="flex-none w-5 h-6 text-green-500"
-                                viewBox="0 0 256 256">
-                                <rect width="256" height="256" fill="none" />
-                                <polyline points="32 136 72 136 88 112 120 160 136 136 160 136" fill="none"
-                                    stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                                    stroke-width="16" />
-                                <path
-                                    d="M24,104c0-.67,0-1.33,0-2A54,54,0,0,1,78,48c22.59,0,41.94,12.31,50,32,8.06-19.69,27.41-32,50-32a54,54,0,0,1,54,54c0,66-104,122-104,122s-42-22.6-72.58-56"
-                                    fill="none" stroke="currentColor" stroke-linecap="round"
-                                    stroke-linejoin="round" stroke-width="16" />
-                            </svg>
-
-                            Do you require official support for your self-hosted instance?<a class="underline"
-                                href="https://coolify.io/docs/contact" target="_blank">Contact Us</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
+        {{-- BYOS Notice + Support --}}
+        <div class="mt-6 pt-6 border-t dark:border-coolgray-400 border-neutral-200 text-sm dark:text-neutral-400">
+            <p>You need to bring your own servers from any cloud provider (<a class="underline" href="https://coolify.io/hetzner" target="_blank">Hetzner</a>, DigitalOcean, AWS, etc.) or connect any device running a <a class="underline" href="https://coolify.io/docs/installation#supported-operating-systems" target="_blank">supported OS</a>.</p>
+            <p class="mt-3">Need official support for your self-hosted instance? <a class="underline dark:text-white" href="https://coolify.io/docs/contact" target="_blank">Contact Us</a></p>
         </div>
     </div>
 </div>
diff --git a/resources/views/livewire/subscription/show.blade.php b/resources/views/livewire/subscription/show.blade.php
index 2fb4b1191..955beb33f 100644
--- a/resources/views/livewire/subscription/show.blade.php
+++ b/resources/views/livewire/subscription/show.blade.php
@@ -3,6 +3,6 @@
         Subscription | Coolify
     </x-slot>
     <h1>Subscription</h1>
-    <div class="subtitle">Here you can see and manage your subscription.</div>
+    <div class="subtitle">Manage your plan, billing, and server limits.</div>
     <livewire:subscription.actions />
 </div>
diff --git a/tests/Feature/Subscription/CancelSubscriptionActionsTest.php b/tests/Feature/Subscription/CancelSubscriptionActionsTest.php
new file mode 100644
index 000000000..0c8742d06
--- /dev/null
+++ b/tests/Feature/Subscription/CancelSubscriptionActionsTest.php
@@ -0,0 +1,96 @@
+<?php
+
+use App\Actions\Stripe\CancelSubscriptionAtPeriodEnd;
+use App\Models\Subscription;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Stripe\Service\SubscriptionService;
+use Stripe\StripeClient;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    config()->set('constants.coolify.self_hosted', false);
+    config()->set('subscription.provider', 'stripe');
+    config()->set('subscription.stripe_api_key', 'sk_test_fake');
+
+    $this->team = Team::factory()->create();
+    $this->user = User::factory()->create();
+    $this->team->members()->attach($this->user->id, ['role' => 'owner']);
+
+    $this->subscription = Subscription::create([
+        'team_id' => $this->team->id,
+        'stripe_subscription_id' => 'sub_test_456',
+        'stripe_customer_id' => 'cus_test_456',
+        'stripe_invoice_paid' => true,
+        'stripe_plan_id' => 'price_test_456',
+        'stripe_cancel_at_period_end' => false,
+        'stripe_past_due' => false,
+    ]);
+
+    $this->mockStripe = Mockery::mock(StripeClient::class);
+    $this->mockSubscriptions = Mockery::mock(SubscriptionService::class);
+    $this->mockStripe->subscriptions = $this->mockSubscriptions;
+});
+
+describe('CancelSubscriptionAtPeriodEnd', function () {
+    test('cancels subscription at period end successfully', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('update')
+            ->with('sub_test_456', ['cancel_at_period_end' => true])
+            ->andReturn((object) ['status' => 'active', 'cancel_at_period_end' => true]);
+
+        $action = new CancelSubscriptionAtPeriodEnd($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeTrue();
+        expect($result['error'])->toBeNull();
+
+        $this->subscription->refresh();
+        expect($this->subscription->stripe_cancel_at_period_end)->toBeTruthy();
+        expect($this->subscription->stripe_invoice_paid)->toBeTruthy();
+    });
+
+    test('fails when no subscription exists', function () {
+        $team = Team::factory()->create();
+
+        $action = new CancelSubscriptionAtPeriodEnd($this->mockStripe);
+        $result = $action->execute($team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('No active subscription');
+    });
+
+    test('fails when subscription is not active', function () {
+        $this->subscription->update(['stripe_invoice_paid' => false]);
+
+        $action = new CancelSubscriptionAtPeriodEnd($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('not active');
+    });
+
+    test('fails when already set to cancel at period end', function () {
+        $this->subscription->update(['stripe_cancel_at_period_end' => true]);
+
+        $action = new CancelSubscriptionAtPeriodEnd($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('already set to cancel');
+    });
+
+    test('handles stripe API error gracefully', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('update')
+            ->andThrow(new \Stripe\Exception\InvalidRequestException('Subscription not found'));
+
+        $action = new CancelSubscriptionAtPeriodEnd($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('Stripe error');
+    });
+});
diff --git a/tests/Feature/Subscription/RefundSubscriptionTest.php b/tests/Feature/Subscription/RefundSubscriptionTest.php
new file mode 100644
index 000000000..b6c2d4064
--- /dev/null
+++ b/tests/Feature/Subscription/RefundSubscriptionTest.php
@@ -0,0 +1,271 @@
+<?php
+
+use App\Actions\Stripe\RefundSubscription;
+use App\Models\Subscription;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Stripe\Service\InvoiceService;
+use Stripe\Service\RefundService;
+use Stripe\Service\SubscriptionService;
+use Stripe\StripeClient;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    config()->set('constants.coolify.self_hosted', false);
+    config()->set('subscription.provider', 'stripe');
+    config()->set('subscription.stripe_api_key', 'sk_test_fake');
+
+    $this->team = Team::factory()->create();
+    $this->user = User::factory()->create();
+    $this->team->members()->attach($this->user->id, ['role' => 'owner']);
+
+    $this->subscription = Subscription::create([
+        'team_id' => $this->team->id,
+        'stripe_subscription_id' => 'sub_test_123',
+        'stripe_customer_id' => 'cus_test_123',
+        'stripe_invoice_paid' => true,
+        'stripe_plan_id' => 'price_test_123',
+        'stripe_cancel_at_period_end' => false,
+        'stripe_past_due' => false,
+    ]);
+
+    $this->mockStripe = Mockery::mock(StripeClient::class);
+    $this->mockSubscriptions = Mockery::mock(SubscriptionService::class);
+    $this->mockInvoices = Mockery::mock(InvoiceService::class);
+    $this->mockRefunds = Mockery::mock(RefundService::class);
+
+    $this->mockStripe->subscriptions = $this->mockSubscriptions;
+    $this->mockStripe->invoices = $this->mockInvoices;
+    $this->mockStripe->refunds = $this->mockRefunds;
+});
+
+describe('checkEligibility', function () {
+    test('returns eligible when subscription is within 30 days', function () {
+        $stripeSubscription = (object) [
+            'status' => 'active',
+            'start_date' => now()->subDays(10)->timestamp,
+        ];
+
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_123')
+            ->andReturn($stripeSubscription);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->checkEligibility($this->team);
+
+        expect($result['eligible'])->toBeTrue();
+        expect($result['days_remaining'])->toBe(20);
+    });
+
+    test('returns ineligible when subscription is past 30 days', function () {
+        $stripeSubscription = (object) [
+            'status' => 'active',
+            'start_date' => now()->subDays(35)->timestamp,
+        ];
+
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_123')
+            ->andReturn($stripeSubscription);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->checkEligibility($this->team);
+
+        expect($result['eligible'])->toBeFalse();
+        expect($result['days_remaining'])->toBe(0);
+        expect($result['reason'])->toContain('30-day refund window has expired');
+    });
+
+    test('returns ineligible when subscription is not active', function () {
+        $stripeSubscription = (object) [
+            'status' => 'canceled',
+            'start_date' => now()->subDays(5)->timestamp,
+        ];
+
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_123')
+            ->andReturn($stripeSubscription);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->checkEligibility($this->team);
+
+        expect($result['eligible'])->toBeFalse();
+    });
+
+    test('returns ineligible when no subscription exists', function () {
+        $team = Team::factory()->create();
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->checkEligibility($team);
+
+        expect($result['eligible'])->toBeFalse();
+        expect($result['reason'])->toContain('No active subscription');
+    });
+
+    test('returns ineligible when invoice is not paid', function () {
+        $this->subscription->update(['stripe_invoice_paid' => false]);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->checkEligibility($this->team);
+
+        expect($result['eligible'])->toBeFalse();
+        expect($result['reason'])->toContain('not paid');
+    });
+
+    test('returns ineligible when team has already been refunded', function () {
+        $this->subscription->update(['stripe_refunded_at' => now()->subDays(60)]);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->checkEligibility($this->team);
+
+        expect($result['eligible'])->toBeFalse();
+        expect($result['reason'])->toContain('already been processed');
+    });
+
+    test('returns ineligible when stripe subscription not found', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_123')
+            ->andThrow(new \Stripe\Exception\InvalidRequestException('No such subscription'));
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->checkEligibility($this->team);
+
+        expect($result['eligible'])->toBeFalse();
+        expect($result['reason'])->toContain('not found in Stripe');
+    });
+});
+
+describe('execute', function () {
+    test('processes refund successfully', function () {
+        $stripeSubscription = (object) [
+            'status' => 'active',
+            'start_date' => now()->subDays(10)->timestamp,
+        ];
+
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_123')
+            ->andReturn($stripeSubscription);
+
+        $invoiceCollection = (object) ['data' => [
+            (object) ['payment_intent' => 'pi_test_123'],
+        ]];
+
+        $this->mockInvoices
+            ->shouldReceive('all')
+            ->with([
+                'subscription' => 'sub_test_123',
+                'status' => 'paid',
+                'limit' => 1,
+            ])
+            ->andReturn($invoiceCollection);
+
+        $this->mockRefunds
+            ->shouldReceive('create')
+            ->with(['payment_intent' => 'pi_test_123'])
+            ->andReturn((object) ['id' => 're_test_123']);
+
+        $this->mockSubscriptions
+            ->shouldReceive('cancel')
+            ->with('sub_test_123')
+            ->andReturn((object) ['status' => 'canceled']);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeTrue();
+        expect($result['error'])->toBeNull();
+
+        $this->subscription->refresh();
+        expect($this->subscription->stripe_invoice_paid)->toBeFalsy();
+        expect($this->subscription->stripe_feedback)->toBe('Refund requested by user');
+        expect($this->subscription->stripe_refunded_at)->not->toBeNull();
+    });
+
+    test('prevents a second refund after re-subscribing', function () {
+        $this->subscription->update([
+            'stripe_refunded_at' => now()->subDays(15),
+            'stripe_invoice_paid' => true,
+            'stripe_subscription_id' => 'sub_test_new_456',
+        ]);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('already been processed');
+    });
+
+    test('fails when no paid invoice found', function () {
+        $stripeSubscription = (object) [
+            'status' => 'active',
+            'start_date' => now()->subDays(10)->timestamp,
+        ];
+
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_123')
+            ->andReturn($stripeSubscription);
+
+        $invoiceCollection = (object) ['data' => []];
+
+        $this->mockInvoices
+            ->shouldReceive('all')
+            ->andReturn($invoiceCollection);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('No paid invoice');
+    });
+
+    test('fails when invoice has no payment intent', function () {
+        $stripeSubscription = (object) [
+            'status' => 'active',
+            'start_date' => now()->subDays(10)->timestamp,
+        ];
+
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_123')
+            ->andReturn($stripeSubscription);
+
+        $invoiceCollection = (object) ['data' => [
+            (object) ['payment_intent' => null],
+        ]];
+
+        $this->mockInvoices
+            ->shouldReceive('all')
+            ->andReturn($invoiceCollection);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('No payment intent');
+    });
+
+    test('fails when subscription is past refund window', function () {
+        $stripeSubscription = (object) [
+            'status' => 'active',
+            'start_date' => now()->subDays(35)->timestamp,
+        ];
+
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_123')
+            ->andReturn($stripeSubscription);
+
+        $action = new RefundSubscription($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('30-day refund window');
+    });
+});
diff --git a/tests/Feature/Subscription/ResumeSubscriptionTest.php b/tests/Feature/Subscription/ResumeSubscriptionTest.php
new file mode 100644
index 000000000..8632a4c07
--- /dev/null
+++ b/tests/Feature/Subscription/ResumeSubscriptionTest.php
@@ -0,0 +1,85 @@
+<?php
+
+use App\Actions\Stripe\ResumeSubscription;
+use App\Models\Subscription;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Stripe\Service\SubscriptionService;
+use Stripe\StripeClient;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    config()->set('constants.coolify.self_hosted', false);
+    config()->set('subscription.provider', 'stripe');
+    config()->set('subscription.stripe_api_key', 'sk_test_fake');
+
+    $this->team = Team::factory()->create();
+    $this->user = User::factory()->create();
+    $this->team->members()->attach($this->user->id, ['role' => 'owner']);
+
+    $this->subscription = Subscription::create([
+        'team_id' => $this->team->id,
+        'stripe_subscription_id' => 'sub_test_789',
+        'stripe_customer_id' => 'cus_test_789',
+        'stripe_invoice_paid' => true,
+        'stripe_plan_id' => 'price_test_789',
+        'stripe_cancel_at_period_end' => true,
+        'stripe_past_due' => false,
+    ]);
+
+    $this->mockStripe = Mockery::mock(StripeClient::class);
+    $this->mockSubscriptions = Mockery::mock(SubscriptionService::class);
+    $this->mockStripe->subscriptions = $this->mockSubscriptions;
+});
+
+describe('ResumeSubscription', function () {
+    test('resumes subscription successfully', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('update')
+            ->with('sub_test_789', ['cancel_at_period_end' => false])
+            ->andReturn((object) ['status' => 'active', 'cancel_at_period_end' => false]);
+
+        $action = new ResumeSubscription($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeTrue();
+        expect($result['error'])->toBeNull();
+
+        $this->subscription->refresh();
+        expect($this->subscription->stripe_cancel_at_period_end)->toBeFalsy();
+    });
+
+    test('fails when no subscription exists', function () {
+        $team = Team::factory()->create();
+
+        $action = new ResumeSubscription($this->mockStripe);
+        $result = $action->execute($team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('No active subscription');
+    });
+
+    test('fails when subscription is not set to cancel', function () {
+        $this->subscription->update(['stripe_cancel_at_period_end' => false]);
+
+        $action = new ResumeSubscription($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('not set to cancel');
+    });
+
+    test('handles stripe API error gracefully', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('update')
+            ->andThrow(new \Stripe\Exception\InvalidRequestException('Subscription not found'));
+
+        $action = new ResumeSubscription($this->mockStripe);
+        $result = $action->execute($this->team);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('Stripe error');
+    });
+});

From 76ae720c36c35b042a2dee6123b924405460573b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 3 Mar 2026 12:24:13 +0100
Subject: [PATCH 2/3] feat(subscription): add Stripe server limit quantity
 adjustment flow

Introduce a new `UpdateSubscriptionQuantity` Stripe action to:
- preview prorated due-now and next-cycle recurring costs
- update subscription item quantity with proration invoicing
- revert quantity and void invoice when payment is not completed

Wire the flow into the Livewire subscription actions UI with a new adjust-limit modal,
price preview loading, and confirmation-based updates. Also refactor the subscription
management section layout and fix modal confirmation behavior for temporary 2FA bypass.

Add `Subscription::billingInterval()` helper and comprehensive Pest coverage for
quantity updates, preview calculations, failure/revert paths, and billing interval logic.
---
 .../Stripe/UpdateSubscriptionQuantity.php     | 192 +++++++++
 templates/service-templates-latest.json       |   4 +-
 templates/service-templates.json              |   4 +-
 .../UpdateSubscriptionQuantityTest.php        | 375 ++++++++++++++++++
 4 files changed, 571 insertions(+), 4 deletions(-)
 create mode 100644 app/Actions/Stripe/UpdateSubscriptionQuantity.php
 create mode 100644 tests/Feature/Subscription/UpdateSubscriptionQuantityTest.php

diff --git a/app/Actions/Stripe/UpdateSubscriptionQuantity.php b/app/Actions/Stripe/UpdateSubscriptionQuantity.php
new file mode 100644
index 000000000..f22f56ad0
--- /dev/null
+++ b/app/Actions/Stripe/UpdateSubscriptionQuantity.php
@@ -0,0 +1,192 @@
+<?php
+
+namespace App\Actions\Stripe;
+
+use App\Jobs\ServerLimitCheckJob;
+use App\Models\Team;
+use Stripe\StripeClient;
+
+class UpdateSubscriptionQuantity
+{
+    private StripeClient $stripe;
+
+    public function __construct(?StripeClient $stripe = null)
+    {
+        $this->stripe = $stripe ?? new StripeClient(config('subscription.stripe_api_key'));
+    }
+
+    /**
+     * Fetch a full price preview for a quantity change from Stripe.
+     * Returns both the prorated amount due now and the recurring cost for the next billing cycle.
+     *
+     * @return array{success: bool, error: string|null, preview: array{due_now: int, recurring_subtotal: int, recurring_tax: int, recurring_total: int, unit_price: int, tax_description: string|null, quantity: int, currency: string}|null}
+     */
+    public function fetchPricePreview(Team $team, int $quantity): array
+    {
+        $subscription = $team->subscription;
+
+        if (! $subscription?->stripe_subscription_id || ! $subscription->stripe_invoice_paid) {
+            return ['success' => false, 'error' => 'No active subscription found.', 'preview' => null];
+        }
+
+        try {
+            $stripeSubscription = $this->stripe->subscriptions->retrieve($subscription->stripe_subscription_id);
+            $item = $stripeSubscription->items->data[0] ?? null;
+
+            if (! $item) {
+                return ['success' => false, 'error' => 'Could not retrieve subscription details.', 'preview' => null];
+            }
+
+            $currency = strtoupper($item->price->currency ?? 'usd');
+
+            // Upcoming invoice gives us the prorated amount due now
+            $upcomingInvoice = $this->stripe->invoices->upcoming([
+                'customer' => $subscription->stripe_customer_id,
+                'subscription' => $subscription->stripe_subscription_id,
+                'subscription_items' => [
+                    ['id' => $item->id, 'quantity' => $quantity],
+                ],
+                'subscription_proration_behavior' => 'create_prorations',
+            ]);
+
+            // Extract tax percentage — try total_tax_amounts first, fall back to invoice tax/subtotal
+            $taxPercentage = 0.0;
+            $taxDescription = null;
+            if (! empty($upcomingInvoice->total_tax_amounts)) {
+                $taxAmount = $upcomingInvoice->total_tax_amounts[0] ?? null;
+                if ($taxAmount?->tax_rate) {
+                    $taxRate = $this->stripe->taxRates->retrieve($taxAmount->tax_rate);
+                    $taxPercentage = (float) ($taxRate->percentage ?? 0);
+                    $taxDescription = $taxRate->display_name.' ('.$taxRate->jurisdiction.') '.$taxRate->percentage.'%';
+                }
+            }
+            if ($taxPercentage === 0.0 && ($upcomingInvoice->tax ?? 0) > 0 && ($upcomingInvoice->subtotal ?? 0) > 0) {
+                $taxPercentage = round(($upcomingInvoice->tax / $upcomingInvoice->subtotal) * 100, 2);
+            }
+
+            // Recurring cost for next cycle — read from non-proration invoice lines
+            $recurringSubtotal = 0;
+            foreach ($upcomingInvoice->lines->data as $line) {
+                if (! $line->proration) {
+                    $recurringSubtotal += $line->amount;
+                }
+            }
+            $unitPrice = $quantity > 0 ? (int) round($recurringSubtotal / $quantity) : 0;
+
+            $recurringTax = $taxPercentage > 0
+                ? (int) round($recurringSubtotal * $taxPercentage / 100)
+                : 0;
+            $recurringTotal = $recurringSubtotal + $recurringTax;
+
+            // Due now = amount_due (accounts for customer balance/credits) minus recurring
+            $amountDue = $upcomingInvoice->amount_due ?? $upcomingInvoice->total ?? 0;
+            $dueNow = $amountDue - $recurringTotal;
+
+            return [
+                'success' => true,
+                'error' => null,
+                'preview' => [
+                    'due_now' => $dueNow,
+                    'recurring_subtotal' => $recurringSubtotal,
+                    'recurring_tax' => $recurringTax,
+                    'recurring_total' => $recurringTotal,
+                    'unit_price' => $unitPrice,
+                    'tax_description' => $taxDescription,
+                    'quantity' => $quantity,
+                    'currency' => $currency,
+                ],
+            ];
+        } catch (\Exception $e) {
+            \Log::warning("Stripe fetch price preview error for team {$team->id}: ".$e->getMessage());
+
+            return ['success' => false, 'error' => 'Could not load price preview.', 'preview' => null];
+        }
+    }
+
+    /**
+     * Update the subscription quantity (server limit) for a team.
+     *
+     * @return array{success: bool, error: string|null}
+     */
+    public function execute(Team $team, int $quantity): array
+    {
+        if ($quantity < 2) {
+            return ['success' => false, 'error' => 'Minimum server limit is 2.'];
+        }
+
+        $subscription = $team->subscription;
+
+        if (! $subscription?->stripe_subscription_id) {
+            return ['success' => false, 'error' => 'No active subscription found.'];
+        }
+
+        if (! $subscription->stripe_invoice_paid) {
+            return ['success' => false, 'error' => 'Subscription is not active.'];
+        }
+
+        try {
+            $stripeSubscription = $this->stripe->subscriptions->retrieve($subscription->stripe_subscription_id);
+            $item = $stripeSubscription->items->data[0] ?? null;
+
+            if (! $item?->id) {
+                return ['success' => false, 'error' => 'Could not find subscription item.'];
+            }
+
+            $previousQuantity = $item->quantity ?? $team->custom_server_limit;
+
+            $updatedSubscription = $this->stripe->subscriptions->update($subscription->stripe_subscription_id, [
+                'items' => [
+                    ['id' => $item->id, 'quantity' => $quantity],
+                ],
+                'proration_behavior' => 'always_invoice',
+                'expand' => ['latest_invoice'],
+            ]);
+
+            // Check if the proration invoice was paid
+            $latestInvoice = $updatedSubscription->latest_invoice;
+            if ($latestInvoice && $latestInvoice->status !== 'paid') {
+                \Log::warning("Subscription {$subscription->stripe_subscription_id} quantity updated but invoice not paid (status: {$latestInvoice->status}) for team {$team->name}. Reverting to {$previousQuantity}.");
+
+                // Revert subscription quantity on Stripe
+                $this->stripe->subscriptions->update($subscription->stripe_subscription_id, [
+                    'items' => [
+                        ['id' => $item->id, 'quantity' => $previousQuantity],
+                    ],
+                    'proration_behavior' => 'none',
+                ]);
+
+                // Void the unpaid invoice
+                if ($latestInvoice->id) {
+                    $this->stripe->invoices->voidInvoice($latestInvoice->id);
+                }
+
+                return ['success' => false, 'error' => 'Payment failed. Your server limit was not changed. Please check your payment method and try again.'];
+            }
+
+            $team->update([
+                'custom_server_limit' => $quantity,
+            ]);
+
+            ServerLimitCheckJob::dispatch($team);
+
+            \Log::info("Subscription {$subscription->stripe_subscription_id} quantity updated to {$quantity} for team {$team->name}");
+
+            return ['success' => true, 'error' => null];
+        } catch (\Stripe\Exception\InvalidRequestException $e) {
+            \Log::error("Stripe update quantity error for team {$team->id}: ".$e->getMessage());
+
+            return ['success' => false, 'error' => 'Stripe error: '.$e->getMessage()];
+        } catch (\Exception $e) {
+            \Log::error("Update subscription quantity error for team {$team->id}: ".$e->getMessage());
+
+            return ['success' => false, 'error' => 'An unexpected error occurred. Please contact support.'];
+        }
+    }
+
+    private function formatAmount(int $cents, string $currency): string
+    {
+        return strtoupper($currency) === 'USD'
+            ? '$'.number_format($cents / 100, 2)
+            : number_format($cents / 100, 2).' '.$currency;
+    }
+}
diff --git a/templates/service-templates-latest.json b/templates/service-templates-latest.json
index e343e6293..6c7af5dc5 100644
--- a/templates/service-templates-latest.json
+++ b/templates/service-templates-latest.json
@@ -684,7 +684,7 @@
     "cloudreve": {
         "documentation": "https://docs.cloudreve.org/?utm_source=coolify.io",
         "slogan": "A self-hosted file management and sharing system.",
-        "compose": "c2VydmljZXM6CiAgY2xvdWRyZXZlOgogICAgaW1hZ2U6ICdjbG91ZHJldmUvY2xvdWRyZXZlOjQuMTAuMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0NMT1VEUkVWRV81MjEyCiAgICAgIC0gQ1JfQ09ORl9EYXRhYmFzZS5UeXBlPXBvc3RncmVzCiAgICAgIC0gQ1JfQ09ORl9EYXRhYmFzZS5Ib3N0PXBvc3RncmVzCiAgICAgIC0gJ0NSX0NPTkZfRGF0YWJhc2UuVXNlcj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU30nCiAgICAgIC0gJ0NSX0NPTkZfRGF0YWJhc2UuUGFzc3dvcmQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnQ1JfQ09ORl9EYXRhYmFzZS5OYW1lPSR7UE9TVEdSRVNfREI6LWNsb3VkcmV2ZS1kYn0nCiAgICAgIC0gQ1JfQ09ORl9EYXRhYmFzZS5Qb3J0PTU0MzIKICAgICAgLSAnQ1JfQ09ORl9SZWRpcy5TZXJ2ZXI9cmVkaXM6NjM3OScKICAgICAgLSAnQ1JfQ09ORl9SZWRpcy5QYXNzd29yZD0ke1NFUlZJQ0VfUEFTU1dPUkRfUkVESVN9JwogICAgdm9sdW1lczoKICAgICAgLSAnY2xvdWRyZXZlLWRhdGE6L2Nsb3VkcmV2ZS9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG5jCiAgICAgICAgLSAnLXonCiAgICAgICAgLSBsb2NhbGhvc3QKICAgICAgICAtICc1MjEyJwogICAgICBpbnRlcnZhbDogMjBzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAzCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3JlczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogIHBvc3RncmVzOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxOC1hbHBpbmUnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LWNsb3VkcmV2ZS1kYn0nCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlcy1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAkJHtQT1NUR1JFU19VU0VSfSAtZCAkJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogNQogIHJlZGlzOgogICAgaW1hZ2U6ICdyZWRpczo3LWFscGluZScKICAgIGNvbW1hbmQ6ICdyZWRpcy1zZXJ2ZXIgLS1yZXF1aXJlcGFzcyAke1NFUlZJQ0VfUEFTU1dPUkRfUkVESVN9JwogICAgdm9sdW1lczoKICAgICAgLSAncmVkaXMtZGF0YTovZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSByZWRpcy1jbGkKICAgICAgICAtICctYScKICAgICAgICAtICcke1NFUlZJQ0VfUEFTU1dPUkRfUkVESVN9JwogICAgICAgIC0gcGluZwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDUK",
+        "compose": "c2VydmljZXM6CiAgY2xvdWRyZXZlOgogICAgaW1hZ2U6ICdjbG91ZHJldmUvY2xvdWRyZXZlOjQuMTAuMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX0NMT1VEUkVWRV81MjEyCiAgICAgIC0gQ1JfQ09ORl9EYXRhYmFzZS5UeXBlPXBvc3RncmVzCiAgICAgIC0gQ1JfQ09ORl9EYXRhYmFzZS5Ib3N0PXBvc3RncmVzCiAgICAgIC0gJ0NSX0NPTkZfRGF0YWJhc2UuVXNlcj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU30nCiAgICAgIC0gJ0NSX0NPTkZfRGF0YWJhc2UuUGFzc3dvcmQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnQ1JfQ09ORl9EYXRhYmFzZS5OYW1lPSR7UE9TVEdSRVNfREI6LWNsb3VkcmV2ZS1kYn0nCiAgICAgIC0gQ1JfQ09ORl9EYXRhYmFzZS5Qb3J0PTU0MzIKICAgICAgLSAnQ1JfQ09ORl9SZWRpcy5TZXJ2ZXI9cmVkaXM6NjM3OScKICAgICAgLSAnQ1JfQ09ORl9SZWRpcy5QYXNzd29yZD0ke1NFUlZJQ0VfUEFTU1dPUkRfUkVESVN9JwogICAgdm9sdW1lczoKICAgICAgLSAnY2xvdWRyZXZlLWRhdGE6L2Nsb3VkcmV2ZS9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG5jCiAgICAgICAgLSAnLXonCiAgICAgICAgLSBsb2NhbGhvc3QKICAgICAgICAtICc1MjEyJwogICAgICBpbnRlcnZhbDogMjBzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAzCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3JlczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgICByZWRpczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogIHBvc3RncmVzOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxOC1hbHBpbmUnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LWNsb3VkcmV2ZS1kYn0nCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlcy1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDUKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6Ny1hbHBpbmUnCiAgICBjb21tYW5kOiAncmVkaXMtc2VydmVyIC0tcmVxdWlyZXBhc3MgJHtTRVJWSUNFX1BBU1NXT1JEX1JFRElTfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3JlZGlzLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSAnLWEnCiAgICAgICAgLSAnJHtTRVJWSUNFX1BBU1NXT1JEX1JFRElTfScKICAgICAgICAtIHBpbmcKICAgICAgaW50ZXJ2YWw6IDEwcwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiA1Cg==",
         "tags": [
             "file sharing",
             "cloud storage",
@@ -1173,7 +1173,7 @@
     "ente-photos": {
         "documentation": "https://help.ente.io/self-hosting/installation/compose?utm_source=coolify.io",
         "slogan": "Ente Photos is a fully open source, End to End Encrypted alternative to Google Photos and Apple Photos.",
-        "compose": "c2VydmljZXM6CiAgbXVzZXVtOgogICAgaW1hZ2U6ICdnaGNyLmlvL2VudGUtaW8vc2VydmVyOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX01VU0VVTV84MDgwCiAgICAgIC0gJ0VOVEVfSFRUUF9VU0VfVExTPSR7RU5URV9IVFRQX1VTRV9UTFM6LWZhbHNlfScKICAgICAgLSAnRU5URV9BUFBTX1BVQkxJQ19BTEJVTVM9JHtTRVJWSUNFX1VSTF9XRUJfMzAwMn0nCiAgICAgIC0gJ0VOVEVfQVBQU19DQVNUPSR7U0VSVklDRV9VUkxfV0VCXzMwMDR9JwogICAgICAtICdFTlRFX0FQUFNfQUNDT1VOVFM9JHtTRVJWSUNFX1VSTF9XRUJfMzAwMX0nCiAgICAgIC0gJ0VOVEVfREJfSE9TVD0ke0VOVEVfREJfSE9TVDotcG9zdGdyZXN9JwogICAgICAtICdFTlRFX0RCX1BPUlQ9JHtFTlRFX0RCX1BPUlQ6LTU0MzJ9JwogICAgICAtICdFTlRFX0RCX05BTUU9JHtFTlRFX0RCX05BTUU6LWVudGVfZGJ9JwogICAgICAtICdFTlRFX0RCX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVM6LXBndXNlcn0nCiAgICAgIC0gJ0VOVEVfREJfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnRU5URV9LRVlfRU5DUllQVElPTj0ke1NFUlZJQ0VfUkVBTEJBU0U2NF9FTkNSWVBUSU9OfScKICAgICAgLSAnRU5URV9LRVlfSEFTSD0ke1NFUlZJQ0VfUkVBTEJBU0U2NF82NF9IQVNIfScKICAgICAgLSAnRU5URV9KV1RfU0VDUkVUPSR7U0VSVklDRV9SRUFMQkFTRTY0X0pXVH0nCiAgICAgIC0gJ0VOVEVfSU5URVJOQUxfQURNSU49JHtFTlRFX0lOVEVSTkFMX0FETUlOOi0xNTgwNTU5OTYyMzg2NDM4fScKICAgICAgLSAnRU5URV9JTlRFUk5BTF9ESVNBQkxFX1JFR0lTVFJBVElPTj0ke0VOVEVfSU5URVJOQUxfRElTQUJMRV9SRUdJU1RSQVRJT046LWZhbHNlfScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fQVJFX0xPQ0FMX0JVQ0tFVFM9JHtQUklNQVJZX1NUT1JBR0VfQVJFX0xPQ0FMX0JVQ0tFVFM6LWZhbHNlfScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fVVNFX1BBVEhfU1RZTEVfVVJMUz0ke1BSSU1BUllfU1RPUkFHRV9VU0VfUEFUSF9TVFlMRV9VUkxTOi10cnVlfScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fS0VZPSR7UzNfU1RPUkFHRV9LRVk6P30nCiAgICAgIC0gJ0VOVEVfUzNfQjJfRVVfQ0VOX1NFQ1JFVD0ke1MzX1NUT1JBR0VfU0VDUkVUOj99JwogICAgICAtICdFTlRFX1MzX0IyX0VVX0NFTl9FTkRQT0lOVD0ke1MzX1NUT1JBR0VfRU5EUE9JTlQ6P30nCiAgICAgIC0gJ0VOVEVfUzNfQjJfRVVfQ0VOX1JFR0lPTj0ke1MzX1NUT1JBR0VfUkVHSU9OOi11cy1lYXN0LTF9JwogICAgICAtICdFTlRFX1MzX0IyX0VVX0NFTl9CVUNLRVQ9JHtTM19TVE9SQUdFX0JVQ0tFVDo/fScKICAgICAgLSAnRU5URV9TTVRQX0hPU1Q9JHtFTlRFX1NNVFBfSE9TVH0nCiAgICAgIC0gJ0VOVEVfU01UUF9QT1JUPSR7RU5URV9TTVRQX1BPUlR9JwogICAgICAtICdFTlRFX1NNVFBfVVNFUk5BTUU9JHtFTlRFX1NNVFBfVVNFUk5BTUV9JwogICAgICAtICdFTlRFX1NNVFBfUEFTU1dPUkQ9JHtFTlRFX1NNVFBfUEFTU1dPUkR9JwogICAgICAtICdFTlRFX1NNVFBfRU1BSUw9JHtFTlRFX1NNVFBfRU1BSUx9JwogICAgICAtICdFTlRFX1NNVFBfU0VOREVSX05BTUU9JHtFTlRFX1NNVFBfU0VOREVSX05BTUV9JwogICAgICAtICdFTlRFX1NNVFBfRU5DUllQVElPTj0ke0VOVEVfU01UUF9FTkNSWVBUSU9OfScKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICB2b2x1bWVzOgogICAgICAtICdtdXNldW0tZGF0YTovZGF0YScKICAgICAgLSAnbXVzZXVtLWNvbmZpZzovY29uZmlnJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHdnZXQKICAgICAgICAtICctcU8tJwogICAgICAgIC0gJ2h0dHA6Ly8xMjcuMC4wLjE6ODA4MC9waW5nJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogMTAKICB3ZWI6CiAgICBpbWFnZTogZ2hjci5pby9lbnRlLWlvL3dlYgogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfV0VCXzMwMDAKICAgICAgLSAnRU5URV9BUElfT1JJR0lOPSR7U0VSVklDRV9VUkxfTVVTRVVNfScKICAgICAgLSAnRU5URV9BTEJVTVNfT1JJR0lOPSR7U0VSVklDRV9VUkxfV0VCXzMwMDJ9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctLWZhaWwnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAwJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogMTAKICBwb3N0Z3JlczoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFUzotcGd1c2VyfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfREI9JHtTRVJWSUNFX0RCX05BTUU6LWVudGVfZGJ9JwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXMtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJHtQT1NUR1JFU19VU0VSfSAtZCAke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgbXVzZXVtOgogICAgaW1hZ2U6ICdnaGNyLmlvL2VudGUtaW8vc2VydmVyOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfVVJMX01VU0VVTV84MDgwCiAgICAgIC0gJ0VOVEVfSFRUUF9VU0VfVExTPSR7RU5URV9IVFRQX1VTRV9UTFM6LWZhbHNlfScKICAgICAgLSAnRU5URV9BUFBTX1BVQkxJQ19BTEJVTVM9JHtTRVJWSUNFX1VSTF9XRUJfMzAwMn0nCiAgICAgIC0gJ0VOVEVfQVBQU19DQVNUPSR7U0VSVklDRV9VUkxfV0VCXzMwMDR9JwogICAgICAtICdFTlRFX0FQUFNfQUNDT1VOVFM9JHtTRVJWSUNFX1VSTF9XRUJfMzAwMX0nCiAgICAgIC0gJ0VOVEVfUEhPVE9TX09SSUdJTj0ke1NFUlZJQ0VfVVJMX1dFQn0nCiAgICAgIC0gJ0VOVEVfREJfSE9TVD0ke0VOVEVfREJfSE9TVDotcG9zdGdyZXN9JwogICAgICAtICdFTlRFX0RCX1BPUlQ9JHtFTlRFX0RCX1BPUlQ6LTU0MzJ9JwogICAgICAtICdFTlRFX0RCX05BTUU9JHtFTlRFX0RCX05BTUU6LWVudGVfZGJ9JwogICAgICAtICdFTlRFX0RCX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVM6LXBndXNlcn0nCiAgICAgIC0gJ0VOVEVfREJfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnRU5URV9LRVlfRU5DUllQVElPTj0ke1NFUlZJQ0VfUkVBTEJBU0U2NF9FTkNSWVBUSU9OfScKICAgICAgLSAnRU5URV9LRVlfSEFTSD0ke1NFUlZJQ0VfUkVBTEJBU0U2NF82NF9IQVNIfScKICAgICAgLSAnRU5URV9KV1RfU0VDUkVUPSR7U0VSVklDRV9SRUFMQkFTRTY0X0pXVH0nCiAgICAgIC0gJ0VOVEVfSU5URVJOQUxfQURNSU49JHtFTlRFX0lOVEVSTkFMX0FETUlOOi0xNTgwNTU5OTYyMzg2NDM4fScKICAgICAgLSAnRU5URV9JTlRFUk5BTF9ESVNBQkxFX1JFR0lTVFJBVElPTj0ke0VOVEVfSU5URVJOQUxfRElTQUJMRV9SRUdJU1RSQVRJT046LWZhbHNlfScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fQVJFX0xPQ0FMX0JVQ0tFVFM9JHtQUklNQVJZX1NUT1JBR0VfQVJFX0xPQ0FMX0JVQ0tFVFM6LWZhbHNlfScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fVVNFX1BBVEhfU1RZTEVfVVJMUz0ke1BSSU1BUllfU1RPUkFHRV9VU0VfUEFUSF9TVFlMRV9VUkxTOi10cnVlfScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fS0VZPSR7UzNfU1RPUkFHRV9LRVk6P30nCiAgICAgIC0gJ0VOVEVfUzNfQjJfRVVfQ0VOX1NFQ1JFVD0ke1MzX1NUT1JBR0VfU0VDUkVUOj99JwogICAgICAtICdFTlRFX1MzX0IyX0VVX0NFTl9FTkRQT0lOVD0ke1MzX1NUT1JBR0VfRU5EUE9JTlQ6P30nCiAgICAgIC0gJ0VOVEVfUzNfQjJfRVVfQ0VOX1JFR0lPTj0ke1MzX1NUT1JBR0VfUkVHSU9OOi11cy1lYXN0LTF9JwogICAgICAtICdFTlRFX1MzX0IyX0VVX0NFTl9CVUNLRVQ9JHtTM19TVE9SQUdFX0JVQ0tFVDo/fScKICAgICAgLSAnRU5URV9TTVRQX0hPU1Q9JHtFTlRFX1NNVFBfSE9TVH0nCiAgICAgIC0gJ0VOVEVfU01UUF9QT1JUPSR7RU5URV9TTVRQX1BPUlR9JwogICAgICAtICdFTlRFX1NNVFBfVVNFUk5BTUU9JHtFTlRFX1NNVFBfVVNFUk5BTUV9JwogICAgICAtICdFTlRFX1NNVFBfUEFTU1dPUkQ9JHtFTlRFX1NNVFBfUEFTU1dPUkR9JwogICAgICAtICdFTlRFX1NNVFBfRU1BSUw9JHtFTlRFX1NNVFBfRU1BSUx9JwogICAgICAtICdFTlRFX1NNVFBfU0VOREVSX05BTUU9JHtFTlRFX1NNVFBfU0VOREVSX05BTUV9JwogICAgICAtICdFTlRFX1NNVFBfRU5DUllQVElPTj0ke0VOVEVfU01UUF9FTkNSWVBUSU9OfScKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICB2b2x1bWVzOgogICAgICAtICdtdXNldW0tZGF0YTovZGF0YScKICAgICAgLSAnbXVzZXVtLWNvbmZpZzovY29uZmlnJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHdnZXQKICAgICAgICAtICctcU8tJwogICAgICAgIC0gJ2h0dHA6Ly8xMjcuMC4wLjE6ODA4MC9waW5nJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogMTAKICB3ZWI6CiAgICBpbWFnZTogZ2hjci5pby9lbnRlLWlvL3dlYgogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9VUkxfV0VCXzMwMDAKICAgICAgLSAnRU5URV9BUElfT1JJR0lOPSR7U0VSVklDRV9VUkxfTVVTRVVNfScKICAgICAgLSAnRU5URV9BTEJVTVNfT1JJR0lOPSR7U0VSVklDRV9VUkxfV0VCXzMwMDJ9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctLWZhaWwnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTozMDAwJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogMTAKICBwb3N0Z3JlczoKICAgIGltYWdlOiAncG9zdGdyZXM6MTUnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUE9TVEdSRVNfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFUzotcGd1c2VyfScKICAgICAgLSAnUE9TVEdSRVNfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnUE9TVEdSRVNfREI9JHtTRVJWSUNFX0RCX05BTUU6LWVudGVfZGJ9JwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXMtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJHtQT1NUR1JFU19VU0VSfSAtZCAke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDEwCg==",
         "tags": [
             "photos",
             "gallery",
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 2a08e7b4b..58f990de6 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -684,7 +684,7 @@
     "cloudreve": {
         "documentation": "https://docs.cloudreve.org/?utm_source=coolify.io",
         "slogan": "A self-hosted file management and sharing system.",
-        "compose": "c2VydmljZXM6CiAgY2xvdWRyZXZlOgogICAgaW1hZ2U6ICdjbG91ZHJldmUvY2xvdWRyZXZlOjQuMTAuMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9DTE9VRFJFVkVfNTIxMgogICAgICAtIENSX0NPTkZfRGF0YWJhc2UuVHlwZT1wb3N0Z3JlcwogICAgICAtIENSX0NPTkZfRGF0YWJhc2UuSG9zdD1wb3N0Z3JlcwogICAgICAtICdDUl9DT05GX0RhdGFiYXNlLlVzZXI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAtICdDUl9DT05GX0RhdGFiYXNlLlBhc3N3b3JkPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICAgIC0gJ0NSX0NPTkZfRGF0YWJhc2UuTmFtZT0ke1BPU1RHUkVTX0RCOi1jbG91ZHJldmUtZGJ9JwogICAgICAtIENSX0NPTkZfRGF0YWJhc2UuUG9ydD01NDMyCiAgICAgIC0gJ0NSX0NPTkZfUmVkaXMuU2VydmVyPXJlZGlzOjYzNzknCiAgICAgIC0gJ0NSX0NPTkZfUmVkaXMuUGFzc3dvcmQ9JHtTRVJWSUNFX1BBU1NXT1JEX1JFRElTfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2Nsb3VkcmV2ZS1kYXRhOi9jbG91ZHJldmUvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBuYwogICAgICAgIC0gJy16JwogICAgICAgIC0gbG9jYWxob3N0CiAgICAgICAgLSAnNTIxMicKICAgICAgaW50ZXJ2YWw6IDIwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICBwb3N0Z3JlczoKICAgIGltYWdlOiAncG9zdGdyZXM6MTgtYWxwaW5lJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1jbG91ZHJldmUtZGJ9JwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXMtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDUKICByZWRpczoKICAgIGltYWdlOiAncmVkaXM6Ny1hbHBpbmUnCiAgICBjb21tYW5kOiAncmVkaXMtc2VydmVyIC0tcmVxdWlyZXBhc3MgJHtTRVJWSUNFX1BBU1NXT1JEX1JFRElTfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3JlZGlzLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSAnLWEnCiAgICAgICAgLSAnJHtTRVJWSUNFX1BBU1NXT1JEX1JFRElTfScKICAgICAgICAtIHBpbmcKICAgICAgaW50ZXJ2YWw6IDEwcwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiA1Cg==",
+        "compose": "c2VydmljZXM6CiAgY2xvdWRyZXZlOgogICAgaW1hZ2U6ICdjbG91ZHJldmUvY2xvdWRyZXZlOjQuMTAuMScKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9DTE9VRFJFVkVfNTIxMgogICAgICAtIENSX0NPTkZfRGF0YWJhc2UuVHlwZT1wb3N0Z3JlcwogICAgICAtIENSX0NPTkZfRGF0YWJhc2UuSG9zdD1wb3N0Z3JlcwogICAgICAtICdDUl9DT05GX0RhdGFiYXNlLlVzZXI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAtICdDUl9DT05GX0RhdGFiYXNlLlBhc3N3b3JkPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICAgIC0gJ0NSX0NPTkZfRGF0YWJhc2UuTmFtZT0ke1BPU1RHUkVTX0RCOi1jbG91ZHJldmUtZGJ9JwogICAgICAtIENSX0NPTkZfRGF0YWJhc2UuUG9ydD01NDMyCiAgICAgIC0gJ0NSX0NPTkZfUmVkaXMuU2VydmVyPXJlZGlzOjYzNzknCiAgICAgIC0gJ0NSX0NPTkZfUmVkaXMuUGFzc3dvcmQ9JHtTRVJWSUNFX1BBU1NXT1JEX1JFRElTfScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2Nsb3VkcmV2ZS1kYXRhOi9jbG91ZHJldmUvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBuYwogICAgICAgIC0gJy16JwogICAgICAgIC0gbG9jYWxob3N0CiAgICAgICAgLSAnNTIxMicKICAgICAgaW50ZXJ2YWw6IDIwcwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgICAgcmVkaXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICBwb3N0Z3JlczoKICAgIGltYWdlOiAncG9zdGdyZXM6MTgtYWxwaW5lJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1jbG91ZHJldmUtZGJ9JwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXMtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDEwcwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiA1CiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOjctYWxwaW5lJwogICAgY29tbWFuZDogJ3JlZGlzLXNlcnZlciAtLXJlcXVpcmVwYXNzICR7U0VSVklDRV9QQVNTV09SRF9SRURJU30nCiAgICB2b2x1bWVzOgogICAgICAtICdyZWRpcy1kYXRhOi9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIHJlZGlzLWNsaQogICAgICAgIC0gJy1hJwogICAgICAgIC0gJyR7U0VSVklDRV9QQVNTV09SRF9SRURJU30nCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiAxMHMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogNQo=",
         "tags": [
             "file sharing",
             "cloud storage",
@@ -1173,7 +1173,7 @@
     "ente-photos": {
         "documentation": "https://help.ente.io/self-hosting/installation/compose?utm_source=coolify.io",
         "slogan": "Ente Photos is a fully open source, End to End Encrypted alternative to Google Photos and Apple Photos.",
-        "compose": "c2VydmljZXM6CiAgbXVzZXVtOgogICAgaW1hZ2U6ICdnaGNyLmlvL2VudGUtaW8vc2VydmVyOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9NVVNFVU1fODA4MAogICAgICAtICdFTlRFX0hUVFBfVVNFX1RMUz0ke0VOVEVfSFRUUF9VU0VfVExTOi1mYWxzZX0nCiAgICAgIC0gJ0VOVEVfQVBQU19QVUJMSUNfQUxCVU1TPSR7U0VSVklDRV9GUUROX1dFQl8zMDAyfScKICAgICAgLSAnRU5URV9BUFBTX0NBU1Q9JHtTRVJWSUNFX0ZRRE5fV0VCXzMwMDR9JwogICAgICAtICdFTlRFX0FQUFNfQUNDT1VOVFM9JHtTRVJWSUNFX0ZRRE5fV0VCXzMwMDF9JwogICAgICAtICdFTlRFX0RCX0hPU1Q9JHtFTlRFX0RCX0hPU1Q6LXBvc3RncmVzfScKICAgICAgLSAnRU5URV9EQl9QT1JUPSR7RU5URV9EQl9QT1JUOi01NDMyfScKICAgICAgLSAnRU5URV9EQl9OQU1FPSR7RU5URV9EQl9OQU1FOi1lbnRlX2RifScKICAgICAgLSAnRU5URV9EQl9VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTOi1wZ3VzZXJ9JwogICAgICAtICdFTlRFX0RCX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICAgIC0gJ0VOVEVfS0VZX0VOQ1JZUFRJT049JHtTRVJWSUNFX1JFQUxCQVNFNjRfRU5DUllQVElPTn0nCiAgICAgIC0gJ0VOVEVfS0VZX0hBU0g9JHtTRVJWSUNFX1JFQUxCQVNFNjRfNjRfSEFTSH0nCiAgICAgIC0gJ0VOVEVfSldUX1NFQ1JFVD0ke1NFUlZJQ0VfUkVBTEJBU0U2NF9KV1R9JwogICAgICAtICdFTlRFX0lOVEVSTkFMX0FETUlOPSR7RU5URV9JTlRFUk5BTF9BRE1JTjotMTU4MDU1OTk2MjM4NjQzOH0nCiAgICAgIC0gJ0VOVEVfSU5URVJOQUxfRElTQUJMRV9SRUdJU1RSQVRJT049JHtFTlRFX0lOVEVSTkFMX0RJU0FCTEVfUkVHSVNUUkFUSU9OOi1mYWxzZX0nCiAgICAgIC0gJ0VOVEVfUzNfQjJfRVVfQ0VOX0FSRV9MT0NBTF9CVUNLRVRTPSR7UFJJTUFSWV9TVE9SQUdFX0FSRV9MT0NBTF9CVUNLRVRTOi1mYWxzZX0nCiAgICAgIC0gJ0VOVEVfUzNfQjJfRVVfQ0VOX1VTRV9QQVRIX1NUWUxFX1VSTFM9JHtQUklNQVJZX1NUT1JBR0VfVVNFX1BBVEhfU1RZTEVfVVJMUzotdHJ1ZX0nCiAgICAgIC0gJ0VOVEVfUzNfQjJfRVVfQ0VOX0tFWT0ke1MzX1NUT1JBR0VfS0VZOj99JwogICAgICAtICdFTlRFX1MzX0IyX0VVX0NFTl9TRUNSRVQ9JHtTM19TVE9SQUdFX1NFQ1JFVDo/fScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fRU5EUE9JTlQ9JHtTM19TVE9SQUdFX0VORFBPSU5UOj99JwogICAgICAtICdFTlRFX1MzX0IyX0VVX0NFTl9SRUdJT049JHtTM19TVE9SQUdFX1JFR0lPTjotdXMtZWFzdC0xfScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fQlVDS0VUPSR7UzNfU1RPUkFHRV9CVUNLRVQ6P30nCiAgICAgIC0gJ0VOVEVfU01UUF9IT1NUPSR7RU5URV9TTVRQX0hPU1R9JwogICAgICAtICdFTlRFX1NNVFBfUE9SVD0ke0VOVEVfU01UUF9QT1JUfScKICAgICAgLSAnRU5URV9TTVRQX1VTRVJOQU1FPSR7RU5URV9TTVRQX1VTRVJOQU1FfScKICAgICAgLSAnRU5URV9TTVRQX1BBU1NXT1JEPSR7RU5URV9TTVRQX1BBU1NXT1JEfScKICAgICAgLSAnRU5URV9TTVRQX0VNQUlMPSR7RU5URV9TTVRQX0VNQUlMfScKICAgICAgLSAnRU5URV9TTVRQX1NFTkRFUl9OQU1FPSR7RU5URV9TTVRQX1NFTkRFUl9OQU1FfScKICAgICAgLSAnRU5URV9TTVRQX0VOQ1JZUFRJT049JHtFTlRFX1NNVFBfRU5DUllQVElPTn0nCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3JlczoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgdm9sdW1lczoKICAgICAgLSAnbXVzZXVtLWRhdGE6L2RhdGEnCiAgICAgIC0gJ211c2V1bS1jb25maWc6L2NvbmZpZycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSB3Z2V0CiAgICAgICAgLSAnLXFPLScKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjgwODAvcGluZycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDEwCiAgd2ViOgogICAgaW1hZ2U6IGdoY3IuaW8vZW50ZS1pby93ZWIKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9XRUJfMzAwMAogICAgICAtICdFTlRFX0FQSV9PUklHSU49JHtTRVJWSUNFX0ZRRE5fTVVTRVVNfScKICAgICAgLSAnRU5URV9BTEJVTVNfT1JJR0lOPSR7U0VSVklDRV9GUUROX1dFQl8zMDAyfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLS1mYWlsJwogICAgICAgIC0gJ2h0dHA6Ly8xMjcuMC4wLjE6MzAwMCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDVzCiAgICAgIHJldHJpZXM6IDEwCiAgcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE1JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVM6LXBndXNlcn0nCiAgICAgIC0gJ1BPU1RHUkVTX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9QT1NUR1JFU30nCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7U0VSVklDRV9EQl9OQU1FOi1lbnRlX2RifScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3Bvc3RncmVzLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICR7UE9TVEdSRVNfVVNFUn0gLWQgJHtQT1NUR1JFU19EQn0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiAxMAo=",
+        "compose": "c2VydmljZXM6CiAgbXVzZXVtOgogICAgaW1hZ2U6ICdnaGNyLmlvL2VudGUtaW8vc2VydmVyOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9NVVNFVU1fODA4MAogICAgICAtICdFTlRFX0hUVFBfVVNFX1RMUz0ke0VOVEVfSFRUUF9VU0VfVExTOi1mYWxzZX0nCiAgICAgIC0gJ0VOVEVfQVBQU19QVUJMSUNfQUxCVU1TPSR7U0VSVklDRV9GUUROX1dFQl8zMDAyfScKICAgICAgLSAnRU5URV9BUFBTX0NBU1Q9JHtTRVJWSUNFX0ZRRE5fV0VCXzMwMDR9JwogICAgICAtICdFTlRFX0FQUFNfQUNDT1VOVFM9JHtTRVJWSUNFX0ZRRE5fV0VCXzMwMDF9JwogICAgICAtICdFTlRFX1BIT1RPU19PUklHSU49JHtTRVJWSUNFX0ZRRE5fV0VCfScKICAgICAgLSAnRU5URV9EQl9IT1NUPSR7RU5URV9EQl9IT1NUOi1wb3N0Z3Jlc30nCiAgICAgIC0gJ0VOVEVfREJfUE9SVD0ke0VOVEVfREJfUE9SVDotNTQzMn0nCiAgICAgIC0gJ0VOVEVfREJfTkFNRT0ke0VOVEVfREJfTkFNRTotZW50ZV9kYn0nCiAgICAgIC0gJ0VOVEVfREJfVVNFUj0ke1NFUlZJQ0VfVVNFUl9QT1NUR1JFUzotcGd1c2VyfScKICAgICAgLSAnRU5URV9EQl9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgICAtICdFTlRFX0tFWV9FTkNSWVBUSU9OPSR7U0VSVklDRV9SRUFMQkFTRTY0X0VOQ1JZUFRJT059JwogICAgICAtICdFTlRFX0tFWV9IQVNIPSR7U0VSVklDRV9SRUFMQkFTRTY0XzY0X0hBU0h9JwogICAgICAtICdFTlRFX0pXVF9TRUNSRVQ9JHtTRVJWSUNFX1JFQUxCQVNFNjRfSldUfScKICAgICAgLSAnRU5URV9JTlRFUk5BTF9BRE1JTj0ke0VOVEVfSU5URVJOQUxfQURNSU46LTE1ODA1NTk5NjIzODY0Mzh9JwogICAgICAtICdFTlRFX0lOVEVSTkFMX0RJU0FCTEVfUkVHSVNUUkFUSU9OPSR7RU5URV9JTlRFUk5BTF9ESVNBQkxFX1JFR0lTVFJBVElPTjotZmFsc2V9JwogICAgICAtICdFTlRFX1MzX0IyX0VVX0NFTl9BUkVfTE9DQUxfQlVDS0VUUz0ke1BSSU1BUllfU1RPUkFHRV9BUkVfTE9DQUxfQlVDS0VUUzotZmFsc2V9JwogICAgICAtICdFTlRFX1MzX0IyX0VVX0NFTl9VU0VfUEFUSF9TVFlMRV9VUkxTPSR7UFJJTUFSWV9TVE9SQUdFX1VTRV9QQVRIX1NUWUxFX1VSTFM6LXRydWV9JwogICAgICAtICdFTlRFX1MzX0IyX0VVX0NFTl9LRVk9JHtTM19TVE9SQUdFX0tFWTo/fScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fU0VDUkVUPSR7UzNfU1RPUkFHRV9TRUNSRVQ6P30nCiAgICAgIC0gJ0VOVEVfUzNfQjJfRVVfQ0VOX0VORFBPSU5UPSR7UzNfU1RPUkFHRV9FTkRQT0lOVDo/fScKICAgICAgLSAnRU5URV9TM19CMl9FVV9DRU5fUkVHSU9OPSR7UzNfU1RPUkFHRV9SRUdJT046LXVzLWVhc3QtMX0nCiAgICAgIC0gJ0VOVEVfUzNfQjJfRVVfQ0VOX0JVQ0tFVD0ke1MzX1NUT1JBR0VfQlVDS0VUOj99JwogICAgICAtICdFTlRFX1NNVFBfSE9TVD0ke0VOVEVfU01UUF9IT1NUfScKICAgICAgLSAnRU5URV9TTVRQX1BPUlQ9JHtFTlRFX1NNVFBfUE9SVH0nCiAgICAgIC0gJ0VOVEVfU01UUF9VU0VSTkFNRT0ke0VOVEVfU01UUF9VU0VSTkFNRX0nCiAgICAgIC0gJ0VOVEVfU01UUF9QQVNTV09SRD0ke0VOVEVfU01UUF9QQVNTV09SRH0nCiAgICAgIC0gJ0VOVEVfU01UUF9FTUFJTD0ke0VOVEVfU01UUF9FTUFJTH0nCiAgICAgIC0gJ0VOVEVfU01UUF9TRU5ERVJfTkFNRT0ke0VOVEVfU01UUF9TRU5ERVJfTkFNRX0nCiAgICAgIC0gJ0VOVEVfU01UUF9FTkNSWVBUSU9OPSR7RU5URV9TTVRQX0VOQ1JZUFRJT059JwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXM6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIHZvbHVtZXM6CiAgICAgIC0gJ211c2V1bS1kYXRhOi9kYXRhJwogICAgICAtICdtdXNldW0tY29uZmlnOi9jb25maWcnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gd2dldAogICAgICAgIC0gJy1xTy0nCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMTo4MDgwL3BpbmcnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiAxMAogIHdlYjoKICAgIGltYWdlOiBnaGNyLmlvL2VudGUtaW8vd2ViCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fV0VCXzMwMDAKICAgICAgLSAnRU5URV9BUElfT1JJR0lOPSR7U0VSVklDRV9GUUROX01VU0VVTX0nCiAgICAgIC0gJ0VOVEVfQUxCVU1TX09SSUdJTj0ke1NFUlZJQ0VfRlFETl9XRUJfMzAwMn0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy0tZmFpbCcKICAgICAgICAtICdodHRwOi8vMTI3LjAuMC4xOjMwMDAnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiA1cwogICAgICByZXRyaWVzOiAxMAogIHBvc3RncmVzOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNScKICAgIGVudmlyb25tZW50OgogICAgICAtICdQT1NUR1JFU19VU0VSPSR7U0VSVklDRV9VU0VSX1BPU1RHUkVTOi1wZ3VzZXJ9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19EQj0ke1NFUlZJQ0VfREJfTkFNRTotZW50ZV9kYn0nCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlcy1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ELVNIRUxMCiAgICAgICAgLSAncGdfaXNyZWFkeSAtVSAke1BPU1RHUkVTX1VTRVJ9IC1kICR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogNXMKICAgICAgcmV0cmllczogMTAK",
         "tags": [
             "photos",
             "gallery",
diff --git a/tests/Feature/Subscription/UpdateSubscriptionQuantityTest.php b/tests/Feature/Subscription/UpdateSubscriptionQuantityTest.php
new file mode 100644
index 000000000..3e13170f0
--- /dev/null
+++ b/tests/Feature/Subscription/UpdateSubscriptionQuantityTest.php
@@ -0,0 +1,375 @@
+<?php
+
+use App\Actions\Stripe\UpdateSubscriptionQuantity;
+use App\Jobs\ServerLimitCheckJob;
+use App\Models\Subscription;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Queue;
+use Stripe\Service\InvoiceService;
+use Stripe\Service\SubscriptionService;
+use Stripe\Service\TaxRateService;
+use Stripe\StripeClient;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    config()->set('constants.coolify.self_hosted', false);
+    config()->set('subscription.provider', 'stripe');
+    config()->set('subscription.stripe_api_key', 'sk_test_fake');
+
+    $this->team = Team::factory()->create();
+    $this->user = User::factory()->create();
+    $this->team->members()->attach($this->user->id, ['role' => 'owner']);
+
+    $this->subscription = Subscription::create([
+        'team_id' => $this->team->id,
+        'stripe_subscription_id' => 'sub_test_qty',
+        'stripe_customer_id' => 'cus_test_qty',
+        'stripe_invoice_paid' => true,
+        'stripe_plan_id' => 'price_test_qty',
+        'stripe_cancel_at_period_end' => false,
+        'stripe_past_due' => false,
+    ]);
+
+    $this->mockStripe = Mockery::mock(StripeClient::class);
+    $this->mockSubscriptions = Mockery::mock(SubscriptionService::class);
+    $this->mockInvoices = Mockery::mock(InvoiceService::class);
+    $this->mockTaxRates = Mockery::mock(TaxRateService::class);
+    $this->mockStripe->subscriptions = $this->mockSubscriptions;
+    $this->mockStripe->invoices = $this->mockInvoices;
+    $this->mockStripe->taxRates = $this->mockTaxRates;
+
+    $this->stripeSubscriptionResponse = (object) [
+        'items' => (object) [
+            'data' => [(object) [
+                'id' => 'si_item_123',
+                'quantity' => 2,
+                'price' => (object) ['unit_amount' => 500, 'currency' => 'usd'],
+            ]],
+        ],
+    ];
+});
+
+describe('UpdateSubscriptionQuantity::execute', function () {
+    test('updates quantity successfully', function () {
+        Queue::fake();
+
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_qty')
+            ->andReturn($this->stripeSubscriptionResponse);
+
+        $this->mockSubscriptions
+            ->shouldReceive('update')
+            ->with('sub_test_qty', [
+                'items' => [
+                    ['id' => 'si_item_123', 'quantity' => 5],
+                ],
+                'proration_behavior' => 'always_invoice',
+                'expand' => ['latest_invoice'],
+            ])
+            ->andReturn((object) [
+                'status' => 'active',
+                'latest_invoice' => (object) ['status' => 'paid'],
+            ]);
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->execute($this->team, 5);
+
+        expect($result['success'])->toBeTrue();
+        expect($result['error'])->toBeNull();
+
+        $this->team->refresh();
+        expect($this->team->custom_server_limit)->toBe(5);
+
+        Queue::assertPushed(ServerLimitCheckJob::class, function ($job) {
+            return $job->team->id === $this->team->id;
+        });
+    });
+
+    test('reverts subscription and voids invoice when payment fails', function () {
+        Queue::fake();
+
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_qty')
+            ->andReturn($this->stripeSubscriptionResponse);
+
+        // First update: changes quantity but payment fails
+        $this->mockSubscriptions
+            ->shouldReceive('update')
+            ->with('sub_test_qty', [
+                'items' => [
+                    ['id' => 'si_item_123', 'quantity' => 5],
+                ],
+                'proration_behavior' => 'always_invoice',
+                'expand' => ['latest_invoice'],
+            ])
+            ->andReturn((object) [
+                'status' => 'active',
+                'latest_invoice' => (object) ['id' => 'in_failed_123', 'status' => 'open'],
+            ]);
+
+        // Revert: restores original quantity
+        $this->mockSubscriptions
+            ->shouldReceive('update')
+            ->with('sub_test_qty', [
+                'items' => [
+                    ['id' => 'si_item_123', 'quantity' => 2],
+                ],
+                'proration_behavior' => 'none',
+            ])
+            ->andReturn((object) ['status' => 'active']);
+
+        // Void the unpaid invoice
+        $this->mockInvoices
+            ->shouldReceive('voidInvoice')
+            ->with('in_failed_123')
+            ->once();
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->execute($this->team, 5);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('Payment failed');
+
+        $this->team->refresh();
+        expect($this->team->custom_server_limit)->not->toBe(5);
+
+        Queue::assertNotPushed(ServerLimitCheckJob::class);
+    });
+
+    test('rejects quantity below minimum of 2', function () {
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->execute($this->team, 1);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('Minimum server limit is 2');
+    });
+
+    test('fails when no subscription exists', function () {
+        $team = Team::factory()->create();
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->execute($team, 5);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('No active subscription');
+    });
+
+    test('fails when subscription is not active', function () {
+        $this->subscription->update(['stripe_invoice_paid' => false]);
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->execute($this->team, 5);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('not active');
+    });
+
+    test('fails when subscription item cannot be found', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_qty')
+            ->andReturn((object) [
+                'items' => (object) ['data' => []],
+            ]);
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->execute($this->team, 5);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('Could not find subscription item');
+    });
+
+    test('handles stripe API error gracefully', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->andThrow(new \Stripe\Exception\InvalidRequestException('Subscription not found'));
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->execute($this->team, 5);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('Stripe error');
+    });
+
+    test('handles generic exception gracefully', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->andThrow(new \RuntimeException('Network error'));
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->execute($this->team, 5);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('unexpected error');
+    });
+});
+
+describe('UpdateSubscriptionQuantity::fetchPricePreview', function () {
+    test('returns full preview with proration and recurring cost with tax', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_qty')
+            ->andReturn($this->stripeSubscriptionResponse);
+
+        $this->mockInvoices
+            ->shouldReceive('upcoming')
+            ->with([
+                'customer' => 'cus_test_qty',
+                'subscription' => 'sub_test_qty',
+                'subscription_items' => [
+                    ['id' => 'si_item_123', 'quantity' => 3],
+                ],
+                'subscription_proration_behavior' => 'create_prorations',
+            ])
+            ->andReturn((object) [
+                'amount_due' => 2540,
+                'total' => 2540,
+                'subtotal' => 2000,
+                'tax' => 540,
+                'currency' => 'usd',
+                'lines' => (object) [
+                    'data' => [
+                        (object) ['amount' => -300, 'proration' => true],  // credit for unused
+                        (object) ['amount' => 800, 'proration' => true],   // charge for new qty
+                        (object) ['amount' => 1500, 'proration' => false], // next cycle
+                    ],
+                ],
+                'total_tax_amounts' => [
+                    (object) ['tax_rate' => 'txr_123'],
+                ],
+            ]);
+
+        $this->mockTaxRates
+            ->shouldReceive('retrieve')
+            ->with('txr_123')
+            ->andReturn((object) [
+                'display_name' => 'VAT',
+                'jurisdiction' => 'HU',
+                'percentage' => 27,
+            ]);
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->fetchPricePreview($this->team, 3);
+
+        expect($result['success'])->toBeTrue();
+        // Due now: invoice total (2540) - recurring total (1905) = 635
+        expect($result['preview']['due_now'])->toBe(635);
+        // Recurring: 3 × $5.00 = $15.00
+        expect($result['preview']['recurring_subtotal'])->toBe(1500);
+        // Tax: $15.00 × 27% = $4.05
+        expect($result['preview']['recurring_tax'])->toBe(405);
+        // Total: $15.00 + $4.05 = $19.05
+        expect($result['preview']['recurring_total'])->toBe(1905);
+        expect($result['preview']['unit_price'])->toBe(500);
+        expect($result['preview']['tax_description'])->toContain('VAT');
+        expect($result['preview']['tax_description'])->toContain('27%');
+        expect($result['preview']['quantity'])->toBe(3);
+        expect($result['preview']['currency'])->toBe('USD');
+    });
+
+    test('returns preview without tax when no tax applies', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_qty')
+            ->andReturn($this->stripeSubscriptionResponse);
+
+        $this->mockInvoices
+            ->shouldReceive('upcoming')
+            ->andReturn((object) [
+                'amount_due' => 1250,
+                'total' => 1250,
+                'subtotal' => 1250,
+                'tax' => 0,
+                'currency' => 'usd',
+                'lines' => (object) [
+                    'data' => [
+                        (object) ['amount' => 250, 'proration' => true],   // proration charge
+                        (object) ['amount' => 1000, 'proration' => false], // next cycle
+                    ],
+                ],
+                'total_tax_amounts' => [],
+            ]);
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->fetchPricePreview($this->team, 2);
+
+        expect($result['success'])->toBeTrue();
+        // Due now: invoice total (1250) - recurring total (1000) = 250
+        expect($result['preview']['due_now'])->toBe(250);
+        // 2 × $5.00 = $10.00, no tax
+        expect($result['preview']['recurring_subtotal'])->toBe(1000);
+        expect($result['preview']['recurring_tax'])->toBe(0);
+        expect($result['preview']['recurring_total'])->toBe(1000);
+        expect($result['preview']['tax_description'])->toBeNull();
+    });
+
+    test('fails when no subscription exists', function () {
+        $team = Team::factory()->create();
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->fetchPricePreview($team, 5);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['preview'])->toBeNull();
+    });
+
+    test('fails when subscription item not found', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->with('sub_test_qty')
+            ->andReturn((object) [
+                'items' => (object) ['data' => []],
+            ]);
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->fetchPricePreview($this->team, 5);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('Could not retrieve subscription details');
+    });
+
+    test('handles Stripe API error gracefully', function () {
+        $this->mockSubscriptions
+            ->shouldReceive('retrieve')
+            ->andThrow(new \RuntimeException('API error'));
+
+        $action = new UpdateSubscriptionQuantity($this->mockStripe);
+        $result = $action->fetchPricePreview($this->team, 5);
+
+        expect($result['success'])->toBeFalse();
+        expect($result['error'])->toContain('Could not load price preview');
+        expect($result['preview'])->toBeNull();
+    });
+});
+
+describe('Subscription billingInterval', function () {
+    test('returns monthly for monthly plan', function () {
+        config()->set('subscription.stripe_price_id_dynamic_monthly', 'price_monthly_123');
+
+        $this->subscription->update(['stripe_plan_id' => 'price_monthly_123']);
+        $this->subscription->refresh();
+
+        expect($this->subscription->billingInterval())->toBe('monthly');
+    });
+
+    test('returns yearly for yearly plan', function () {
+        config()->set('subscription.stripe_price_id_dynamic_yearly', 'price_yearly_123');
+
+        $this->subscription->update(['stripe_plan_id' => 'price_yearly_123']);
+        $this->subscription->refresh();
+
+        expect($this->subscription->billingInterval())->toBe('yearly');
+    });
+
+    test('defaults to monthly when plan id is null', function () {
+        $this->subscription->update(['stripe_plan_id' => null]);
+        $this->subscription->refresh();
+
+        expect($this->subscription->billingInterval())->toBe('monthly');
+    });
+});

From d3b8d70f08aee1e8a82842cf559c74921894ece2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Tue, 3 Mar 2026 12:28:16 +0100
Subject: [PATCH 3/3] fix(subscription): harden quantity updates and proxy
 trust behavior

Centralize min/max server limits in Stripe quantity updates and wire them into
Livewire subscription actions with price preview/update handling.

Also improve host/proxy middleware behavior by trusting loopback hosts when FQDN
is set and auto-enabling secure session cookies for HTTPS requests behind
proxies when session.secure is unset.

Includes feature tests for loopback trust and secure cookie auto-detection.
---
 .../Stripe/UpdateSubscriptionQuantity.php     |   9 +-
 app/Http/Middleware/TrustHosts.php            |   7 +
 app/Http/Middleware/TrustProxies.php          |  22 ++
 app/Livewire/Subscription/Actions.php         |  49 +++
 app/Models/Subscription.php                   |  14 +
 .../components/modal-confirmation.blade.php   |   2 +-
 .../livewire/subscription/actions.blade.php   | 305 ++++++++++++------
 .../Feature/SecureCookieAutoDetectionTest.php |  64 ++++
 tests/Feature/TrustHostsMiddlewareTest.php    |  50 +++
 9 files changed, 423 insertions(+), 99 deletions(-)
 create mode 100644 tests/Feature/SecureCookieAutoDetectionTest.php

diff --git a/app/Actions/Stripe/UpdateSubscriptionQuantity.php b/app/Actions/Stripe/UpdateSubscriptionQuantity.php
index f22f56ad0..c181e988d 100644
--- a/app/Actions/Stripe/UpdateSubscriptionQuantity.php
+++ b/app/Actions/Stripe/UpdateSubscriptionQuantity.php
@@ -8,6 +8,10 @@
 
 class UpdateSubscriptionQuantity
 {
+    public const int MAX_SERVER_LIMIT = 100;
+
+    public const int MIN_SERVER_LIMIT = 2;
+
     private StripeClient $stripe;
 
     public function __construct(?StripeClient $stripe = null)
@@ -60,6 +64,7 @@ public function fetchPricePreview(Team $team, int $quantity): array
                     $taxDescription = $taxRate->display_name.' ('.$taxRate->jurisdiction.') '.$taxRate->percentage.'%';
                 }
             }
+            // Fallback tax percentage from invoice totals - use tax_rate details when available for accuracy
             if ($taxPercentage === 0.0 && ($upcomingInvoice->tax ?? 0) > 0 && ($upcomingInvoice->subtotal ?? 0) > 0) {
                 $taxPercentage = round(($upcomingInvoice->tax / $upcomingInvoice->subtotal) * 100, 2);
             }
@@ -110,8 +115,8 @@ public function fetchPricePreview(Team $team, int $quantity): array
      */
     public function execute(Team $team, int $quantity): array
     {
-        if ($quantity < 2) {
-            return ['success' => false, 'error' => 'Minimum server limit is 2.'];
+        if ($quantity < self::MIN_SERVER_LIMIT) {
+            return ['success' => false, 'error' => 'Minimum server limit is '.self::MIN_SERVER_LIMIT.'.'];
         }
 
         $subscription = $team->subscription;
diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.php
index f0b9d67f2..5fca583d9 100644
--- a/app/Http/Middleware/TrustHosts.php
+++ b/app/Http/Middleware/TrustHosts.php
@@ -91,6 +91,13 @@ public function hosts(): array
         // Trust all subdomains of APP_URL as fallback
         $trustedHosts[] = $this->allSubdomainsOfApplicationUrl();
 
+        // Always trust loopback addresses so local access works even when FQDN is configured
+        foreach (['localhost', '127.0.0.1', '[::1]'] as $localHost) {
+            if (! in_array($localHost, $trustedHosts, true)) {
+                $trustedHosts[] = $localHost;
+            }
+        }
+
         return array_filter($trustedHosts);
     }
 }
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index 559dd2fc3..a4764047b 100644
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -25,4 +25,26 @@ class TrustProxies extends Middleware
         Request::HEADER_X_FORWARDED_PORT |
         Request::HEADER_X_FORWARDED_PROTO |
         Request::HEADER_X_FORWARDED_AWS_ELB;
+
+    /**
+     * Handle the request.
+     *
+     * Wraps $next so that after proxy headers are resolved (X-Forwarded-Proto processed),
+     * the Secure cookie flag is auto-enabled when the request is over HTTPS.
+     * This ensures session cookies are correctly marked Secure when behind an HTTPS
+     * reverse proxy (Cloudflare Tunnel, nginx, etc.) even when SESSION_SECURE_COOKIE
+     * is not explicitly set in .env.
+     */
+    public function handle($request, \Closure $next)
+    {
+        return parent::handle($request, function ($request) use ($next) {
+            // At this point proxy headers have been applied to the request,
+            // so $request->secure() correctly reflects the actual protocol.
+            if ($request->secure() && config('session.secure') === null) {
+                config(['session.secure' => true]);
+            }
+
+            return $next($request);
+        });
+    }
 }
diff --git a/app/Livewire/Subscription/Actions.php b/app/Livewire/Subscription/Actions.php
index 4ac95adfb..2d5392240 100644
--- a/app/Livewire/Subscription/Actions.php
+++ b/app/Livewire/Subscription/Actions.php
@@ -5,6 +5,7 @@
 use App\Actions\Stripe\CancelSubscriptionAtPeriodEnd;
 use App\Actions\Stripe\RefundSubscription;
 use App\Actions\Stripe\ResumeSubscription;
+use App\Actions\Stripe\UpdateSubscriptionQuantity;
 use App\Models\Team;
 use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
@@ -14,6 +15,14 @@ class Actions extends Component
 {
     public $server_limits = 0;
 
+    public int $quantity = UpdateSubscriptionQuantity::MIN_SERVER_LIMIT;
+
+    public int $minServerLimit = UpdateSubscriptionQuantity::MIN_SERVER_LIMIT;
+
+    public int $maxServerLimit = UpdateSubscriptionQuantity::MAX_SERVER_LIMIT;
+
+    public ?array $pricePreview = null;
+
     public bool $isRefundEligible = false;
 
     public int $refundDaysRemaining = 0;
@@ -25,6 +34,46 @@ class Actions extends Component
     public function mount(): void
     {
         $this->server_limits = Team::serverLimit();
+        $this->quantity = (int) $this->server_limits;
+    }
+
+    public function loadPricePreview(int $quantity): void
+    {
+        $this->quantity = $quantity;
+        $result = (new UpdateSubscriptionQuantity)->fetchPricePreview(currentTeam(), $quantity);
+        $this->pricePreview = $result['success'] ? $result['preview'] : null;
+    }
+
+    // Password validation is intentionally skipped for quantity updates.
+    // Unlike refunds/cancellations, changing the server limit is a
+    // non-destructive, reversible billing adjustment (prorated by Stripe).
+    public function updateQuantity(string $password = ''): bool
+    {
+        if ($this->quantity < UpdateSubscriptionQuantity::MIN_SERVER_LIMIT) {
+            $this->dispatch('error', 'Minimum server limit is '.UpdateSubscriptionQuantity::MIN_SERVER_LIMIT.'.');
+            $this->quantity = UpdateSubscriptionQuantity::MIN_SERVER_LIMIT;
+
+            return true;
+        }
+
+        if ($this->quantity === (int) $this->server_limits) {
+            return true;
+        }
+
+        $result = (new UpdateSubscriptionQuantity)->execute(currentTeam(), $this->quantity);
+
+        if ($result['success']) {
+            $this->server_limits = $this->quantity;
+            $this->pricePreview = null;
+            $this->dispatch('success', 'Server limit updated to '.$this->quantity.'.');
+
+            return true;
+        }
+
+        $this->dispatch('error', $result['error'] ?? 'Failed to update server limit.');
+        $this->quantity = (int) $this->server_limits;
+
+        return true;
     }
 
     public function loadRefundEligibility(): void
diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index 00f85ced5..69d7cbf0d 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -20,6 +20,20 @@ public function team()
         return $this->belongsTo(Team::class);
     }
 
+    public function billingInterval(): string
+    {
+        if ($this->stripe_plan_id) {
+            $configKey = collect(config('subscription'))
+                ->search($this->stripe_plan_id);
+
+            if ($configKey && str($configKey)->contains('yearly')) {
+                return 'yearly';
+            }
+        }
+
+        return 'monthly';
+    }
+
     public function type()
     {
         if (isStripe()) {
diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index b14888040..e77b52076 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -35,7 +35,7 @@
     $skipPasswordConfirmation = shouldSkipPasswordConfirmation();
     if ($temporaryDisableTwoStepConfirmation) {
         $disableTwoStepConfirmation = false;
-        $skipPasswordConfirmation = false;
+        // Password confirmation requirement is not affected by temporary two-step disable
     }
     // When password step is skipped, Step 2 becomes final - change button text from "Continue" to "Confirm"
     $effectiveStep2ButtonText = ($skipPasswordConfirmation && $step2ButtonText === 'Continue') ? 'Confirm' : $step2ButtonText;
diff --git a/resources/views/livewire/subscription/actions.blade.php b/resources/views/livewire/subscription/actions.blade.php
index 2f33d4f70..4b276aaf6 100644
--- a/resources/views/livewire/subscription/actions.blade.php
+++ b/resources/views/livewire/subscription/actions.blade.php
@@ -1,7 +1,39 @@
 <div wire:init="loadRefundEligibility">
     @if (subscriptionProvider() === 'stripe')
         {{-- Plan Overview --}}
-        <section class="-mt-2">
+        <section x-data="{
+            qty: {{ $quantity }},
+            get current() { return $wire.server_limits; },
+            activeServers: {{ currentTeam()->servers->count() }},
+            preview: @js($pricePreview),
+            loading: false,
+            showModal: false,
+            async fetchPreview() {
+                if (this.qty < 2 || this.qty > 100 || this.qty === this.current) { return; }
+                this.loading = true;
+                this.preview = null;
+                await $wire.loadPricePreview(this.qty);
+                this.preview = $wire.pricePreview;
+                this.loading = false;
+            },
+            fmt(cents) {
+                if (!this.preview) return '';
+                const c = this.preview.currency;
+                return c === 'USD' ? '$' + (cents / 100).toFixed(2) : (cents / 100).toFixed(2) + ' ' + c;
+            },
+            get isReduction() { return this.qty < this.activeServers; },
+            get hasChanged() { return this.qty !== this.current; },
+            get hasPreview() { return this.preview !== null; },
+            openAdjust() {
+                this.showModal = true;
+            },
+            closeAdjust() {
+                this.showModal = false;
+                this.qty = this.current;
+                this.preview = null;
+            }
+        }" @success.window="preview = null; showModal = false; qty = $wire.server_limits"
+            @keydown.escape.window="if (showModal) { closeAdjust(); }" class="-mt-2">
             <h3 class="pb-2">Plan Overview</h3>
             <div class="grid grid-cols-1 gap-4 xl:grid-cols-3">
                 {{-- Current Plan Card --}}
@@ -25,11 +57,12 @@
                     </div>
                 </div>
 
-                {{-- Server Limit Card --}}
-                <div class="p-5 rounded border dark:bg-coolgray-100 bg-white border-neutral-200 dark:border-coolgray-400">
+                {{-- Paid Servers Card --}}
+                <div class="p-5 rounded border dark:bg-coolgray-100 bg-white border-neutral-200 dark:border-coolgray-400 cursor-pointer hover:border-warning/50 transition-colors"
+                    @click="openAdjust()">
                     <div class="text-xs font-bold text-neutral-500 uppercase tracking-wide pb-1">Paid Servers</div>
-                    <div class="text-xl font-bold dark:text-white">{{ $server_limits }}</div>
-                    <div class="pt-2 text-sm text-neutral-500">Included in your plan</div>
+                    <div class="text-xl font-bold dark:text-white" x-text="current"></div>
+                    <div class="pt-2 text-sm text-neutral-500">Click to adjust</div>
                 </div>
 
                 {{-- Active Servers Card --}}
@@ -49,103 +82,183 @@ class="p-5 rounded border dark:bg-coolgray-100 bg-white border-neutral-200 dark:
                     subscription. Excess servers will be deactivated.
                 </x-callout>
             @endif
+
+            {{-- Adjust Server Limit Modal --}}
+            <template x-teleport="body">
+                <div x-show="showModal"
+                    class="fixed top-0 left-0 z-99 flex items-center justify-center w-screen h-screen p-4" x-cloak>
+                    <div x-show="showModal" class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"
+                        @click="closeAdjust()">
+                    </div>
+                    <div x-show="showModal" x-trap.inert.noscroll="showModal"
+                        x-transition:enter="ease-out duration-100"
+                        x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
+                        x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
+                        x-transition:leave="ease-in duration-100"
+                        x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
+                        x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
+                        class="relative w-full border rounded-sm min-w-full lg:min-w-[36rem] max-w-[48rem] max-h-[calc(100vh-2rem)] bg-neutral-100 border-neutral-400 dark:bg-base dark:border-coolgray-300 flex flex-col">
+                        <div class="flex justify-between items-center py-6 px-7 shrink-0">
+                            <h3 class="pr-8 text-2xl font-bold">Adjust Server Limit</h3>
+                            <button @click="closeAdjust()"
+                                class="flex absolute top-2 right-2 justify-center items-center w-8 h-8 rounded-full dark:text-white hover:bg-coolgray-300">
+                                <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" fill="none"
+                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                                </svg>
+                            </button>
+                        </div>
+                        <div class="relative w-auto overflow-y-auto px-7 pb-6 space-y-4"
+                            style="-webkit-overflow-scrolling: touch;">
+                            {{-- Server count input --}}
+                            <div>
+                                <label class="text-xs font-bold text-neutral-500 uppercase tracking-wide">Paid Servers</label>
+                                <div class="flex items-center gap-3 pt-1">
+                                    <input type="number" min="{{ $minServerLimit }}" max="{{ $maxServerLimit }}" step="1"
+                                        x-model.number="qty"
+                                        @input="preview = null"
+                                        @change="qty = Math.min({{ $maxServerLimit }}, Math.max({{ $minServerLimit }}, qty || {{ $minServerLimit }}))"
+                                        class="w-20 px-2 py-1 text-xl font-bold text-center rounded border dark:bg-coolgray-200 dark:border-coolgray-400 border-neutral-200 dark:text-white">
+                                    <x-forms.button
+                                        isHighlighted
+                                        x-bind:disabled="!hasChanged || loading"
+                                        @click="fetchPreview()">
+                                        Calculate Price
+                                    </x-forms.button>
+                                </div>
+                            </div>
+
+                            {{-- Loading --}}
+                            <div x-show="loading" x-cloak>
+                                <x-loading text="Loading price preview..." />
+                            </div>
+
+                            {{-- Price Preview --}}
+                            <div class="space-y-4" x-show="!loading && hasPreview" x-cloak>
+                                <div>
+                                    <div class="text-xs font-bold text-neutral-500 uppercase tracking-wide pb-1.5">Due now</div>
+                                    <div class="flex justify-between gap-6 text-sm font-bold">
+                                        <span class="dark:text-white">Prorated charge</span>
+                                        <span class="dark:text-warning" x-text="fmt(preview.due_now)"></span>
+                                    </div>
+                                    <p class="text-xs text-neutral-500 pt-1">Charged immediately to your payment method.</p>
+                                </div>
+                                <div>
+                                    <div class="text-xs font-bold text-neutral-500 uppercase tracking-wide pb-1.5">Next billing cycle</div>
+                                    <div class="space-y-1.5">
+                                        <div class="flex justify-between gap-6 text-sm">
+                                            <span class="text-neutral-500" x-text="preview.quantity + ' servers × ' + fmt(preview.unit_price)"></span>
+                                            <span class="dark:text-white" x-text="fmt(preview.recurring_subtotal)"></span>
+                                        </div>
+                                        <div class="flex justify-between gap-6 text-sm" x-show="preview?.tax_description" x-cloak>
+                                            <span class="text-neutral-500" x-text="preview?.tax_description"></span>
+                                            <span class="dark:text-white" x-text="fmt(preview?.recurring_tax)"></span>
+                                        </div>
+                                        <div class="flex justify-between gap-6 text-sm font-bold pt-1.5 border-t dark:border-coolgray-400 border-neutral-200">
+                                            <span class="dark:text-white">Total / month</span>
+                                            <span class="dark:text-white" x-text="fmt(preview.recurring_total)"></span>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                {{-- Update Button with Confirmation --}}
+                                <x-modal-confirmation
+                                    title="Confirm Server Limit Update"
+                                    buttonTitle="Update Server Limit"
+                                    submitAction="updateQuantity"
+                                    :confirmWithText="false"
+                                    :confirmWithPassword="false"
+                                    :actions="[
+                                        'Your server limit will be updated immediately.',
+                                        'The prorated amount will be invoiced and charged now.',
+                                    ]"
+                                    warningMessage="This will update your subscription and charge the prorated amount to your payment method."
+                                    step2ButtonText="Confirm & Pay">
+                                    <x-slot:content>
+                                        <x-forms.button @click="$wire.set('quantity', qty)">
+                                            Update Server Limit
+                                        </x-forms.button>
+                                    </x-slot:content>
+                                </x-modal-confirmation>
+                            </div>
+
+                            {{-- Reduction Warning --}}
+                            <div x-show="isReduction" x-cloak>
+                                <x-callout type="danger" title="Warning">
+                                    Reducing below your active server count will deactivate excess servers.
+                                </x-callout>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
         </section>
 
-        {{-- Manage Plan --}}
+        {{-- Billing, Refund & Cancellation --}}
         <section>
-            <h3 class="pb-2">Manage Plan</h3>
-            <div class="flex flex-col gap-3">
-                <div class="flex items-center gap-4">
-                    <x-forms.button class="gap-2" wire:click='stripeCustomerPortal'>
-                        <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" fill="none" viewBox="0 0 24 24"
-                            stroke-width="1.5" stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round"
-                                d="M2.25 8.25h19.5M2.25 9h19.5m-16.5 5.25h6m-6 2.25h3m-3.75 3h15a2.25 2.25 0 0 0 2.25-2.25V6.75A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25v10.5A2.25 2.25 0 0 0 4.5 19.5Z" />
-                        </svg>
-                        Manage Billing on Stripe
-                    </x-forms.button>
-                </div>
-                <p class="text-sm text-neutral-500">Change your server quantity, update payment methods, or view
-                    invoices.</p>
+            <h3 class="pb-2">Manage Subscription</h3>
+            <div class="flex flex-wrap items-center gap-2">
+                {{-- Billing --}}
+                <x-forms.button class="gap-2" wire:click='stripeCustomerPortal'>
+                    <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" fill="none" viewBox="0 0 24 24"
+                        stroke-width="1.5" stroke="currentColor">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="M2.25 8.25h19.5M2.25 9h19.5m-16.5 5.25h6m-6 2.25h3m-3.75 3h15a2.25 2.25 0 0 0 2.25-2.25V6.75A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25v10.5A2.25 2.25 0 0 0 4.5 19.5Z" />
+                    </svg>
+                    Manage Billing on Stripe
+                </x-forms.button>
+
+                {{-- Resume or Cancel --}}
+                @if (currentTeam()->subscription->stripe_cancel_at_period_end)
+                    <x-forms.button wire:click="resumeSubscription">Resume Subscription</x-forms.button>
+                @else
+                    <x-modal-confirmation title="Cancel at End of Billing Period?"
+                        buttonTitle="Cancel at Period End" submitAction="cancelAtPeriodEnd"
+                        :actions="[
+                            'Your subscription will remain active until the end of the current billing period.',
+                            'No further charges will be made after the current period.',
+                            'You can resubscribe at any time.',
+                        ]" confirmationText="{{ currentTeam()->name }}"
+                        confirmationLabel="Enter your team name to confirm"
+                        shortConfirmationLabel="Team Name" step2ButtonText="Confirm Cancellation" />
+                    <x-modal-confirmation title="Cancel Immediately?" buttonTitle="Cancel Immediately"
+                        isErrorButton submitAction="cancelImmediately"
+                        :actions="[
+                            'Your subscription will be cancelled immediately.',
+                            'All servers will be deactivated.',
+                            'No refund will be issued for the remaining period.',
+                        ]" confirmationText="{{ currentTeam()->name }}"
+                        confirmationLabel="Enter your team name to confirm"
+                        shortConfirmationLabel="Team Name" step2ButtonText="Permanently Cancel" />
+                @endif
+
+                {{-- Refund --}}
+                @if ($refundCheckLoading)
+                    <x-loading text="Checking refund..." />
+                @elseif ($isRefundEligible && !currentTeam()->subscription->stripe_cancel_at_period_end)
+                    <x-modal-confirmation title="Request Full Refund?" buttonTitle="Request Full Refund"
+                        isErrorButton submitAction="refundSubscription"
+                        :actions="[
+                            'Your latest payment will be fully refunded.',
+                            'Your subscription will be cancelled immediately.',
+                            'All servers will be deactivated.',
+                        ]" confirmationText="{{ currentTeam()->name }}"
+                        confirmationLabel="Enter your team name to confirm" shortConfirmationLabel="Team Name"
+                        step2ButtonText="Confirm Refund & Cancel" />
+                @endif
             </div>
+
+            {{-- Contextual notes --}}
+            @if ($isRefundEligible && !currentTeam()->subscription->stripe_cancel_at_period_end)
+                <p class="mt-2 text-sm text-neutral-500">Eligible for a full refund &mdash; <strong class="dark:text-warning">{{ $refundDaysRemaining }}</strong> days remaining.</p>
+            @elseif ($refundAlreadyUsed)
+                <p class="mt-2 text-sm text-neutral-500">Refund already processed. Each team is eligible for one refund only.</p>
+            @endif
+            @if (currentTeam()->subscription->stripe_cancel_at_period_end)
+                <p class="mt-2 text-sm text-neutral-500">Your subscription is set to cancel at the end of the billing period.</p>
+            @endif
         </section>
 
-        {{-- Refund Section --}}
-        @if ($refundCheckLoading)
-            <section>
-                <h3 class="pb-2">Refund</h3>
-                <x-loading text="Checking refund eligibility..." />
-            </section>
-        @elseif ($isRefundEligible && !currentTeam()->subscription->stripe_cancel_at_period_end)
-            <section>
-                <h3 class="pb-2">Refund</h3>
-                <div class="flex flex-col gap-3">
-                    <div class="flex items-center gap-4">
-                        <x-modal-confirmation title="Request Full Refund?" buttonTitle="Request Full Refund"
-                            isErrorButton submitAction="refundSubscription"
-                            :actions="[
-                                'Your latest payment will be fully refunded.',
-                                'Your subscription will be cancelled immediately.',
-                                'All servers will be deactivated.',
-                            ]" confirmationText="{{ currentTeam()->name }}"
-                            confirmationLabel="Enter your team name to confirm" shortConfirmationLabel="Team Name"
-                            step2ButtonText="Confirm Refund & Cancel" />
-                    </div>
-                    <p class="text-sm text-neutral-500">You are eligible for a full refund.
-                        <strong class="dark:text-warning">{{ $refundDaysRemaining }}</strong> days remaining
-                        in the 30-day refund window.</p>
-                </div>
-            </section>
-        @elseif ($refundAlreadyUsed)
-            <section>
-                <h3 class="pb-2">Refund</h3>
-                <p class="text-sm text-neutral-500">A refund has already been processed for this team. Each team is
-                    eligible for one refund only to prevent abuse.</p>
-            </section>
-        @endif
-
-        {{-- Resume / Cancel Subscription Section --}}
-        @if (currentTeam()->subscription->stripe_cancel_at_period_end)
-            <section>
-                <h3 class="pb-2">Resume Subscription</h3>
-                <div class="flex flex-col gap-3">
-                    <div class="flex items-center gap-4">
-                        <x-forms.button wire:click="resumeSubscription">Resume Subscription</x-forms.button>
-                    </div>
-                    <p class="text-sm text-neutral-500">Your subscription is set to cancel at the end of the billing
-                        period. Resume to continue your plan.</p>
-                </div>
-            </section>
-        @else
-            <section>
-                <h3 class="pb-2">Cancel Subscription</h3>
-                <div class="flex flex-col gap-3">
-                    <div class="flex flex-wrap items-center gap-2">
-                        <x-modal-confirmation title="Cancel at End of Billing Period?"
-                            buttonTitle="Cancel at Period End" submitAction="cancelAtPeriodEnd"
-                            :actions="[
-                                'Your subscription will remain active until the end of the current billing period.',
-                                'No further charges will be made after the current period.',
-                                'You can resubscribe at any time.',
-                            ]" confirmationText="{{ currentTeam()->name }}"
-                            confirmationLabel="Enter your team name to confirm"
-                            shortConfirmationLabel="Team Name" step2ButtonText="Confirm Cancellation" />
-                        <x-modal-confirmation title="Cancel Immediately?" buttonTitle="Cancel Immediately"
-                            isErrorButton submitAction="cancelImmediately"
-                            :actions="[
-                                'Your subscription will be cancelled immediately.',
-                                'All servers will be deactivated.',
-                                'No refund will be issued for the remaining period.',
-                            ]" confirmationText="{{ currentTeam()->name }}"
-                            confirmationLabel="Enter your team name to confirm"
-                            shortConfirmationLabel="Team Name" step2ButtonText="Permanently Cancel" />
-                    </div>
-                    <p class="text-sm text-neutral-500">Cancel your subscription immediately or at the end of the
-                        current billing period.</p>
-                </div>
-            </section>
-        @endif
-
         <div class="text-sm text-neutral-500">
             Need help? <a class="underline dark:text-white" href="{{ config('constants.urls.contact') }}"
                 target="_blank">Contact us.</a>
diff --git a/tests/Feature/SecureCookieAutoDetectionTest.php b/tests/Feature/SecureCookieAutoDetectionTest.php
new file mode 100644
index 000000000..4db0a7681
--- /dev/null
+++ b/tests/Feature/SecureCookieAutoDetectionTest.php
@@ -0,0 +1,64 @@
+<?php
+
+use App\Models\InstanceSettings;
+use Illuminate\Support\Facades\Cache;
+
+uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
+
+beforeEach(function () {
+    Cache::forget('instance_settings_fqdn_host');
+    InstanceSettings::updateOrCreate(['id' => 0], ['fqdn' => null]);
+    // Ensure session.secure starts unconfigured for each test
+    config(['session.secure' => null]);
+});
+
+it('sets session.secure to true when request arrives over HTTPS via proxy', function () {
+    $this->get('/login', [
+        'X-Forwarded-Proto' => 'https',
+        'X-Forwarded-For' => '1.2.3.4',
+    ]);
+
+    expect(config('session.secure'))->toBeTrue();
+});
+
+it('does not set session.secure for plain HTTP requests', function () {
+    $this->get('/login');
+
+    expect(config('session.secure'))->toBeNull();
+});
+
+it('does not override explicit SESSION_SECURE_COOKIE=false for HTTPS requests', function () {
+    config(['session.secure' => false]);
+
+    $this->get('/login', [
+        'X-Forwarded-Proto' => 'https',
+        'X-Forwarded-For' => '1.2.3.4',
+    ]);
+
+    // Explicit false must not be overridden — our check is `=== null` only
+    expect(config('session.secure'))->toBeFalse();
+});
+
+it('does not override explicit SESSION_SECURE_COOKIE=true', function () {
+    config(['session.secure' => true]);
+
+    $this->get('/login');
+
+    expect(config('session.secure'))->toBeTrue();
+});
+
+it('marks session cookie with Secure flag when accessed over HTTPS proxy', function () {
+    $response = $this->get('/login', [
+        'X-Forwarded-Proto' => 'https',
+        'X-Forwarded-For' => '1.2.3.4',
+    ]);
+
+    $response->assertSuccessful();
+
+    $cookieName = config('session.cookie');
+    $sessionCookie = collect($response->headers->all('set-cookie'))
+        ->first(fn ($c) => str_contains($c, $cookieName));
+
+    expect($sessionCookie)->not->toBeNull()
+        ->and(strtolower($sessionCookie))->toContain('; secure');
+});
diff --git a/tests/Feature/TrustHostsMiddlewareTest.php b/tests/Feature/TrustHostsMiddlewareTest.php
index b745259fe..5c60b30d6 100644
--- a/tests/Feature/TrustHostsMiddlewareTest.php
+++ b/tests/Feature/TrustHostsMiddlewareTest.php
@@ -286,6 +286,56 @@
     expect($response->status())->not->toBe(400);
 });
 
+it('trusts localhost when FQDN is configured', function () {
+    InstanceSettings::updateOrCreate(
+        ['id' => 0],
+        ['fqdn' => 'https://coolify.example.com']
+    );
+
+    $middleware = new TrustHosts($this->app);
+    $hosts = $middleware->hosts();
+
+    expect($hosts)->toContain('localhost');
+});
+
+it('trusts 127.0.0.1 when FQDN is configured', function () {
+    InstanceSettings::updateOrCreate(
+        ['id' => 0],
+        ['fqdn' => 'https://coolify.example.com']
+    );
+
+    $middleware = new TrustHosts($this->app);
+    $hosts = $middleware->hosts();
+
+    expect($hosts)->toContain('127.0.0.1');
+});
+
+it('trusts IPv6 loopback when FQDN is configured', function () {
+    InstanceSettings::updateOrCreate(
+        ['id' => 0],
+        ['fqdn' => 'https://coolify.example.com']
+    );
+
+    $middleware = new TrustHosts($this->app);
+    $hosts = $middleware->hosts();
+
+    expect($hosts)->toContain('[::1]');
+});
+
+it('allows local access via localhost when FQDN is configured and request uses localhost host header', function () {
+    InstanceSettings::updateOrCreate(
+        ['id' => 0],
+        ['fqdn' => 'https://coolify.example.com']
+    );
+
+    $response = $this->get('/', [
+        'Host' => 'localhost',
+    ]);
+
+    // Should NOT be rejected as untrusted host (would be 400)
+    expect($response->status())->not->toBe(400);
+});
+
 it('skips host validation for webhook endpoints', function () {
     // All webhook routes are under /webhooks/* prefix (see RouteServiceProvider)
     // and use cryptographic signature validation instead of host validation