diff --git a/app/Actions/Service/StopService.php b/app/Actions/Service/StopService.php
index e1ce9eba1..a16e41db1 100644
--- a/app/Actions/Service/StopService.php
+++ b/app/Actions/Service/StopService.php
@@ -10,24 +10,32 @@ class StopService
     use AsAction;
     public function handle(Service $service)
     {
-        $server = $service->destination->server;
-        if (!$server->isFunctional()) {
-            return 'Server is not functional';
+        try {
+            throw new \Exception('Not implemented');
+            $server = $service->destination->server;
+            if (!$server->isFunctional()) {
+                return 'Server is not functional';
+            }
+            ray('Stopping service: ' . $service->name);
+            $applications = $service->applications()->get();
+            foreach ($applications as $application) {
+                instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);
+                $application->update(['status' => 'exited']);
+            }
+            $dbs = $service->databases()->get();
+            foreach ($dbs as $db) {
+                instant_remote_process(["docker rm -f {$db->name}-{$service->uuid}"], $service->server);
+                $db->update(['status' => 'exited']);
+            }
+            instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
+            instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
+            // TODO: make notification for databases
+            // $service->environment->project->team->notify(new StatusChanged($service));
+        } catch (\Exception $e) {
+            echo $e->getMessage();
+            ray($e->getMessage());
+            return $e->getMessage();
         }
-        ray('Stopping service: ' . $service->name);
-        $applications = $service->applications()->get();
-        foreach ($applications as $application) {
-            instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server);
-            $application->update(['status' => 'exited']);
-        }
-        $dbs = $service->databases()->get();
-        foreach ($dbs as $db) {
-            instant_remote_process(["docker rm -f {$db->name}-{$service->uuid}"], $service->server);
-            $db->update(['status' => 'exited']);
-        }
-        instant_remote_process(["docker network disconnect {$service->uuid} coolify-proxy 2>/dev/null"], $service->server, false);
-        instant_remote_process(["docker network rm {$service->uuid} 2>/dev/null"], $service->server, false);
-        // TODO: make notification for databases
-        // $service->environment->project->team->notify(new StatusChanged($service));
+
     }
 }
diff --git a/app/Console/Commands/CleanupStuckedResources.php b/app/Console/Commands/CleanupStuckedResources.php
index 1674c01d8..38d87e24b 100644
--- a/app/Console/Commands/CleanupStuckedResources.php
+++ b/app/Console/Commands/CleanupStuckedResources.php
@@ -20,7 +20,8 @@ class CleanupStuckedResources extends Command
 
     public function handle()
     {
-        echo "Running cleanup stucked...\n";
+        ray('Running cleanup stucked resources.');
+        echo "Running cleanup stucked resources.\n";
         $this->cleanup_stucked_resources();
     }
     private function cleanup_stucked_resources()
@@ -113,18 +114,18 @@ class CleanupStuckedResources extends Command
             $applications = Application::all();
             foreach ($applications as $application) {
                 if (!data_get($application, 'environment')) {
-                    echo 'Application without environment: ' . $application->name . ' soft deleting\n';
-                    $application->delete();
+                    echo 'Application without environment: ' . $application->name . '\n';
+                    $application->forceDelete();
                     continue;
                 }
                 if (!$application->destination()) {
-                    echo 'Application without destination: ' . $application->name . ' soft deleting\n';
-                    $application->delete();
+                    echo 'Application without destination: ' . $application->name . '\n';
+                    $application->forceDelete();
                     continue;
                 }
                 if (!data_get($application, 'destination.server')) {
-                    echo 'Application without server: ' . $application->name . ' soft deleting\n';
-                    $application->delete();
+                    echo 'Application without server: ' . $application->name . '\n';
+                    $application->forceDelete();
                     continue;
                 }
             }
@@ -135,18 +136,18 @@ class CleanupStuckedResources extends Command
             $postgresqls = StandalonePostgresql::all()->where('id', '!=', 0);
             foreach ($postgresqls as $postgresql) {
                 if (!data_get($postgresql, 'environment')) {
-                    echo 'Postgresql without environment: ' . $postgresql->name . ' soft deleting\n';
-                    $postgresql->delete();
+                    echo 'Postgresql without environment: ' . $postgresql->name . '\n';
+                    $postgresql->forceDelete();
                     continue;
                 }
                 if (!$postgresql->destination()) {
-                    echo 'Postgresql without destination: ' . $postgresql->name . ' soft deleting\n';
-                    $postgresql->delete();
+                    echo 'Postgresql without destination: ' . $postgresql->name . '\n';
+                    $postgresql->forceDelete();
                     continue;
                 }
                 if (!data_get($postgresql, 'destination.server')) {
-                    echo 'Postgresql without server: ' . $postgresql->name . ' soft deleting\n';
-                    $postgresql->delete();
+                    echo 'Postgresql without server: ' . $postgresql->name . '\n';
+                    $postgresql->forceDelete();
                     continue;
                 }
             }
@@ -157,18 +158,18 @@ class CleanupStuckedResources extends Command
             $redis = StandaloneRedis::all();
             foreach ($redis as $redis) {
                 if (!data_get($redis, 'environment')) {
-                    echo 'Redis without environment: ' . $redis->name . ' soft deleting\n';
-                    $redis->delete();
+                    echo 'Redis without environment: ' . $redis->name . '\n';
+                    $redis->forceDelete();
                     continue;
                 }
                 if (!$redis->destination()) {
-                    echo 'Redis without destination: ' . $redis->name . ' soft deleting\n';
-                    $redis->delete();
+                    echo 'Redis without destination: ' . $redis->name . '\n';
+                    $redis->forceDelete();
                     continue;
                 }
                 if (!data_get($redis, 'destination.server')) {
-                    echo 'Redis without server: ' . $redis->name . ' soft deleting\n';
-                    $redis->delete();
+                    echo 'Redis without server: ' . $redis->name . '\n';
+                    $redis->forceDelete();
                     continue;
                 }
             }
@@ -180,18 +181,18 @@ class CleanupStuckedResources extends Command
             $mongodbs = StandaloneMongodb::all();
             foreach ($mongodbs as $mongodb) {
                 if (!data_get($mongodb, 'environment')) {
-                    echo 'Mongodb without environment: ' . $mongodb->name . ' soft deleting\n';
-                    $mongodb->delete();
+                    echo 'Mongodb without environment: ' . $mongodb->name . '\n';
+                    $mongodb->forceDelete();
                     continue;
                 }
                 if (!$mongodb->destination()) {
-                    echo 'Mongodb without destination: ' . $mongodb->name . ' soft deleting\n';
-                    $mongodb->delete();
+                    echo 'Mongodb without destination: ' . $mongodb->name . '\n';
+                    $mongodb->forceDelete();
                     continue;
                 }
                 if (!data_get($mongodb, 'destination.server')) {
-                    echo 'Mongodb without server:  ' . $mongodb->name . ' soft deleting\n';
-                    $mongodb->delete();
+                    echo 'Mongodb without server:  ' . $mongodb->name . '\n';
+                    $mongodb->forceDelete();
                     continue;
                 }
             }
@@ -203,18 +204,18 @@ class CleanupStuckedResources extends Command
             $mysqls = StandaloneMysql::all();
             foreach ($mysqls as $mysql) {
                 if (!data_get($mysql, 'environment')) {
-                    echo 'Mysql without environment: ' . $mysql->name . ' soft deleting\n';
-                    $mysql->delete();
+                    echo 'Mysql without environment: ' . $mysql->name . '\n';
+                    $mysql->forceDelete();
                     continue;
                 }
                 if (!$mysql->destination()) {
-                    echo 'Mysql without destination: ' . $mysql->name . ' soft deleting\n';
-                    $mysql->delete();
+                    echo 'Mysql without destination: ' . $mysql->name . '\n';
+                    $mysql->forceDelete();
                     continue;
                 }
                 if (!data_get($mysql, 'destination.server')) {
-                    echo 'Mysql without server: ' . $mysql->name . ' soft deleting\n';
-                    $mysql->delete();
+                    echo 'Mysql without server: ' . $mysql->name . '\n';
+                    $mysql->forceDelete();
                     continue;
                 }
             }
@@ -226,18 +227,18 @@ class CleanupStuckedResources extends Command
             $mariadbs = StandaloneMariadb::all();
             foreach ($mariadbs as $mariadb) {
                 if (!data_get($mariadb, 'environment')) {
-                    echo 'Mariadb without environment: ' . $mariadb->name . ' soft deleting\n';
-                    $mariadb->delete();
+                    echo 'Mariadb without environment: ' . $mariadb->name . '\n';
+                    $mariadb->forceDelete();
                     continue;
                 }
                 if (!$mariadb->destination()) {
-                    echo 'Mariadb without destination: ' . $mariadb->name . ' soft deleting\n';
-                    $mariadb->delete();
+                    echo 'Mariadb without destination: ' . $mariadb->name . '\n';
+                    $mariadb->forceDelete();
                     continue;
                 }
                 if (!data_get($mariadb, 'destination.server')) {
-                    echo 'Mariadb without server: ' . $mariadb->name . ' soft deleting\n';
-                    $mariadb->delete();
+                    echo 'Mariadb without server: ' . $mariadb->name . '\n';
+                    $mariadb->forceDelete();
                     continue;
                 }
             }
@@ -249,18 +250,18 @@ class CleanupStuckedResources extends Command
             $services = Service::all();
             foreach ($services as $service) {
                 if (!data_get($service, 'environment')) {
-                    echo 'Service without environment: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'Service without environment: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
                 if (!$service->destination()) {
-                    echo 'Service without destination: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'Service without destination: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
                 if (!data_get($service, 'server')) {
-                    echo 'Service without server: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'Service without server: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
             }
@@ -271,8 +272,8 @@ class CleanupStuckedResources extends Command
             $serviceApplications = ServiceApplication::all();
             foreach ($serviceApplications as $service) {
                 if (!data_get($service, 'service')) {
-                    echo 'ServiceApplication without service: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'ServiceApplication without service: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
             }
@@ -283,8 +284,8 @@ class CleanupStuckedResources extends Command
             $serviceDatabases = ServiceDatabase::all();
             foreach ($serviceDatabases as $service) {
                 if (!data_get($service, 'service')) {
-                    echo 'ServiceDatabase without service: ' . $service->name . ' soft deleting\n';
-                    $service->delete();
+                    echo 'ServiceDatabase without service: ' . $service->name . '\n';
+                    $service->forceDelete();
                     continue;
                 }
             }
diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php
index 7260ec5fc..315f256c0 100644
--- a/app/Console/Commands/Init.php
+++ b/app/Console/Commands/Init.php
@@ -28,8 +28,6 @@ class Init extends Command
             return;
         }
         if ($full_cleanup) {
-            echo "Running init cleanupsg.\n";
-
             // Required for falsely deleted coolify db
             $this->restore_coolify_db_backup();
             $this->cleanup_in_progress_application_deployments();
@@ -52,7 +50,6 @@ class Init extends Command
             }
             return;
         }
-        echo "Running cleanups.\n";
         $this->cleanup_stucked_helper_containers();
         $this->call('cleanup:stucked-resources');
     }
diff --git a/app/Jobs/DeleteResourceJob.php b/app/Jobs/DeleteResourceJob.php
index 35d98412f..b84f66dfa 100644
--- a/app/Jobs/DeleteResourceJob.php
+++ b/app/Jobs/DeleteResourceJob.php
@@ -19,6 +19,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Artisan;
 
 class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
 {
@@ -49,8 +50,11 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
                     break;
             }
         } catch (\Throwable $e) {
+            ray($e->getMessage());
             send_internal_notification('ContainerStoppingJob failed with: ' . $e->getMessage());
             throw $e;
+        } finally {
+            Artisan::queue('cleanup:stucked-resources');
         }
     }
 }
diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php
index ff2e22ae2..9ec9d06c4 100644
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@@ -1,5 +1,5 @@
 <div x-data x-init="$wire.loadServers">
-    <div class="flex gap-2 ">
+    <div class="flex gap-4 ">
         <h1>New Resource</h1>
         <div class="w-96">
             <x-forms.select wire:model="selectedEnvironment">
@@ -10,7 +10,7 @@
         </div>
     </div>
     <div class="pb-4 ">Deploy resources, like Applications, Databases, Services...</div>
-    <div class="flex flex-col gap-2 pt-10">
+    <div class="flex flex-col gap-4 pt-10">
         @if ($current_step === 'type')
             <ul class="pb-10 steps">
                 <li class="step step-secondary">Select Resource Type</li>
@@ -18,7 +18,7 @@
                 <li class="step">Select a Destination</li>
             </ul>
             <h2>Applications</h2>
-            <div class="grid justify-start grid-cols-1 gap-2 text-left xl:grid-cols-3">
+            <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-3">
                 <div class="box group" wire:click="setType('public')">
                     <div class="flex flex-col mx-6">
                         <div class="font-bold text-white group-hover:text-white">
@@ -50,7 +50,7 @@
                     </div>
                 </div>
             </div>
-            <div class="grid justify-start grid-cols-1 gap-2 text-left xl:grid-cols-3">
+            <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-3">
                 <div class="box group" wire:click="setType('dockerfile')">
                     <div class="flex flex-col mx-6">
                         <div class="font-bold text-white group-hover:text-white">
@@ -83,7 +83,7 @@
                 </div>
             </div>
             <h2 class="py-4">Databases</h2>
-            <div class="grid justify-start grid-cols-1 gap-2 text-left xl:grid-cols-3">
+            <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-5">
                 <div class="box group" wire:click="setType('postgresql')">
                     <div class="flex flex-col mx-6">
                         <div class="font-bold text-white group-hover:text-white">
@@ -151,14 +151,14 @@
                     </div>
                 </div> --}}
             </div>
-            <div class="flex items-center gap-2" wire:init='loadServices'>
+            <div class="flex items-center gap-4" wire:init='loadServices'>
                 <h2 class="py-4">Services</h2>
                 <x-forms.button wire:click='loadServices'>Reload Services List</x-forms.button>
                 <input
                     class="w-full text-white rounded input input-sm bg-coolgray-200 disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
                     wire:model.live.debounce.200ms="search" placeholder="Search...">
             </div>
-            <div class="grid justify-start grid-cols-1 gap-2 text-left xl:grid-cols-3">
+            <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-5">
                 @if ($loadingServices)
                     <span class="loading loading-xs loading-spinner"></span>
                 @else
@@ -211,7 +211,7 @@
                         label="Include Swarm Clusters" />
                 </div>
             @endif --}}
-            <div class="flex flex-col justify-center gap-2 text-left xl:flex-row xl:flex-wrap">
+            <div class="flex flex-col justify-center gap-4 text-left xl:flex-row xl:flex-wrap">
                 @forelse($servers as $server)
                     <div class="box group" wire:click="setServer({{ $server }})">
                         <div class="flex flex-col mx-6">
@@ -244,7 +244,7 @@
                 <li class="step step-secondary">Select a Destination</li>
             </ul>
 
-            <div class="flex flex-col justify-center gap-2 text-left xl:flex-row xl:flex-wrap">
+            <div class="flex flex-col justify-center gap-4 text-left xl:flex-row xl:flex-wrap">
                 @if ($server->isSwarm())
                     @foreach ($swarmDockers as $swarmDocker)
                         <div class="box group" wire:click="setDestination('{{ $swarmDocker->uuid }}')">
@@ -279,7 +279,7 @@
             </div>
         @endif
         @if ($current_step === 'existing-postgresql')
-            <form wire:submit='addExistingPostgresql' class="flex items-end gap-2">
+            <form wire:submit='addExistingPostgresql' class="flex items-end gap-4">
                 <x-forms.input placeholder="postgres://username:password@database:5432" label="Database URL"
                     id="existingPostgresqlUrl" />
                 <x-forms.button type="submit">Add Database</x-forms.button>