diff --git a/app/Livewire/Notifications/Telegram.php b/app/Livewire/Notifications/Telegram.php
index 15ec20577..c83020830 100644
--- a/app/Livewire/Notifications/Telegram.php
+++ b/app/Livewire/Notifications/Telegram.php
@@ -3,6 +3,7 @@
 namespace App\Livewire\Notifications;
 
 use App\Models\Team;
+use App\Models\TelegramNotificationSettings;
 use App\Notifications\Test;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
@@ -11,6 +12,8 @@ class Telegram extends Component
 {
     public Team $team;
 
+    public TelegramNotificationSettings $settings;
+
     #[Validate(['boolean'])]
     public bool $telegramEnabled = false;
 
@@ -21,42 +24,76 @@ class Telegram extends Component
     public ?string $telegramChatId = null;
 
     #[Validate(['boolean'])]
-    public bool $telegramNotificationsTest = false;
+    public bool $deploymentSuccessTelegramNotifications = false;
 
     #[Validate(['boolean'])]
-    public bool $telegramNotificationsDeployments = false;
+    public bool $deploymentFailureTelegramNotifications = true;
 
     #[Validate(['boolean'])]
-    public bool $telegramNotificationsStatusChanges = false;
+    public bool $statusChangeTelegramNotifications = false;
 
     #[Validate(['boolean'])]
-    public bool $telegramNotificationsDatabaseBackups = false;
+    public bool $backupSuccessTelegramNotifications = false;
 
     #[Validate(['boolean'])]
-    public bool $telegramNotificationsScheduledTasks = false;
-
-    #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsTestMessageThreadId = null;
-
-    #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsDeploymentsMessageThreadId = null;
-
-    #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsStatusChangesMessageThreadId = null;
-
-    #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsDatabaseBackupsMessageThreadId = null;
-
-    #[Validate(['nullable', 'string'])]
-    public ?string $telegramNotificationsScheduledTasksThreadId = null;
+    public bool $backupFailureTelegramNotifications = true;
 
     #[Validate(['boolean'])]
-    public bool $telegramNotificationsServerDiskUsage = false;
+    public bool $scheduledTaskSuccessTelegramNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $scheduledTaskFailureTelegramNotifications = true;
+
+    #[Validate(['boolean'])]
+    public bool $dockerCleanupTelegramNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $serverDiskUsageTelegramNotifications = true;
+
+    #[Validate(['boolean'])]
+    public bool $serverReachableTelegramNotifications = false;
+
+    #[Validate(['boolean'])]
+    public bool $serverUnreachableTelegramNotifications = true;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsDeploymentSuccessTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsDeploymentFailureTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsStatusChangeTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsBackupSuccessTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsBackupFailureTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsScheduledTaskSuccessTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsScheduledTaskFailureTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsDockerCleanupTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsServerDiskUsageTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsServerReachableTopicId = null;
+
+    #[Validate(['nullable', 'string'])]
+    public ?string $telegramNotificationsServerUnreachableTopicId = null;
 
     public function mount()
     {
         try {
             $this->team = auth()->user()->currentTeam();
+            $this->settings = $this->team->telegramNotificationSettings;
             $this->syncData();
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -67,39 +104,65 @@ class Telegram extends Component
     {
         if ($toModel) {
             $this->validate();
-            $this->team->telegram_enabled = $this->telegramEnabled;
-            $this->team->telegram_token = $this->telegramToken;
-            $this->team->telegram_chat_id = $this->telegramChatId;
-            $this->team->telegram_notifications_test = $this->telegramNotificationsTest;
-            $this->team->telegram_notifications_deployments = $this->telegramNotificationsDeployments;
-            $this->team->telegram_notifications_status_changes = $this->telegramNotificationsStatusChanges;
-            $this->team->telegram_notifications_database_backups = $this->telegramNotificationsDatabaseBackups;
-            $this->team->telegram_notifications_scheduled_tasks = $this->telegramNotificationsScheduledTasks;
-            $this->team->telegram_notifications_test_message_thread_id = $this->telegramNotificationsTestMessageThreadId;
-            $this->team->telegram_notifications_deployments_message_thread_id = $this->telegramNotificationsDeploymentsMessageThreadId;
-            $this->team->telegram_notifications_status_changes_message_thread_id = $this->telegramNotificationsStatusChangesMessageThreadId;
-            $this->team->telegram_notifications_database_backups_message_thread_id = $this->telegramNotificationsDatabaseBackupsMessageThreadId;
-            $this->team->telegram_notifications_scheduled_tasks_thread_id = $this->telegramNotificationsScheduledTasksThreadId;
-            $this->team->telegram_notifications_server_disk_usage = $this->telegramNotificationsServerDiskUsage;
-            $this->team->save();
+            $this->settings->telegram_enabled = $this->telegramEnabled;
+            $this->settings->telegram_token = $this->telegramToken;
+            $this->settings->telegram_chat_id = $this->telegramChatId;
+
+            $this->settings->deployment_success_telegram_notifications = $this->deploymentSuccessTelegramNotifications;
+            $this->settings->deployment_failure_telegram_notifications = $this->deploymentFailureTelegramNotifications;
+            $this->settings->status_change_telegram_notifications = $this->statusChangeTelegramNotifications;
+            $this->settings->backup_success_telegram_notifications = $this->backupSuccessTelegramNotifications;
+            $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->server_disk_usage_telegram_notifications = $this->serverDiskUsageTelegramNotifications;
+            $this->settings->server_reachable_telegram_notifications = $this->serverReachableTelegramNotifications;
+            $this->settings->server_unreachable_telegram_notifications = $this->serverUnreachableTelegramNotifications;
+
+            $this->settings->telegram_notifications_deployment_success_topic_id = $this->telegramNotificationsDeploymentSuccessTopicId;
+            $this->settings->telegram_notifications_deployment_failure_topic_id = $this->telegramNotificationsDeploymentFailureTopicId;
+            $this->settings->telegram_notifications_status_change_topic_id = $this->telegramNotificationsStatusChangeTopicId;
+            $this->settings->telegram_notifications_backup_success_topic_id = $this->telegramNotificationsBackupSuccessTopicId;
+            $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_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;
+
+            $this->settings->save();
             refreshSession();
         } else {
-            $this->telegramEnabled = $this->team->telegram_enabled;
-            $this->telegramToken = $this->team->telegram_token;
-            $this->telegramChatId = $this->team->telegram_chat_id;
-            $this->telegramNotificationsTest = $this->team->telegram_notifications_test;
-            $this->telegramNotificationsDeployments = $this->team->telegram_notifications_deployments;
-            $this->telegramNotificationsStatusChanges = $this->team->telegram_notifications_status_changes;
-            $this->telegramNotificationsDatabaseBackups = $this->team->telegram_notifications_database_backups;
-            $this->telegramNotificationsScheduledTasks = $this->team->telegram_notifications_scheduled_tasks;
-            $this->telegramNotificationsTestMessageThreadId = $this->team->telegram_notifications_test_message_thread_id;
-            $this->telegramNotificationsDeploymentsMessageThreadId = $this->team->telegram_notifications_deployments_message_thread_id;
-            $this->telegramNotificationsStatusChangesMessageThreadId = $this->team->telegram_notifications_status_changes_message_thread_id;
-            $this->telegramNotificationsDatabaseBackupsMessageThreadId = $this->team->telegram_notifications_database_backups_message_thread_id;
-            $this->telegramNotificationsScheduledTasksThreadId = $this->team->telegram_notifications_scheduled_tasks_thread_id;
-            $this->telegramNotificationsServerDiskUsage = $this->team->telegram_notifications_server_disk_usage;
-        }
+            $this->telegramEnabled = $this->settings->telegram_enabled;
+            $this->telegramToken = $this->settings->telegram_token;
+            $this->telegramChatId = $this->settings->telegram_chat_id;
 
+            $this->deploymentSuccessTelegramNotifications = $this->settings->deployment_success_telegram_notifications;
+            $this->deploymentFailureTelegramNotifications = $this->settings->deployment_failure_telegram_notifications;
+            $this->statusChangeTelegramNotifications = $this->settings->status_change_telegram_notifications;
+            $this->backupSuccessTelegramNotifications = $this->settings->backup_success_telegram_notifications;
+            $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->serverDiskUsageTelegramNotifications = $this->settings->server_disk_usage_telegram_notifications;
+            $this->serverReachableTelegramNotifications = $this->settings->server_reachable_telegram_notifications;
+            $this->serverUnreachableTelegramNotifications = $this->settings->server_unreachable_telegram_notifications;
+
+            $this->telegramNotificationsDeploymentSuccessTopicId = $this->settings->telegram_notifications_deployment_success_topic_id;
+            $this->telegramNotificationsDeploymentFailureTopicId = $this->settings->telegram_notifications_deployment_failure_topic_id;
+            $this->telegramNotificationsStatusChangeTopicId = $this->settings->telegram_notifications_status_change_topic_id;
+            $this->telegramNotificationsBackupSuccessTopicId = $this->settings->telegram_notifications_backup_success_topic_id;
+            $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->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;
+        }
     }
 
     public function instantSave()
diff --git a/resources/views/livewire/notifications/telegram.blade.php b/resources/views/livewire/notifications/telegram.blade.php
index 76378ada1..790bf3143 100644
--- a/resources/views/livewire/notifications/telegram.blade.php
+++ b/resources/views/livewire/notifications/telegram.blade.php
@@ -12,7 +12,7 @@
             @if ($telegramEnabled)
                 <x-forms.button class="normal-case dark:text-white btn btn-xs no-animation btn-primary"
                     wire:click="sendTestNotification">
-                    Send Test Notifications
+                    Send Test Notification
                 </x-forms.button>
             @endif
         </div>
@@ -20,7 +20,6 @@
             <x-forms.checkbox instantSave="instantSaveTelegramEnabled" id="telegramEnabled" label="Enabled" />
         </div>
         <div class="flex gap-2">
-
             <x-forms.input type="password" autocomplete="new-password"
                 helper="Get it from the <a class='inline-block underline dark:text-white' href='https://t.me/botfather' target='_blank'>BotFather Bot</a> on Telegram."
                 required id="telegramToken" label="Token" />
@@ -28,51 +27,80 @@
                 id="telegramChatId" label="Chat ID" />
         </div>
         @if ($telegramEnabled)
-            <h2 class="mt-4">Subscribe to events</h2>
-            <div class="flex flex-col gap-4 w-96">
-                @if (isDev())
-                    <div class="flex flex-col">
-                        <h4>Test Notification</h4>
-                        <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsTest" label="Enabled" />
-                        <x-forms.input
-                            helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                            id="telegramNotificationsTestMessageThreadId" label="Custom Topic ID" />
+            <h2 class="mt-8 mb-4">Notification Settings</h2>
+            <p class="mb-4">
+                Select events for which you would like to receive Telegram notifications.
+            </p>
+            <div class="flex flex-col gap-4 max-w-2xl">
+                <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+                    <h3 class="text-lg font-medium mb-3">Backups</h3>
+                    <div class="flex flex-col gap-1.5 pl-1">
+                        <h4 class="font-medium mt-2">Backup Success</h4>
+                        <div class="pl-1">
+                            <x-forms.checkbox instantSave="saveModel" id="backupSuccessTelegramNotifications" label="Enabled" />
+                            <x-forms.input helper="Topic ID for backup success notifications" 
+                                id="telegramNotificationsBackupSuccessTopicId" label="Success Topic ID" />
+                        </div>
+                        
+                        <h4 class="font-medium mt-3">Backup Failure</h4>
+                        <div class="pl-1">
+                            <x-forms.checkbox instantSave="saveModel" id="backupFailureTelegramNotifications" label="Enabled" />
+                            <x-forms.input helper="Topic ID for backup failure notifications" 
+                                id="telegramNotificationsBackupFailureTopicId" label="Failure Topic ID" />
+                        </div>
                     </div>
-                @endif
-                <div class="flex flex-col">
-                    <h4>Container Status Changes</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsStatusChanges" label="Enabled" />
-                    <x-forms.input
-                        helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                        id="telegramNotificationsStatusChangesMessageThreadId" label="Custom Topic ID" />
                 </div>
-                <div class="flex flex-col">
-                    <h4>Application Deployments</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsDeployments" label="Enabled" />
-                    <x-forms.input
-                        helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                        id="telegramNotificationsDeploymentsMessageThreadId" label="Custom Topic ID" />
+
+                <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+                    <h3 class="text-lg font-medium mb-3">Scheduled Tasks</h3>
+                    <div class="flex flex-col gap-1.5 pl-1">
+                        <h4 class="font-medium mt-2">Scheduled Task Success</h4>
+                        <div class="pl-1">
+                            <x-forms.checkbox instantSave="saveModel" id="scheduledTaskSuccessTelegramNotifications" label="Enabled" />
+                            <x-forms.input helper="Topic ID for scheduled task success notifications" 
+                                id="telegramNotificationsScheduledTaskSuccessTopicId" label="Success Topic ID" />
+                        </div>
+                        
+                        <h4 class="font-medium mt-3">Scheduled Task Failure</h4>
+                        <div class="pl-1">
+                            <x-forms.checkbox instantSave="saveModel" id="scheduledTaskFailureTelegramNotifications" label="Enabled" />
+                            <x-forms.input helper="Topic ID for scheduled task failure notifications" 
+                                id="telegramNotificationsScheduledTaskFailureTopicId" label="Failure Topic ID" />
+                        </div>
+                    </div>
                 </div>
-                <div class="flex flex-col">
-                    <h4>Database Backup Status</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsDatabaseBackups"
-                        label="Enabled" />
-                    <x-forms.input
-                        helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                        id="telegramNotificationsDatabaseBackupsMessageThreadId" label="Custom Topic ID" />
-                </div>
-                <div class="flex flex-col">
-                    <h4>Scheduled Tasks Status</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsScheduledTasks"
-                        label="Enabled" />
-                    <x-forms.input
-                        helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                        id="telegramNotificationsScheduledTasksMessageThreadId" label="Custom Topic ID" />
-                </div>
-                <div class="flex flex-col">
-                    <h4>Server Disk Usage</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsServerDiskUsage"
-                        label="Enabled" />
+
+                <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+                    <h3 class="text-lg font-medium mb-3">Server</h3>
+                    <div class="flex flex-col gap-1.5 pl-1">
+                        <h4 class="font-medium mt-2">Docker Cleanup</h4>
+                        <div class="pl-1">
+                            <x-forms.checkbox instantSave="saveModel" id="dockerCleanupTelegramNotifications" label="Enabled" />
+                            <x-forms.input helper="Topic ID for Docker cleanup notifications" 
+                                id="telegramNotificationsDockerCleanupTopicId" label="Docker Cleanup Topic ID" />
+                        </div>
+                        
+                        <h4 class="font-medium mt-3">Server Disk Usage</h4>
+                        <div class="pl-1">
+                            <x-forms.checkbox instantSave="saveModel" id="serverDiskUsageTelegramNotifications" label="Enabled" />
+                            <x-forms.input helper="Topic ID for disk usage notifications" 
+                                id="telegramNotificationsServerDiskUsageTopicId" label="Disk Usage Topic ID" />
+                        </div>
+                        
+                        <h4 class="font-medium mt-3">Server Reachable</h4>
+                        <div class="pl-1">
+                            <x-forms.checkbox instantSave="saveModel" id="serverReachableTelegramNotifications" label="Enabled" />
+                            <x-forms.input helper="Topic ID for server reachable notifications" 
+                                id="telegramNotificationsServerReachableTopicId" label="Server Reachable Topic ID" />
+                        </div>
+                        
+                        <h4 class="font-medium mt-3">Server Unreachable</h4>
+                        <div class="pl-1">
+                            <x-forms.checkbox instantSave="saveModel" id="serverUnreachableTelegramNotifications" label="Enabled" />
+                            <x-forms.input helper="Topic ID for server unreachable notifications" 
+                                id="telegramNotificationsServerUnreachableTopicId" label="Server Unreachable Topic ID" />
+                        </div>
+                    </div>
                 </div>
             </div>
         @endif