diff --git a/app-modules/identity/database/migrations/2026_05_26_020000_restore_tenant_id_indexes_and_foreign_keys.php b/app-modules/identity/database/migrations/2026_05_26_020000_restore_tenant_id_indexes_and_foreign_keys.php
new file mode 100644
index 00000000..bf6e92c6
--- /dev/null
+++ b/app-modules/identity/database/migrations/2026_05_26_020000_restore_tenant_id_indexes_and_foreign_keys.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    public $withinTransaction = false;
+
+    public function up(): void
+    {
+        DB::statement("SET maintenance_work_mem = '1GB'");
+
+        // Tier 1 — critical: large tables + high-frequency queries
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS messages_tenant_id_idx ON messages (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS messages_tenant_sent_at_idx ON messages (tenant_id, sent_at DESC)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS tenant_users_tenant_id_idx ON tenant_users (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS tenant_users_user_id_idx ON tenant_users (user_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS external_identities_provider_account_idx ON external_identities (provider, external_account_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS voice_messages_tenant_id_idx ON voice_messages (tenant_id)');
+
+        // Tier 2 — medium tables, listing queries
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS message_embeds_tenant_id_idx ON message_embeds (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS message_mentions_tenant_id_idx ON message_mentions (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS message_attachments_tenant_id_idx ON message_attachments (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS activity_reactions_tenant_id_idx ON activity_reactions (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS characters_tenant_id_idx ON characters (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS external_identities_tenant_id_idx ON external_identities (tenant_id)');
+
+        // Tier 3 — small tables, completeness
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS activity_timeline_tenant_id_idx ON activity_timeline (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS badges_tenant_id_idx ON badges (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS characters_badges_tenant_id_idx ON characters_badges (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS discord_guilds_tenant_id_idx ON discord_guilds (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS feedback_reviews_tenant_id_idx ON feedback_reviews (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS feedbacks_tenant_id_idx ON feedbacks (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS interactions_tenant_id_idx ON interactions (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS meetings_tenant_id_idx ON meetings (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS membership_events_tenant_id_idx ON membership_events (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS message_threads_tenant_id_idx ON message_threads (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_actions_tenant_id_idx ON moderation_actions (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_appeals_tenant_id_idx ON moderation_appeals (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_audit_log_tenant_id_idx ON moderation_audit_log (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_cases_tenant_id_idx ON moderation_cases (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_events_tenant_id_idx ON moderation_events (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_rules_tenant_id_idx ON moderation_rules (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS seasons_tenant_id_idx ON seasons (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS seasons_rankings_tenant_id_idx ON seasons_rankings (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS twitch_event_logs_tenant_id_idx ON twitch_event_logs (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS twitch_subscriptions_tenant_id_idx ON twitch_subscriptions (tenant_id)');
+        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS user_profiles_tenant_id_idx ON user_profiles (tenant_id)');
+
+        DB::statement('SET maintenance_work_mem = DEFAULT');
+    }
+
+    public function down(): void
+    {
+        $indexes = [
+            'messages_tenant_id_idx',
+            'messages_tenant_sent_at_idx',
+            'tenant_users_tenant_id_idx',
+            'tenant_users_user_id_idx',
+            'external_identities_provider_account_idx',
+            'external_identities_tenant_id_idx',
+            'voice_messages_tenant_id_idx',
+            'message_embeds_tenant_id_idx',
+            'message_mentions_tenant_id_idx',
+            'message_attachments_tenant_id_idx',
+            'activity_reactions_tenant_id_idx',
+            'characters_tenant_id_idx',
+            'activity_timeline_tenant_id_idx',
+            'badges_tenant_id_idx',
+            'characters_badges_tenant_id_idx',
+            'discord_guilds_tenant_id_idx',
+            'feedback_reviews_tenant_id_idx',
+            'feedbacks_tenant_id_idx',
+            'interactions_tenant_id_idx',
+            'meetings_tenant_id_idx',
+            'membership_events_tenant_id_idx',
+            'message_threads_tenant_id_idx',
+            'moderation_actions_tenant_id_idx',
+            'moderation_appeals_tenant_id_idx',
+            'moderation_audit_log_tenant_id_idx',
+            'moderation_cases_tenant_id_idx',
+            'moderation_events_tenant_id_idx',
+            'moderation_rules_tenant_id_idx',
+            'seasons_tenant_id_idx',
+            'seasons_rankings_tenant_id_idx',
+            'twitch_event_logs_tenant_id_idx',
+            'twitch_subscriptions_tenant_id_idx',
+            'user_profiles_tenant_id_idx',
+        ];
+
+        foreach ($indexes as $index) {
+            DB::statement(sprintf('DROP INDEX IF EXISTS %s', $index));
+        }
+    }
+};
diff --git a/database/migrations/2026_05_25_225721_convert_tenant_id_from_bigint_to_uuid.php b/database/migrations/2026_05_25_225721_convert_tenant_id_from_bigint_to_uuid.php
deleted file mode 100644
index 928a87da..00000000
--- a/database/migrations/2026_05_25_225721_convert_tenant_id_from_bigint_to_uuid.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /** @var array<int, string> */
-    private array $childTables = [
-        'activity_reactions',
-        'activity_timeline',
-        'badges',
-        'characters',
-        'characters_badges',
-        'discord_guilds',
-        'external_identities',
-        'feedback_reviews',
-        'feedbacks',
-        'interactions',
-        'meetings',
-        'membership_events',
-        'message_attachments',
-        'message_embeds',
-        'message_mentions',
-        'message_threads',
-        'messages',
-        'moderation_actions',
-        'moderation_appeals',
-        'moderation_audit_log',
-        'moderation_cases',
-        'moderation_events',
-        'moderation_rules',
-        'seasons',
-        'seasons_rankings',
-        'tenant_users',
-        'twitch_event_logs',
-        'twitch_subscriptions',
-        'user_profiles',
-        'voice_messages',
-    ];
-
-    public function up(): void
-    {
-        DB::statement('ALTER TABLE tenants ADD COLUMN new_id uuid DEFAULT gen_random_uuid()');
-        DB::statement('UPDATE tenants SET new_id = gen_random_uuid() WHERE new_id IS NULL');
-
-        $mapping = DB::table('tenants')->pluck('new_id', 'id');
-
-        foreach ($this->childTables as $table) {
-            if (!Schema::hasTable($table)) {
-                continue;
-            }
-
-            DB::statement(sprintf('ALTER TABLE %s ADD COLUMN new_tenant_id uuid', $table));
-
-            foreach ($mapping as $oldId => $newUuid) {
-                DB::statement(sprintf('UPDATE %s SET new_tenant_id = ?::uuid WHERE tenant_id = ?', $table), [$newUuid, $oldId]);
-            }
-
-            $this->dropForeignKeyIfExists($table, 'tenant_id');
-
-            DB::statement(sprintf('ALTER TABLE %s DROP COLUMN tenant_id', $table));
-            DB::statement(sprintf('ALTER TABLE %s RENAME COLUMN new_tenant_id TO tenant_id', $table));
-        }
-
-        DB::statement('ALTER TABLE tenants DROP CONSTRAINT tenants_pkey');
-        DB::statement('ALTER TABLE tenants DROP COLUMN id');
-        DB::statement('ALTER TABLE tenants RENAME COLUMN new_id TO id');
-        DB::statement('ALTER TABLE tenants ADD PRIMARY KEY (id)');
-        DB::statement('ALTER TABLE tenants ALTER COLUMN id SET DEFAULT gen_random_uuid()');
-        DB::statement('ALTER TABLE tenants ALTER COLUMN id SET NOT NULL');
-        DB::statement('DROP SEQUENCE IF EXISTS tenants_id_seq');
-    }
-
-    public function down(): void
-    {
-        // Irreversible — integer ID mapping is lost
-    }
-
-    private function dropForeignKeyIfExists(string $table, string $column): void
-    {
-        $constraints = DB::select("
-            SELECT con.conname
-            FROM pg_constraint con
-            JOIN pg_attribute att ON att.attnum = ANY(con.conkey) AND att.attrelid = con.conrelid
-            WHERE con.conrelid = ?::regclass
-            AND att.attname = ?
-            AND con.contype = 'f'
-        ", [$table, $column]);
-
-        foreach ($constraints as $constraint) {
-            DB::statement(sprintf('ALTER TABLE %s DROP CONSTRAINT %s', $table, $constraint->conname));
-        }
-    }
-};