diff --git a/app/Livewire/Dashboard.php b/app/Livewire/Dashboard.php
index 51d964a29..a4bcbe8f6 100644
--- a/app/Livewire/Dashboard.php
+++ b/app/Livewire/Dashboard.php
@@ -2,18 +2,35 @@
 
 namespace App\Livewire;
 
+use App\Models\ApplicationDeploymentQueue;
 use App\Models\Project;
 use App\Models\Server;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Dashboard extends Component
 {
     public $projects = [];
-    public $servers = [];
+    public Collection $servers;
+    public Collection $deployments_per_server;
     public function mount()
     {
         $this->servers = Server::ownedByCurrentTeam()->get();
         $this->projects = Project::ownedByCurrentTeam()->get();
+        $this->get_deployments();
+    }
+    public function get_deployments()
+    {
+        $this->deployments_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn("server_id", $this->servers->pluck("id"))->get([
+            "id",
+            "application_id",
+            "application_name",
+            "deployment_url",
+            "pull_request_id",
+            "server_name",
+            "server_id",
+            "status"
+        ])->sortBy('id');
     }
     // public function getIptables()
     // {
diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php
index fd01790c3..afac72d85 100644
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -54,8 +54,7 @@ class Heading extends Component
         }
         $this->setDeploymentUuid();
         queue_application_deployment(
-            application_id: $this->application->id,
-            server_id: $this->application->destination->server->id,
+            application: $this->application,
             deployment_uuid: $this->deploymentUuid,
             force_rebuild: false,
             is_new_deployment: true,
@@ -83,8 +82,7 @@ class Heading extends Component
         }
         $this->setDeploymentUuid();
         queue_application_deployment(
-            application_id: $this->application->id,
-            server_id: $this->application->destination->server->id,
+            application: $this->application,
             deployment_uuid: $this->deploymentUuid,
             force_rebuild: $force_rebuild,
         );
@@ -113,8 +111,7 @@ class Heading extends Component
     {
         $this->setDeploymentUuid();
         queue_application_deployment(
-            application_id: $this->application->id,
-            server_id: $this->application->destination->server->id,
+            application: $this->application,
             deployment_uuid: $this->deploymentUuid,
             restart_only: true,
             is_new_deployment: true,
@@ -130,8 +127,7 @@ class Heading extends Component
     {
         $this->setDeploymentUuid();
         queue_application_deployment(
-            application_id: $this->application->id,
-            server_id: $this->application->destination->server->id,
+            application: $this->application,
             deployment_uuid: $this->deploymentUuid,
             restart_only: true,
         );
diff --git a/app/Livewire/Project/Application/Previews.php b/app/Livewire/Project/Application/Previews.php
index bd5206100..d057479ea 100644
--- a/app/Livewire/Project/Application/Previews.php
+++ b/app/Livewire/Project/Application/Previews.php
@@ -47,8 +47,7 @@ class Previews extends Component
                 ]);
             }
             queue_application_deployment(
-                application_id: $this->application->id,
-                server_id: $this->application->destination->server->id,
+                application: $this->application,
                 deployment_uuid: $this->deployment_uuid,
                 force_rebuild: false,
                 pull_request_id: $pull_request_id,
diff --git a/app/Livewire/Project/Application/Rollback.php b/app/Livewire/Project/Application/Rollback.php
index 042812760..7bd2d069b 100644
--- a/app/Livewire/Project/Application/Rollback.php
+++ b/app/Livewire/Project/Application/Rollback.php
@@ -24,8 +24,7 @@ class Rollback extends Component
         $deployment_uuid = new Cuid2(7);
 
         queue_application_deployment(
-            application_id: $this->application->id,
-            server_id: $this->application->destination->server->id,
+            application: $this->application,
             deployment_uuid: $deployment_uuid,
             commit: $commit,
             force_rebuild: false,
diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php
index fd3abad48..079c1add8 100644
--- a/bootstrap/helpers/applications.php
+++ b/bootstrap/helpers/applications.php
@@ -6,14 +6,23 @@ use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
+use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 
-function queue_application_deployment(int $application_id, int $server_id, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $is_new_deployment = false)
+function queue_application_deployment(Application $application, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $is_new_deployment = false)
 {
+    $application_id = $application->id;
+    $deployment_link = Url::fromString($application->link() . "/deployment/{$deployment_uuid}");
+    $deployment_url = $deployment_link->getPath();
+    $server_id = $application->destination->server->id;
+    $server_name = $application->destination->server->name;
     $deployment = ApplicationDeploymentQueue::create([
         'application_id' => $application_id,
+        'application_name' => $application->name,
         'server_id' => $server_id,
+        'server_name' => $server_name,
         'deployment_uuid' => $deployment_uuid,
+        'deployment_url' => $deployment_url,
         'pull_request_id' => $pull_request_id,
         'force_rebuild' => $force_rebuild,
         'is_webhook' => $is_webhook,
diff --git a/database/migrations/2024_01_27_164724_add_application_name_and_deployment_url_to_queue.php b/database/migrations/2024_01_27_164724_add_application_name_and_deployment_url_to_queue.php
new file mode 100644
index 000000000..9d4f24a32
--- /dev/null
+++ b/database/migrations/2024_01_27_164724_add_application_name_and_deployment_url_to_queue.php
@@ -0,0 +1,32 @@
+<?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('application_deployment_queues', function (Blueprint $table) {
+            $table->string('application_name')->nullable();
+            $table->string('server_name')->nullable();
+            $table->string('deployment_url')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_deployment_queues', function (Blueprint $table) {
+            $table->dropColumn('application_name');
+            $table->dropColumn('server_name');
+            $table->dropColumn('deployment_url');
+        });
+    }
+};
diff --git a/resources/css/app.css b/resources/css/app.css
index 5778b9529..38a452d85 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -19,7 +19,7 @@ button[isError] {
 }
 
 .main {
-    @apply pt-4 pl-24 pr-10 mx-auto;
+    @apply pt-4 pl-24 pr-10 lg:pr-32 lg:pl-44;
 }
 
 .custom-modal {
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index ee2101449..a5fd6d0e6 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -11,7 +11,7 @@
     @auth
         <livewire:realtime-connection />
     @endauth
-    <main class="pb-10 main max-w-screen-2xl">
+    <main class="pb-10 main">
         {{ $slot }}
     </main>
 @endsection
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index 022a58ff2..29efd46d9 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -11,7 +11,8 @@
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
                     d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
             </svg>
-            <span>Your subscription has been activated! Welcome onboard! <br>It could take a few seconds before your subscription is activated.<br> Please be patient.</span>
+            <span>Your subscription has been activated! Welcome onboard! <br>It could take a few seconds before your
+                subscription is activated.<br> Please be patient.</span>
         </div>
     @endif
     @if ($projects->count() === 0 && $servers->count() === 0)
@@ -29,14 +30,14 @@
     @foreach ($projects as $project)
         <div class="gap-2 border border-transparent cursor-pointer box group">
             @if (data_get($project, 'environments.0.name'))
-                <a  class="flex flex-col flex-1 mx-6 hover:no-underline"
+                <a class="flex flex-col flex-1 mx-6 hover:no-underline"
                     href="{{ route('project.resource.index', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
                     <div class="font-bold text-white">{{ $project->name }}</div>
                     <div class="description">
                         {{ $project->description }}</div>
                 </a>
             @else
-                <a  class="flex flex-col flex-1 mx-6 hover:no-underline"
+                <a class="flex flex-col flex-1 mx-6 hover:no-underline"
                     href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
                     <div class="font-bold text-white">{{ $project->name }}</div>
                     <div class="description">
@@ -44,11 +45,11 @@
                 </a>
             @endif
             <div class="flex items-center">
-                <a  class="mx-4 rounded group-hover:text-white hover:no-underline"
+                <a class="mx-4 rounded group-hover:text-white hover:no-underline"
                     href="{{ route('project.resource.create', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
                     <span class="font-bold hover:text-warning">+ New Resource</span>
                 </a>
-                <a  class="mx-4 rounded group-hover:text-white"
+                <a class="mx-4 rounded group-hover:text-white"
                     href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24"
                         stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -72,12 +73,11 @@
         <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
 @endif
 @foreach ($servers as $server)
-    <a  href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
-        @class([
-            'gap-2 border cursor-pointer box group',
-            'border-transparent' => $server->settings->is_reachable,
-            'border-red-500' => !$server->settings->is_reachable,
-        ])>
+    <a href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}" @class([
+        'gap-2 border cursor-pointer box group',
+        'border-transparent' => $server->settings->is_reachable,
+        'border-red-500' => !$server->settings->is_reachable,
+    ])>
         <div class="flex flex-col mx-6">
             <div class="font-bold text-white">
                 {{ $server->name }}
@@ -99,6 +99,38 @@
         <div class="flex-1"></div>
     </a>
 @endforeach
+<div class="flex items-center gap-2">
+    <h3 class="py-4">Deployments </h3>
+    @if ($deployments_per_server->count() > 0)
+        <x-loading />
+    @endif
+</div>
+<div wire:poll.1000ms="get_deployments" class="grid grid-cols-1 gap-2 lg:grid-cols-3">
+    @forelse ($deployments_per_server as $deployment)
+        <a href="{{ url($deployment->deployment_url) }}" @class([
+            'gap-2 cursor-pointer box group border-l-2 border-dotted',
+            'border-yellow-500' => $deployment->status === 'queued',
+            'border-green-500' => $deployment->status === 'in_progress',
+        ])>
+            <div class="flex flex-col mx-6">
+                <div class="font-bold text-white">
+                    {{ $deployment->application_name }}
+                </div>
+                @if ($deployment->pull_request_id !== 0)
+                    <div class="description">
+                        PR #{{ $deployment->pull_request_id }}
+                    </div>
+                @endif
+                <div class="description">
+                    {{ $deployment->status }} on server {{ $deployment->server_name }}.
+                </div>
+            </div>
+            <div class="flex-1"></div>
+        </a>
+    @empty
+        <div>No queued / in progress deployments</div>
+    @endforelse
+</div>
 </div>
 <script>
     function gotoProject(uuid, environment = 'production') {
diff --git a/routes/api.php b/routes/api.php
index efccce36c..41d64bf31 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -70,8 +70,7 @@ Route::group([
                 $type = $resource->getMorphClass();
                 if ($type === 'App\Models\Application') {
                     queue_application_deployment(
-                        server_id: $resource->destination->server->id,
-                        application_id: $resource->id,
+                        application: $resource,
                         deployment_uuid: new Cuid2(7),
                         force_rebuild: $force,
                     );
diff --git a/routes/webhooks.php b/routes/webhooks.php
index 314d8a06f..be42b71af 100644
--- a/routes/webhooks.php
+++ b/routes/webhooks.php
@@ -151,8 +151,7 @@ Route::post('/source/gitlab/events/manual', function () {
                     ray('Deploying ' . $application->name . ' with branch ' . $branch);
                     $deployment_uuid = new Cuid2(7);
                     queue_application_deployment(
-                        server_id: $application->destination->server->id,
-                        application_id: $application->id,
+                        application: $application,
                         deployment_uuid: $deployment_uuid,
                         force_rebuild: false,
                         is_webhook: true
@@ -180,8 +179,7 @@ Route::post('/source/gitlab/events/manual', function () {
                             ]);
                         }
                         queue_application_deployment(
-                            server_id: $application->destination->server->id,
-                            application_id: $application->id,
+                            application: $application,
                             pull_request_id: $pull_request_id,
                             deployment_uuid: $deployment_uuid,
                             force_rebuild: false,
@@ -300,8 +298,7 @@ Route::post('/source/github/events/manual', function () {
                     ray('Deploying ' . $application->name . ' with branch ' . $branch);
                     $deployment_uuid = new Cuid2(7);
                     queue_application_deployment(
-                        server_id: $application->destination->server->id,
-                        application_id: $application->id,
+                        application: $application,
                         deployment_uuid: $deployment_uuid,
                         force_rebuild: false,
                         is_webhook: true
@@ -324,8 +321,7 @@ Route::post('/source/github/events/manual', function () {
                             ]);
                         }
                         queue_application_deployment(
-                            server_id: $application->destination->server->id,
-                            application_id: $application->id,
+                            application: $application,
                             pull_request_id: $pull_request_id,
                             deployment_uuid: $deployment_uuid,
                             force_rebuild: false,
@@ -430,8 +426,7 @@ Route::post('/source/github/events', function () {
                     ray('Deploying ' . $application->name . ' with branch ' . $branch);
                     $deployment_uuid = new Cuid2(7);
                     queue_application_deployment(
-                        server_id: $application->destination->server->id,
-                        application_id: $application->id,
+                        application: $application,
                         deployment_uuid: $deployment_uuid,
                         force_rebuild: false,
                         is_webhook: true
@@ -454,8 +449,7 @@ Route::post('/source/github/events', function () {
                             ]);
                         }
                         queue_application_deployment(
-                            server_id: $application->destination->server->id,
-                            application_id: $application->id,
+                            application: $application,
                             pull_request_id: $pull_request_id,
                             deployment_uuid: $deployment_uuid,
                             force_rebuild: false,