diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php
index 0bdfca84e..9989ed8cb 100644
--- a/app/Jobs/ContainerStatusJob.php
+++ b/app/Jobs/ContainerStatusJob.php
@@ -40,8 +40,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle()
     {
-        $rand = rand(1, 15);
-        Sleep::for($rand)->seconds();
         try {
             if (!$this->server->isServerReady()) {
                 return;
diff --git a/app/Jobs/DeleteResourceJob.php b/app/Jobs/DeleteResourceJob.php
index 347eb40d0..cf7c6462a 100644
--- a/app/Jobs/DeleteResourceJob.php
+++ b/app/Jobs/DeleteResourceJob.php
@@ -32,9 +32,10 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
         try {
             $server = $this->resource->destination->server;
             if (!$server->isFunctional()) {
-                $this->resource->delete();
+                $this->resource->forceDelete();
                 return 'Server is not functional';
             }
+            $this->resource->delete();
             switch ($this->resource->type()) {
                 case 'application':
                     StopApplication::run($this->resource);
@@ -56,7 +57,6 @@ class DeleteResourceJob implements ShouldQueue, ShouldBeEncrypted
                     break;
             }
             if ($this->resource->type() === 'service') {
-                $this->resource->delete();
                 DeleteService::dispatch($this->resource);
             } else {
                 $this->resource->forceDelete();
diff --git a/app/Livewire/Project/Shared/Danger.php b/app/Livewire/Project/Shared/Danger.php
index d85dfb876..39dc38310 100644
--- a/app/Livewire/Project/Shared/Danger.php
+++ b/app/Livewire/Project/Shared/Danger.php
@@ -24,7 +24,7 @@ class Danger extends Component
     public function delete()
     {
         try {
-            DeleteResourceJob::dispatch($this->resource);
+            DeleteResourceJob::dispatchSync($this->resource);
             return $this->redirectRoute('project.resources', [
                 'project_uuid' => $this->projectUuid,
                 'environment_name' => $this->environmentName