diff --git a/app/Livewire/Notifications/Discord.php b/app/Livewire/Notifications/Discord.php
index c5ec471d7..c09966e53 100644
--- a/app/Livewire/Notifications/Discord.php
+++ b/app/Livewire/Notifications/Discord.php
@@ -42,7 +42,10 @@ class Discord extends Component
     public bool $scheduledTaskFailureDiscordNotifications = true;
 
     #[Validate(['boolean'])]
-    public bool $dockerCleanupDiscordNotifications = false;
+    public bool $dockerCleanupSuccessDiscordNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $dockerCleanupFailureDiscordNotifications = true;
 
     #[Validate(['boolean'])]
     public bool $serverDiskUsageDiscordNotifications = true;
@@ -78,7 +81,8 @@ class Discord extends Component
             $this->settings->backup_failure_discord_notifications = $this->backupFailureDiscordNotifications;
             $this->settings->scheduled_task_success_discord_notifications = $this->scheduledTaskSuccessDiscordNotifications;
             $this->settings->scheduled_task_failure_discord_notifications = $this->scheduledTaskFailureDiscordNotifications;
-            $this->settings->docker_cleanup_discord_notifications = $this->dockerCleanupDiscordNotifications;
+            $this->settings->docker_cleanup_success_discord_notifications = $this->dockerCleanupSuccessDiscordNotifications;
+            $this->settings->docker_cleanup_failure_discord_notifications = $this->dockerCleanupFailureDiscordNotifications;
             $this->settings->server_disk_usage_discord_notifications = $this->serverDiskUsageDiscordNotifications;
             $this->settings->server_reachable_discord_notifications = $this->serverReachableDiscordNotifications;
             $this->settings->server_unreachable_discord_notifications = $this->serverUnreachableDiscordNotifications;
@@ -96,7 +100,8 @@ class Discord extends Component
             $this->backupFailureDiscordNotifications = $this->settings->backup_failure_discord_notifications;
             $this->scheduledTaskSuccessDiscordNotifications = $this->settings->scheduled_task_success_discord_notifications;
             $this->scheduledTaskFailureDiscordNotifications = $this->settings->scheduled_task_failure_discord_notifications;
-            $this->dockerCleanupDiscordNotifications = $this->settings->docker_cleanup_discord_notifications;
+            $this->dockerCleanupSuccessDiscordNotifications = $this->settings->docker_cleanup_success_discord_notifications;
+            $this->dockerCleanupFailureDiscordNotifications = $this->settings->docker_cleanup_failure_discord_notifications;
             $this->serverDiskUsageDiscordNotifications = $this->settings->server_disk_usage_discord_notifications;
             $this->serverReachableDiscordNotifications = $this->settings->server_reachable_discord_notifications;
             $this->serverUnreachableDiscordNotifications = $this->settings->server_unreachable_discord_notifications;
diff --git a/app/Livewire/Notifications/Email.php b/app/Livewire/Notifications/Email.php
index 7af25694f..83debb6ff 100644
--- a/app/Livewire/Notifications/Email.php
+++ b/app/Livewire/Notifications/Email.php
@@ -80,7 +80,10 @@ class Email extends Component
     public bool $scheduledTaskFailureEmailNotifications = true;
 
     #[Validate(['boolean'])]
-    public bool $dockerCleanupEmailNotifications = false;
+    public bool $dockerCleanupSuccessEmailNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $dockerCleanupFailureEmailNotifications = true;
 
     #[Validate(['boolean'])]
     public bool $serverDiskUsageEmailNotifications = true;
@@ -133,7 +136,8 @@ class Email extends Component
             $this->settings->backup_failure_email_notifications = $this->backupFailureEmailNotifications;
             $this->settings->scheduled_task_success_email_notifications = $this->scheduledTaskSuccessEmailNotifications;
             $this->settings->scheduled_task_failure_email_notifications = $this->scheduledTaskFailureEmailNotifications;
-            $this->settings->docker_cleanup_email_notifications = $this->dockerCleanupEmailNotifications;
+            $this->settings->docker_cleanup_success_email_notifications = $this->dockerCleanupSuccessEmailNotifications;
+            $this->settings->docker_cleanup_failure_email_notifications = $this->dockerCleanupFailureEmailNotifications;
             $this->settings->server_disk_usage_email_notifications = $this->serverDiskUsageEmailNotifications;
             $this->settings->server_reachable_email_notifications = $this->serverReachableEmailNotifications;
             $this->settings->server_unreachable_email_notifications = $this->serverUnreachableEmailNotifications;
@@ -164,10 +168,12 @@ class Email extends Component
             $this->backupFailureEmailNotifications = $this->settings->backup_failure_email_notifications;
             $this->scheduledTaskSuccessEmailNotifications = $this->settings->scheduled_task_success_email_notifications;
             $this->scheduledTaskFailureEmailNotifications = $this->settings->scheduled_task_failure_email_notifications;
-            $this->dockerCleanupEmailNotifications = $this->settings->docker_cleanup_email_notifications;
+            $this->dockerCleanupSuccessEmailNotifications = $this->settings->docker_cleanup_success_email_notifications;
+            $this->dockerCleanupFailureEmailNotifications = $this->settings->docker_cleanup_failure_email_notifications;
             $this->serverDiskUsageEmailNotifications = $this->settings->server_disk_usage_email_notifications;
             $this->serverReachableEmailNotifications = $this->settings->server_reachable_email_notifications;
             $this->serverUnreachableEmailNotifications = $this->settings->server_unreachable_email_notifications;
+
         }
     }
 
diff --git a/app/Livewire/Notifications/Slack.php b/app/Livewire/Notifications/Slack.php
index 7fa881641..91f05f42f 100644
--- a/app/Livewire/Notifications/Slack.php
+++ b/app/Livewire/Notifications/Slack.php
@@ -42,7 +42,10 @@ class Slack extends Component
     public bool $scheduledTaskFailureSlackNotifications = true;
 
     #[Validate(['boolean'])]
-    public bool $dockerCleanupSlackNotifications = false;
+    public bool $dockerCleanupSuccessSlackNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $dockerCleanupFailureSlackNotifications = true;
 
     #[Validate(['boolean'])]
     public bool $serverDiskUsageSlackNotifications = true;
@@ -78,7 +81,8 @@ class Slack extends Component
             $this->settings->backup_failure_slack_notifications = $this->backupFailureSlackNotifications;
             $this->settings->scheduled_task_success_slack_notifications = $this->scheduledTaskSuccessSlackNotifications;
             $this->settings->scheduled_task_failure_slack_notifications = $this->scheduledTaskFailureSlackNotifications;
-            $this->settings->docker_cleanup_slack_notifications = $this->dockerCleanupSlackNotifications;
+            $this->settings->docker_cleanup_success_slack_notifications = $this->dockerCleanupSuccessSlackNotifications;
+            $this->settings->docker_cleanup_failure_slack_notifications = $this->dockerCleanupFailureSlackNotifications;
             $this->settings->server_disk_usage_slack_notifications = $this->serverDiskUsageSlackNotifications;
             $this->settings->server_reachable_slack_notifications = $this->serverReachableSlackNotifications;
             $this->settings->server_unreachable_slack_notifications = $this->serverUnreachableSlackNotifications;
@@ -96,7 +100,8 @@ class Slack extends Component
             $this->backupFailureSlackNotifications = $this->settings->backup_failure_slack_notifications;
             $this->scheduledTaskSuccessSlackNotifications = $this->settings->scheduled_task_success_slack_notifications;
             $this->scheduledTaskFailureSlackNotifications = $this->settings->scheduled_task_failure_slack_notifications;
-            $this->dockerCleanupSlackNotifications = $this->settings->docker_cleanup_slack_notifications;
+            $this->dockerCleanupSuccessSlackNotifications = $this->settings->docker_cleanup_success_slack_notifications;
+            $this->dockerCleanupFailureSlackNotifications = $this->settings->docker_cleanup_failure_slack_notifications;
             $this->serverDiskUsageSlackNotifications = $this->settings->server_disk_usage_slack_notifications;
             $this->serverReachableSlackNotifications = $this->settings->server_reachable_slack_notifications;
             $this->serverUnreachableSlackNotifications = $this->settings->server_unreachable_slack_notifications;
diff --git a/app/Livewire/Notifications/Telegram.php b/app/Livewire/Notifications/Telegram.php
index c83020830..d425fd262 100644
--- a/app/Livewire/Notifications/Telegram.php
+++ b/app/Livewire/Notifications/Telegram.php
@@ -45,7 +45,10 @@ class Telegram extends Component
     public bool $scheduledTaskFailureTelegramNotifications = true;
 
     #[Validate(['boolean'])]
-    public bool $dockerCleanupTelegramNotifications = false;
+    public bool $dockerCleanupSuccessTelegramNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $dockerCleanupFailureTelegramNotifications = true;
 
     #[Validate(['boolean'])]
     public bool $serverDiskUsageTelegramNotifications = true;
@@ -78,7 +81,10 @@ class Telegram extends Component
     public ?string $telegramNotificationsScheduledTaskFailureTopicId = null;
 
     #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsDockerCleanupTopicId = null;
+    public ?string $telegramNotificationsDockerCleanupSuccessTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsDockerCleanupFailureTopicId = null;
 
     #[Validate(['nullable', 'string'])]
     public ?string $telegramNotificationsServerDiskUsageTopicId = null;
@@ -115,7 +121,8 @@ class Telegram extends Component
             $this->settings->backup_failure_telegram_notifications = $this->backupFailureTelegramNotifications;
             $this->settings->scheduled_task_success_telegram_notifications = $this->scheduledTaskSuccessTelegramNotifications;
             $this->settings->scheduled_task_failure_telegram_notifications = $this->scheduledTaskFailureTelegramNotifications;
-            $this->settings->docker_cleanup_telegram_notifications = $this->dockerCleanupTelegramNotifications;
+            $this->settings->docker_cleanup_success_telegram_notifications = $this->dockerCleanupSuccessTelegramNotifications;
+            $this->settings->docker_cleanup_failure_telegram_notifications = $this->dockerCleanupFailureTelegramNotifications;
             $this->settings->server_disk_usage_telegram_notifications = $this->serverDiskUsageTelegramNotifications;
             $this->settings->server_reachable_telegram_notifications = $this->serverReachableTelegramNotifications;
             $this->settings->server_unreachable_telegram_notifications = $this->serverUnreachableTelegramNotifications;
@@ -127,7 +134,8 @@ class Telegram extends Component
             $this->settings->telegram_notifications_backup_failure_topic_id = $this->telegramNotificationsBackupFailureTopicId;
             $this->settings->telegram_notifications_scheduled_task_success_topic_id = $this->telegramNotificationsScheduledTaskSuccessTopicId;
             $this->settings->telegram_notifications_scheduled_task_failure_topic_id = $this->telegramNotificationsScheduledTaskFailureTopicId;
-            $this->settings->telegram_notifications_docker_cleanup_topic_id = $this->telegramNotificationsDockerCleanupTopicId;
+            $this->settings->telegram_notifications_docker_cleanup_success_topic_id = $this->telegramNotificationsDockerCleanupSuccessTopicId;
+            $this->settings->telegram_notifications_docker_cleanup_failure_topic_id = $this->telegramNotificationsDockerCleanupFailureTopicId;
             $this->settings->telegram_notifications_server_disk_usage_topic_id = $this->telegramNotificationsServerDiskUsageTopicId;
             $this->settings->telegram_notifications_server_reachable_topic_id = $this->telegramNotificationsServerReachableTopicId;
             $this->settings->telegram_notifications_server_unreachable_topic_id = $this->telegramNotificationsServerUnreachableTopicId;
@@ -146,7 +154,8 @@ class Telegram extends Component
             $this->backupFailureTelegramNotifications = $this->settings->backup_failure_telegram_notifications;
             $this->scheduledTaskSuccessTelegramNotifications = $this->settings->scheduled_task_success_telegram_notifications;
             $this->scheduledTaskFailureTelegramNotifications = $this->settings->scheduled_task_failure_telegram_notifications;
-            $this->dockerCleanupTelegramNotifications = $this->settings->docker_cleanup_telegram_notifications;
+            $this->dockerCleanupSuccessTelegramNotifications = $this->settings->docker_cleanup_success_telegram_notifications;
+            $this->dockerCleanupFailureTelegramNotifications = $this->settings->docker_cleanup_failure_telegram_notifications;
             $this->serverDiskUsageTelegramNotifications = $this->settings->server_disk_usage_telegram_notifications;
             $this->serverReachableTelegramNotifications = $this->settings->server_reachable_telegram_notifications;
             $this->serverUnreachableTelegramNotifications = $this->settings->server_unreachable_telegram_notifications;
@@ -158,7 +167,8 @@ class Telegram extends Component
             $this->telegramNotificationsBackupFailureTopicId = $this->settings->telegram_notifications_backup_failure_topic_id;
             $this->telegramNotificationsScheduledTaskSuccessTopicId = $this->settings->telegram_notifications_scheduled_task_success_topic_id;
             $this->telegramNotificationsScheduledTaskFailureTopicId = $this->settings->telegram_notifications_scheduled_task_failure_topic_id;
-            $this->telegramNotificationsDockerCleanupTopicId = $this->settings->telegram_notifications_docker_cleanup_topic_id;
+            $this->telegramNotificationsDockerCleanupSuccessTopicId = $this->settings->telegram_notifications_docker_cleanup_success_topic_id;
+            $this->telegramNotificationsDockerCleanupFailureTopicId = $this->settings->telegram_notifications_docker_cleanup_failure_topic_id;
             $this->telegramNotificationsServerDiskUsageTopicId = $this->settings->telegram_notifications_server_disk_usage_topic_id;
             $this->telegramNotificationsServerReachableTopicId = $this->settings->telegram_notifications_server_reachable_topic_id;
             $this->telegramNotificationsServerUnreachableTopicId = $this->settings->telegram_notifications_server_unreachable_topic_id;