diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 143ff6d1e..37c73d10f 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -18,7 +18,7 @@ use App\Models\SwarmDocker;
 use App\Notifications\Application\DeploymentFailed;
 use App\Notifications\Application\DeploymentSuccess;
 use App\Traits\ExecuteRemoteCommand;
-use Exception;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/resources/views/livewire/project/application/deployment/index.blade.php b/resources/views/livewire/project/application/deployment/index.blade.php
index 37364ba12..143057280 100644
--- a/resources/views/livewire/project/application/deployment/index.blade.php
+++ b/resources/views/livewire/project/application/deployment/index.blade.php
@@ -1,25 +1,22 @@
 <div>
-    <x-slot:title>
-        {{ data_get_str($application, 'name')->limit(10) }} > Deployments | Coolify
-    </x-slot>
+    <x-slot:title>{{ data_get_str($application, 'name')->limit(10) }} > Deployments | Coolify</x-slot>
     <h1>Deployments</h1>
     <livewire:project.shared.configuration-checker :resource="$application" />
     <livewire:project.application.heading :application="$application" />
-    <div class="flex flex-col gap-2 pb-10"
-        @if ($skip == 0) wire:poll.5000ms='reload_deployments' @endif>
+    <div class="flex flex-col gap-2 pb-10" @if (!$skip) wire:poll.5000ms='reload_deployments' @endif>
         <div class="flex items-end gap-2 pt-4">
             <h2>Deployments <span class="text-xs">({{ $deployments_count }})</span></h2>
             @if ($deployments_count > 0)
-                <x-forms.button disabled="{{ !$show_prev }}" wire:click="previous_page('{{ $default_take }}')"><svg
-                        class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2" d="m14 6l-6 6l6 6z" />
-                    </svg></x-forms.button>
-                <x-forms.button disabled="{{ !$show_next }}" wire:click="next_page('{{ $default_take }}')"><svg
-                        class="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                            stroke-width="2" d="m10 18l6-6l-6-6z" />
-                    </svg></x-forms.button>
+                <x-forms.button disabled="{{ !$show_prev }}" wire:click="previous_page('{{ $default_take }}')">
+                    <svg class="w-6 h-6" viewBox="0 0 24 24">
+                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m14 6l-6 6l6 6z" />
+                    </svg>
+                </x-forms.button>
+                <x-forms.button disabled="{{ !$show_next }}" wire:click="next_page('{{ $default_take }}')">
+                    <svg class="w-6 h-6" viewBox="0 0 24 24">
+                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m10 18l6-6l-6-6z" />
+                    </svg>
+                </x-forms.button>
             @endif
         </div>
         @if ($deployments_count > 0)
@@ -30,25 +27,23 @@
         @endif
         @forelse ($deployments as $deployment)
             <div @class([
-                'dark:bg-coolgray-100 p-2 border-l-2 transition-colors box-without-bg-without-border bg-white flex-col',
+                'p-2 border-l-2 bg-white dark:bg-coolgray-100',
                 'border-blue-500/50 border-dashed' => data_get($deployment, 'status') === 'in_progress',
                 'border-purple-500/50 border-dashed' => data_get($deployment, 'status') === 'queued',
                 'border-white border-dashed' => data_get($deployment, 'status') === 'cancelled-by-user',
                 'border-error' => data_get($deployment, 'status') === 'failed',
                 'border-success' => data_get($deployment, 'status') === 'finished',
             ])>
-                <a href="{{ $current_url . '/' . data_get($deployment, 'deployment_uuid') }}"
-                    wire:navigate
-                    class="block">
-                    <div class="flex flex-col justify-start">
+                <a href="{{ $current_url . '/' . data_get($deployment, 'deployment_uuid') }}" wire:navigate class="block">
+                    <div class="flex flex-col">
                         <div class="flex items-center gap-2 mb-2">
                             <span @class([
-                                'px-3 py-1 rounded-md text-xs font-medium tracking-wide shadow-sm',
-                                'bg-blue-100/80 text-blue-700 dark:bg-blue-500/20 dark:text-blue-300 dark:shadow-blue-900/5' => data_get($deployment, 'status') === 'in_progress',
-                                'bg-purple-100/80 text-purple-700 dark:bg-purple-500/20 dark:text-purple-300 dark:shadow-purple-900/5' => data_get($deployment, 'status') === 'queued',
-                                'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-200 dark:shadow-red-900/5' => data_get($deployment, 'status') === 'failed',
-                                'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-200 dark:shadow-green-900/5' => data_get($deployment, 'status') === 'finished',
-                                'bg-gray-100 text-gray-700 dark:bg-gray-600/30 dark:text-gray-300 dark:shadow-gray-900/5' => data_get($deployment, 'status') === 'cancelled-by-user',
+                                'px-3 py-1 rounded-md text-xs font-medium shadow-sm',
+                                'bg-blue-100/80 text-blue-700 dark:bg-blue-500/20 dark:text-blue-300' => data_get($deployment, 'status') === 'in_progress',
+                                'bg-purple-100/80 text-purple-700 dark:bg-purple-500/20 dark:text-purple-300' => data_get($deployment, 'status') === 'queued',
+                                'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-200' => data_get($deployment, 'status') === 'failed',
+                                'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-200' => data_get($deployment, 'status') === 'finished',
+                                'bg-gray-100 text-gray-700 dark:bg-gray-600/30 dark:text-gray-300' => data_get($deployment, 'status') === 'cancelled-by-user',
                             ])>
                                 @php
                                     $statusText = match(data_get($deployment, 'status')) {
@@ -75,82 +70,77 @@
                         @endif
 
                         <div class="text-gray-600 dark:text-gray-400 text-sm mt-2">
-                            <div class="flex flex-col gap-1">
-                                @if (data_get($deployment, 'commit'))
-                                    <div class="flex flex-col" x-data="{ expanded: false }">
-                                        <div class="flex items-center gap-2">
-                                            <span class="font-medium">Commit:</span>
+                            @if (data_get($deployment, 'commit'))
+                                <div x-data="{ expanded: false }">
+                                    <div class="flex items-center gap-2">
+                                        <span class="font-medium">Commit:</span>
+                                        <a wire:navigate.prevent 
+                                           href="{{ $application->gitCommitLink(data_get($deployment, 'commit')) }}" 
+                                           target="_blank"
+                                           class="underline">
+                                            {{ substr(data_get($deployment, 'commit'), 0, 7) }}
+                                        </a>
+                                        @if (!$deployment->commitMessage())
+                                            <span class="bg-gray-200/70 dark:bg-gray-600/20 px-2 py-0.5 rounded-md text-xs text-gray-800 dark:text-gray-100 border border-gray-400/30">
+                                                @if (data_get($deployment, 'is_webhook'))
+                                                    Webhook
+                                                    @if (data_get($deployment, 'pull_request_id'))
+                                                        | Pull Request #{{ data_get($deployment, 'pull_request_id') }}
+                                                    @endif
+                                                @elseif (data_get($deployment, 'pull_request_id'))
+                                                    Pull Request #{{ data_get($deployment, 'pull_request_id') }}
+                                                @elseif (data_get($deployment, 'rollback') === true)
+                                                    Rollback
+                                                @elseif (data_get($deployment, 'is_api'))
+                                                    API
+                                                @else
+                                                    Manual
+                                                @endif
+                                            </span>
+                                        @endif
+                                        @if ($deployment->commitMessage())
+                                            <span class="text-gray-600 dark:text-gray-400">-</span>
                                             <a wire:navigate.prevent 
                                                href="{{ $application->gitCommitLink(data_get($deployment, 'commit')) }}" 
                                                target="_blank"
-                                               class="underline"
-                                               >
-                                                {{ substr(data_get($deployment, 'commit'), 0, 7) }}
+                                               class="text-gray-600 dark:text-gray-400 truncate max-w-md underline">
+                                                {{ Str::before($deployment->commitMessage(), "\n") }}
                                             </a>
-                                            @if (!$deployment->commitMessage())
-                                                <span class="bg-gray-200/70 dark:bg-gray-600/20 px-2 py-0.5 rounded-md text-xs text-gray-800 dark:text-gray-100 border border-gray-400/30 dark:border-gray-500/30 font-medium backdrop-blur-sm">
-                                                    @if (data_get($deployment, 'is_webhook'))
-                                                        Webhook
-                                                        @if (data_get($deployment, 'pull_request_id'))
-                                                            | Pull Request #{{ data_get($deployment, 'pull_request_id') }}
-                                                        @endif
-                                                    @elseif (data_get($deployment, 'pull_request_id'))
-                                                        Pull Request #{{ data_get($deployment, 'pull_request_id') }}
-                                                    @elseif (data_get($deployment, 'rollback') === true)
-                                                        Rollback
-                                                    @elseif (data_get($deployment, 'is_api'))
-                                                        API
-                                                    @else
-                                                        Manual
+                                            <button @click="expanded = !expanded"
+                                                class="text-gray-600 dark:text-gray-400 flex items-center gap-1">
+                                                <svg x-bind:class="{'rotate-180': expanded}" class="w-4 h-4 transition-transform" viewBox="0 0 24 24">
+                                                    <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m6 9l6 6l6-6"/>
+                                                </svg>
+                                            </button>
+                                            <span class="bg-gray-200/70 dark:bg-gray-600/20 px-2 py-0.5 rounded-md text-xs text-gray-800 dark:text-gray-100 border border-gray-400/30">
+                                                @if (data_get($deployment, 'is_webhook'))
+                                                    Webhook
+                                                    @if (data_get($deployment, 'pull_request_id'))
+                                                        | Pull Request #{{ data_get($deployment, 'pull_request_id') }}
                                                     @endif
-                                                </span>
-                                            @endif
-                                            @if ($deployment->commitMessage())
-                                                <span class="text-sm text-gray-600 dark:text-gray-400">-</span>
-                                                <a wire:navigate.prevent 
-                                                   href="{{ $application->gitCommitLink(data_get($deployment, 'commit')) }}" 
-                                                   target="_blank"
-                                                   class="text-sm text-gray-600 dark:text-gray-400 truncate max-w-md underline"
-                                                   >
-                                                    {{ Str::before($deployment->commitMessage(), "\n") }}
-                                                </a>
-                                                <button 
-                                                    @click="expanded = !expanded"
-                                                    class="text-sm text-gray-600 dark:text-gray-400 flex items-center gap-1 ">
-                                                    <svg x-bind:class="{'rotate-180': expanded}" class="w-4 h-4 transition-transform" viewBox="0 0 24 24">
-                                                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m6 9l6 6l6-6"/>
-                                                    </svg>
-                                                </button>
-                                                <span class="bg-gray-200/70 dark:bg-gray-600/20 px-2 py-0.5 rounded-md text-xs text-gray-800 dark:text-gray-100 border border-gray-400/30 dark:border-gray-500/30 font-medium backdrop-blur-sm">
-                                                    @if (data_get($deployment, 'is_webhook'))
-                                                        Webhook
-                                                        @if (data_get($deployment, 'pull_request_id'))
-                                                            | Pull Request #{{ data_get($deployment, 'pull_request_id') }}
-                                                        @endif
-                                                    @elseif (data_get($deployment, 'pull_request_id'))
-                                                        Pull Request #{{ data_get($deployment, 'pull_request_id') }}
-                                                    @elseif (data_get($deployment, 'rollback') === true)
-                                                        Rollback
-                                                    @elseif (data_get($deployment, 'is_api'))
-                                                        API
-                                                    @else
-                                                        Manual
-                                                    @endif
-                                                </span>
-                                            @endif
-                                        </div>
-                                        @if ($deployment->commitMessage())
-                                            <div x-show="expanded" 
-                                                 x-transition:enter="transition ease-out duration-200"
-                                                 x-transition:enter-start="opacity-0 transform -translate-y-2"
-                                                 x-transition:enter-end="opacity-100 transform translate-y-0"
-                                                 class="mt-2 ml-4 text-sm text-gray-600 dark:text-gray-400">
-                                                {{ Str::after($deployment->commitMessage(), "\n") }}
-                                            </div>
+                                                @elseif (data_get($deployment, 'pull_request_id'))
+                                                    Pull Request #{{ data_get($deployment, 'pull_request_id') }}
+                                                @elseif (data_get($deployment, 'rollback') === true)
+                                                    Rollback
+                                                @elseif (data_get($deployment, 'is_api'))
+                                                    API
+                                                @else
+                                                    Manual
+                                                @endif
+                                            </span>
                                         @endif
                                     </div>
-                                @endif
-                            </div>
+                                    @if ($deployment->commitMessage())
+                                        <div x-show="expanded" 
+                                             x-transition:enter="transition ease-out duration-200"
+                                             x-transition:enter-start="opacity-0 transform -translate-y-2"
+                                             x-transition:enter-end="opacity-100 transform translate-y-0"
+                                             class="mt-2 ml-4 text-gray-600 dark:text-gray-400">
+                                            {{ Str::after($deployment->commitMessage(), "\n") }}
+                                        </div>
+                                    @endif
+                                </div>
+                            @endif
                         </div>
 
                         @if (data_get($deployment, 'server_name') && $application->additional_servers->count() > 0)
@@ -162,7 +152,7 @@
                 </a>
             </div>
         @empty
-            <div class="">No deployments found</div>
+            <div>No deployments found</div>
         @endforelse
     </div>
 </div>
diff --git a/resources/views/livewire/server/docker-cleanup.blade.php b/resources/views/livewire/server/docker-cleanup.blade.php
index da3f8bcba..cdf48c6aa 100644
--- a/resources/views/livewire/server/docker-cleanup.blade.php
+++ b/resources/views/livewire/server/docker-cleanup.blade.php
@@ -79,4 +79,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>