diff --git a/app/Notifications/Server/DockerCleanupFailed.php b/app/Notifications/Server/DockerCleanupFailed.php
new file mode 100644
index 000000000..d7f70e029
--- /dev/null
+++ b/app/Notifications/Server/DockerCleanupFailed.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Notifications\Server;
+
+use App\Models\Server;
+use App\Notifications\CustomEmailNotification;
+use App\Notifications\Dto\DiscordMessage;
+use App\Notifications\Dto\SlackMessage;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class DockerCleanupFailed extends CustomEmailNotification
+{
+    public function __construct(public Server $server, public string $message)
+    {
+        $this->onQueue('high');
+    }
+
+    public function via(object $notifiable): array
+    {
+        return $notifiable->getEnabledChannels('docker_cleanup_failure');
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage;
+        $mail->subject("Coolify: [ACTION REQUIRED] Docker cleanup job failed on {$this->server->name}");
+        $mail->view('emails.docker-cleanup-failed', [
+            'serverName' => $this->server->name,
+            'message' => $this->message,
+        ]);
+
+        return $mail;
+    }
+
+    public function toDiscord(): DiscordMessage
+    {
+        return new DiscordMessage(
+            title: ':cross_mark: Coolify: [ACTION REQUIRED] Docker cleanup job failed on '.$this->server->name,
+            description: $this->message,
+            color: DiscordMessage::errorColor(),
+        );
+    }
+
+    public function toTelegram(): array
+    {
+        return [
+            'message' => "Coolify: [ACTION REQUIRED] Docker cleanup job failed on {$this->server->name}!\n\n{$this->message}",
+        ];
+    }
+
+    public function toSlack(): SlackMessage
+    {
+        return new SlackMessage(
+            title: 'Coolify: [ACTION REQUIRED] Docker cleanup job failed',
+            description: "Docker cleanup job failed on '{$this->server->name}'!\n\n{$this->message}",
+            color: SlackMessage::errorColor()
+        );
+    }
+}
diff --git a/app/Notifications/Server/DockerCleanup.php b/app/Notifications/Server/DockerCleanupSuccess.php
similarity index 59%
rename from app/Notifications/Server/DockerCleanup.php
rename to app/Notifications/Server/DockerCleanupSuccess.php
index f4f8ffd09..eb84de787 100644
--- a/app/Notifications/Server/DockerCleanup.php
+++ b/app/Notifications/Server/DockerCleanupSuccess.php
@@ -8,7 +8,7 @@ use App\Notifications\Dto\DiscordMessage;
 use App\Notifications\Dto\SlackMessage;
 use Illuminate\Notifications\Messages\MailMessage;
 
-class DockerCleanup extends CustomEmailNotification
+class DockerCleanupSuccess extends CustomEmailNotification
 {
     public function __construct(public Server $server, public string $message)
     {
@@ -17,25 +17,26 @@ class DockerCleanup extends CustomEmailNotification
 
     public function via(object $notifiable): array
     {
-        return $notifiable->getEnabledChannels('docker_cleanup');
+        return $notifiable->getEnabledChannels('docker_cleanup_success');
     }
 
     public function toMail(): MailMessage
     {
         $mail = new MailMessage;
-        $mail->subject("Coolify: Server ({$this->server->name}) docker cleanup job done!");
-        $mail->view('emails.docker-cleanup', [
-            'name' => $this->server->name,
+        $mail->subject("Coolify: Docker cleanup job succeeded on {$this->server->name}");
+        $mail->view('emails.docker-cleanup-success', [
+            'serverName' => $this->server->name,
             'message' => $this->message,
         ]);
 
         return $mail;
     }
 
+
     public function toDiscord(): DiscordMessage
     {
         return new DiscordMessage(
-            title: ':white_check_mark: Server cleanup job done',
+            title: ':white_check_mark: Coolify: Docker cleanup job succeeded on '.$this->server->name,
             description: $this->message,
             color: DiscordMessage::successColor(),
         );
@@ -44,15 +45,15 @@ class DockerCleanup extends CustomEmailNotification
     public function toTelegram(): array
     {
         return [
-            'message' => "Coolify: Server '{$this->server->name}' cleanup job done!\n\n{$this->message}",
+            'message' => "Coolify: Docker cleanup job succeeded on {$this->server->name}!\n\n{$this->message}",
         ];
     }
 
     public function toSlack(): SlackMessage
     {
         return new SlackMessage(
-            title: 'Server cleanup job done',
-            description: "Server '{$this->server->name}' cleanup job done!\n\n{$this->message}",
+            title: 'Coolify: Docker cleanup job succeeded',
+            description: "Docker cleanup job succeeded on '{$this->server->name}'!\n\n{$this->message}",
             color: SlackMessage::successColor()
         );
     }
diff --git a/resources/views/emails/docker-cleanup.blade.php b/resources/views/emails/docker-cleanup.blade.php
deleted file mode 100644
index 8ac0cda32..000000000
--- a/resources/views/emails/docker-cleanup.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<x-emails.layout>
-    <p>Docker cleanup job has completed successfully on {{ $serverName }} server.</p>
-    <p>Message: {{ $message }}</p>
-</x-emails.layout>