diff --git a/app/Models/WebhookNotificationSettings.php b/app/Models/WebhookNotificationSettings.php
index a7039c033..731006181 100644
--- a/app/Models/WebhookNotificationSettings.php
+++ b/app/Models/WebhookNotificationSettings.php
@@ -24,6 +24,8 @@ class WebhookNotificationSettings extends Model
         'backup_failure_webhook_notifications',
         'scheduled_task_success_webhook_notifications',
         'scheduled_task_failure_webhook_notifications',
+        'docker_cleanup_success_webhook_notifications',
+        'docker_cleanup_failure_webhook_notifications',
         'server_disk_usage_webhook_notifications',
         'server_reachable_webhook_notifications',
         'server_unreachable_webhook_notifications',
@@ -44,6 +46,8 @@ protected function casts(): array
             'backup_failure_webhook_notifications' => 'boolean',
             'scheduled_task_success_webhook_notifications' => 'boolean',
             'scheduled_task_failure_webhook_notifications' => 'boolean',
+            'docker_cleanup_success_webhook_notifications' => 'boolean',
+            'docker_cleanup_failure_webhook_notifications' => 'boolean',
             'server_disk_usage_webhook_notifications' => 'boolean',
             'server_reachable_webhook_notifications' => 'boolean',
             'server_unreachable_webhook_notifications' => 'boolean',
diff --git a/database/migrations/2025_11_25_000001_create_webhook_notification_settings_table.php b/database/migrations/2025_11_25_000001_create_webhook_notification_settings_table.php
index b0f513c73..eb1653238 100644
--- a/database/migrations/2025_11_25_000001_create_webhook_notification_settings_table.php
+++ b/database/migrations/2025_11_25_000001_create_webhook_notification_settings_table.php
@@ -3,6 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
@@ -41,36 +42,35 @@ public function up(): void
         }
 
         // Populate webhook notification settings for existing teams (only if they don't already have settings)
-        $teams = DB::table('teams')->get();
-
-        foreach ($teams as $team) {
-            // Check if settings already exist for this team
-            $exists = DB::table('webhook_notification_settings')
-                ->where('team_id', $team->id)
-                ->exists();
-
-            if (! $exists) {
-                DB::table('webhook_notification_settings')->insert([
-                    'team_id' => $team->id,
-                    'webhook_enabled' => false,
-                    'webhook_url' => null,
-                    'deployment_success_webhook_notifications' => false,
-                    'deployment_failure_webhook_notifications' => true,
-                    'status_change_webhook_notifications' => false,
-                    'backup_success_webhook_notifications' => false,
-                    'backup_failure_webhook_notifications' => true,
-                    'scheduled_task_success_webhook_notifications' => false,
-                    'scheduled_task_failure_webhook_notifications' => true,
-                    'docker_cleanup_success_webhook_notifications' => false,
-                    'docker_cleanup_failure_webhook_notifications' => true,
-                    'server_disk_usage_webhook_notifications' => true,
-                    'server_reachable_webhook_notifications' => false,
-                    'server_unreachable_webhook_notifications' => true,
-                    'server_patch_webhook_notifications' => false,
-                    'traefik_outdated_webhook_notifications' => true,
-                ]);
+        DB::table('teams')->chunkById(100, function ($teams) {
+            foreach ($teams as $team) {
+                try {
+                    DB::table('webhook_notification_settings')->updateOrInsert(
+                        ['team_id' => $team->id],
+                        [
+                            'webhook_enabled' => false,
+                            'webhook_url' => null,
+                            'deployment_success_webhook_notifications' => false,
+                            'deployment_failure_webhook_notifications' => true,
+                            'status_change_webhook_notifications' => false,
+                            'backup_success_webhook_notifications' => false,
+                            'backup_failure_webhook_notifications' => true,
+                            'scheduled_task_success_webhook_notifications' => false,
+                            'scheduled_task_failure_webhook_notifications' => true,
+                            'docker_cleanup_success_webhook_notifications' => false,
+                            'docker_cleanup_failure_webhook_notifications' => true,
+                            'server_disk_usage_webhook_notifications' => true,
+                            'server_reachable_webhook_notifications' => false,
+                            'server_unreachable_webhook_notifications' => true,
+                            'server_patch_webhook_notifications' => false,
+                            'traefik_outdated_webhook_notifications' => true,
+                        ]
+                    );
+                } catch (\Throwable $e) {
+                    Log::error('Error creating webhook notification settings for team '.$team->id.': '.$e->getMessage());
+                }
             }
-        }
+        });
     }
 
     /**