diff --git a/app/Http/Controllers/Api/Deploy.php b/app/Http/Controllers/Api/Deploy.php
index 27d4b1ea0..21da51d66 100644
--- a/app/Http/Controllers/Api/Deploy.php
+++ b/app/Http/Controllers/Api/Deploy.php
@@ -14,7 +14,7 @@
 use Illuminate\Support\Collection;
 use Visus\Cuid2\Cuid2;
 
-class APIDeploy extends Controller
+class Deploy extends Controller
 {
     public function deploy(Request $request)
     {
diff --git a/app/Http/Controllers/Api/Project.php b/app/Http/Controllers/Api/Project.php
index 110e51803..fa2ba34bb 100644
--- a/app/Http/Controllers/Api/Project.php
+++ b/app/Http/Controllers/Api/Project.php
@@ -6,7 +6,7 @@
 use App\Models\Project as ModelsProject;
 use Illuminate\Http\Request;
 
-class APIProject extends Controller
+class Project extends Controller
 {
     public function projects(Request $request)
     {
diff --git a/app/Http/Controllers/Api/Server.php b/app/Http/Controllers/Api/Server.php
index bab37928f..e7b071a43 100644
--- a/app/Http/Controllers/Api/Server.php
+++ b/app/Http/Controllers/Api/Server.php
@@ -6,7 +6,7 @@
 use App\Models\Server as ModelsServer;
 use Illuminate\Http\Request;
 
-class APIServer extends Controller
+class Server extends Controller
 {
     public function servers(Request $request)
     {
diff --git a/app/Livewire/Project/Shared/GetLogs.php b/app/Livewire/Project/Shared/GetLogs.php
index b1398f909..5a2053fc4 100644
--- a/app/Livewire/Project/Shared/GetLogs.php
+++ b/app/Livewire/Project/Shared/GetLogs.php
@@ -23,6 +23,7 @@ class GetLogs extends Component
     public ServiceApplication|ServiceDatabase|null $servicesubtype = null;
     public Server $server;
     public ?string $container = null;
+    public ?string $pull_request = null;
     public ?bool $streamLogs = false;
     public ?bool $showTimeStamps = true;
     public int $numberOfLines = 100;
@@ -70,7 +71,14 @@ public function instantSave()
     }
     public function getLogs($refresh = false)
     {
-        if (!$refresh && $this->resource?->getMorphClass() === 'App\Models\Service') return;
+        if ($this->resource?->getMorphClass() === 'App\Models\Application') {
+            if (str($this->container)->contains('-pr-')) {
+                $this->pull_request = "Pull Request: " . str($this->container)->afterLast('-pr-')->beforeLast('_')->value();
+            } else {
+                $this->pull_request = 'branch';
+            }
+        }
+        if (!$refresh && ($this->resource?->getMorphClass() === 'App\Models\Service' || str($this->container)->contains('-pr-'))) return;
         if ($this->container) {
             if ($this->showTimeStamps) {
                 if ($this->server->isSwarm()) {
diff --git a/app/Livewire/Project/Shared/Logs.php b/app/Livewire/Project/Shared/Logs.php
index 19edbdd7b..3b9a121b8 100644
--- a/app/Livewire/Project/Shared/Logs.php
+++ b/app/Livewire/Project/Shared/Logs.php
@@ -41,13 +41,19 @@ public function mount()
                     ]
                 ]);
             } else {
-                $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, 0);
+                $containers = getCurrentApplicationContainerStatus($this->server, $this->resource->id, includePullrequests: true);
             }
             if ($containers->count() > 0) {
                 $containers->each(function ($container) {
                     $this->containers->push(str_replace('/', '', $container['Names']));
                 });
             }
+            $this->containers = $this->containers->sortByDesc(function ($container) {
+                if (str_contains($container, '-pr-')) {
+                    return explode('-pr-', $container)[1];
+                }
+                return $container;
+            });
         } else if (data_get($this->parameters, 'database_uuid')) {
             $this->type = 'database';
             $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
@@ -70,21 +76,15 @@ public function mount()
             $this->status = $this->resource->status;
             $this->server = $this->resource->destination->server;
             $this->container = $this->resource->uuid;
-            // if (str(data_get($this, 'resource.status'))->startsWith('running')) {
-                $this->containers->push($this->container);
-            // }
+            $this->containers->push($this->container);
         } else if (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
             $this->resource->applications()->get()->each(function ($application) {
-                // if (str(data_get($application, 'status'))->contains('running')) {
-                    $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
+                $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
             });
             $this->resource->databases()->get()->each(function ($database) {
-                // if (str(data_get($database, 'status'))->contains('running')) {
-                    $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-                // }
+                $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
             });
 
             $this->server = $this->resource->server;
diff --git a/app/Livewire/Tags/Show.php b/app/Livewire/Tags/Show.php
index c0c975f6d..05b25955a 100644
--- a/app/Livewire/Tags/Show.php
+++ b/app/Livewire/Tags/Show.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Tags;
 
-use App\Http\Controllers\Api\APIDeploy as Deploy;
+use App\Http\Controllers\Api\Deploy;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Tag;
 use Livewire\Component;
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index 6a3e3f839..008bd4d7f 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -8,18 +8,21 @@
 use Illuminate\Support\Str;
 use Spatie\Url\Url;
 
-function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null): Collection
+function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null, ?bool $includePullrequests = false): Collection
 {
     $containers = collect([]);
     if (!$server->isSwarm()) {
         $containers = instant_remote_process(["docker ps -a --filter='label=coolify.applicationId={$id}' --format '{{json .}}' "], $server);
         $containers = format_docker_command_output_to_json($containers);
-        $containers = $containers->map(function ($container) use ($pullRequestId) {
+        $containers = $containers->map(function ($container) use ($pullRequestId, $includePullrequests) {
             $labels = data_get($container, 'Labels');
             if (!str($labels)->contains("coolify.pullRequestId=")) {
                 data_set($container, 'Labels', $labels . ",coolify.pullRequestId={$pullRequestId}");
                 return $container;
             }
+            if ($includePullrequests) {
+                return $container;
+            }
             if (str($labels)->contains("coolify.pullRequestId=$pullRequestId")) {
                 return $container;
             }
diff --git a/config/sentry.php b/config/sentry.php
index 96c7207e0..c216bb219 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.226',
+    'release' => '4.0.0-beta.227',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index b0f6d7453..3a84eb6f2 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.226';
+return '4.0.0-beta.227';
diff --git a/resources/views/livewire/project/application/previews.blade.php b/resources/views/livewire/project/application/previews.blade.php
index dfa76cc83..6aa9f1d28 100644
--- a/resources/views/livewire/project/application/previews.blade.php
+++ b/resources/views/livewire/project/application/previews.blade.php
@@ -86,15 +86,21 @@ class="text-warning">{{ $application->destination->server->name }}</span>.</div>
                                 Redeploy
                             @endif
                         </x-forms.button>
-                        <x-forms.button class="bg-coolgray-500"
-                            wire:click="stop({{ data_get($preview, 'pull_request_id') }})">Remove Preview
-                        </x-forms.button>
                         <a
                             href="{{ route('project.application.deployment.index', [...$parameters, 'pull_request_id' => data_get($preview, 'pull_request_id')]) }}">
                             <x-forms.button class="bg-coolgray-500">
-                                Get Deployment Logs
+                                Deployment Logs
                             </x-forms.button>
                         </a>
+                        <a
+                            href="{{ route('project.application.logs', [...$parameters, 'pull_request_id' => data_get($preview, 'pull_request_id')]) }}">
+                            <x-forms.button class="bg-coolgray-500">
+                                Application Logs
+                            </x-forms.button>
+                        </a>
+                        <x-forms.button isError class="bg-coolgray-500"
+                            wire:click="stop({{ data_get($preview, 'pull_request_id') }})">Delete
+                        </x-forms.button>
                     </div>
                 </div>
             @endforeach
diff --git a/resources/views/livewire/project/shared/get-logs.blade.php b/resources/views/livewire/project/shared/get-logs.blade.php
index 9ca5c6abb..0cbd317b4 100644
--- a/resources/views/livewire/project/shared/get-logs.blade.php
+++ b/resources/views/livewire/project/shared/get-logs.blade.php
@@ -1,23 +1,26 @@
 <div>
-    <div x-init="$wire.getLogs">
-        <div class="flex gap-2">
-            <h4>Container: {{ $container }}</h4>
+    <div x-init="$wire.getLogs" id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }">
+        <div class="flex items-center gap-2">
+            <h3>{{ $container }}</h3>
+            @if ($pull_request)
+                <div>({{ $pull_request }})</div>
+            @endif
             @if ($streamLogs)
                 <span wire:poll.2000ms='getLogs(true)' class="loading loading-xs text-warning loading-spinner"></span>
             @endif
         </div>
-        <div class="flex gap-2">
+        <form wire:submit='getLogs(true)' class="flex items-end gap-2 pt-2 ">
+            <div class="w-96">
+                <x-forms.input label="Only Show Number of Lines" placeholder="1000" required
+                    id="numberOfLines"></x-forms.input>
+            </div>
+            <x-forms.button type="submit">Refresh</x-forms.button>
             <x-forms.checkbox instantSave label="Stream Logs" id="streamLogs"></x-forms.checkbox>
             <x-forms.checkbox instantSave label="Include Timestamps" id="showTimeStamps"></x-forms.checkbox>
-        </div>
-        <form wire:submit='getLogs(true)' class="flex items-end gap-2">
-            <x-forms.input label="Only Show Number of Lines" placeholder="1000" required
-                id="numberOfLines"></x-forms.input>
-            <x-forms.button type="submit">Refresh</x-forms.button>
         </form>
-        <div id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }" :class="fullscreen ? 'fullscreen' : 'w-full py-4 mx-auto'">
-            <div class="relative flex flex-col-reverse w-full p-4 pt-6 overflow-y-auto text-white bg-coolgray-100 scrollbar border-coolgray-300"
-                :class="fullscreen ? '' : 'max-h-[40rem] border border-solid rounded'">
+        <div :class="fullscreen ? 'fullscreen' : 'relative w-full py-4 mx-auto'">
+            <div class="flex flex-col-reverse w-full px-4 py-2 overflow-y-auto text-white bg-coolgray-100 scrollbar border-coolgray-300"
+                :class="fullscreen ? '' : 'max-h-96 border border-solid rounded'">
                 <button title="Minimize" x-show="fullscreen" class="fixed top-4 right-4"
                     x-on:click="makeFullscreen"><svg class="icon" viewBox="0 0 24 24"
                         xmlns="http://www.w3.org/2000/svg">
@@ -36,8 +39,8 @@ class="fixed top-4 right-16" x-on:click="toggleScroll"><svg class="icon" viewBox
                             stroke-width="2" d="M12 5v14m4-4l-4 4m-4-4l4 4" />
                     </svg></button>
 
-                <button title="Fullscreen" x-show="!fullscreen" class="absolute top-2 right-2"
-                    x-on:click="makeFullscreen"><svg class=" icon" viewBox="0 0 24 24"
+                <button title="Fullscreen" x-show="!fullscreen" class="absolute top-6 right-4"
+                    x-on:click="makeFullscreen"><svg class="icon" viewBox="0 0 24 24"
                         xmlns="http://www.w3.org/2000/svg">
                         <g fill="none">
                             <path
@@ -46,7 +49,11 @@ class="fixed top-4 right-16" x-on:click="toggleScroll"><svg class="icon" viewBox
                                 d="M9.793 12.793a1 1 0 0 1 1.497 1.32l-.083.094L6.414 19H9a1 1 0 0 1 .117 1.993L9 21H4a1 1 0 0 1-.993-.883L3 20v-5a1 1 0 0 1 1.993-.117L5 15v2.586l4.793-4.793ZM20 3a1 1 0 0 1 .993.883L21 4v5a1 1 0 0 1-1.993.117L19 9V6.414l-4.793 4.793a1 1 0 0 1-1.497-1.32l.083-.094L17.586 5H15a1 1 0 0 1-.117-1.993L15 3h5Z" />
                         </g>
                     </svg></button>
-                <pre id="logs" class="font-mono whitespace-pre-wrap">{{ $outputs }}</pre>
+                @if ($outputs)
+                    <pre id="logs" class="font-mono whitespace-pre-wrap">{{ $outputs }}</pre>
+                @else
+                    <pre id="logs" class="font-mono whitespace-pre-wrap">Refresh to get the logs...</pre>
+                @endif
             </div>
         </div>
         <script>
diff --git a/routes/api.php b/routes/api.php
index 004c62abf..4ef5500f8 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Http\Controllers\Api\APIDeploy as Deploy;
-use App\Http\Controllers\Api\APIProject as Project;
-use App\Http\Controllers\Api\APIServer as Server;
+use App\Http\Controllers\Api\Deploy;
+use App\Http\Controllers\Api\Project;
+use App\Http\Controllers\Api\Server;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
diff --git a/versions.json b/versions.json
index f26a88b43..7e7720f04 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.226"
+            "version": "4.0.0-beta.227"
         }
     }
 }