diff --git a/persistence/sql/migrations/sql/20241029102200000001_self_service.down.sql b/persistence/sql/migrations/sql/20241029102200000001_self_service.down.sql
new file mode 100644
index 000000000000..a8f6cb62cedb
--- /dev/null
+++ b/persistence/sql/migrations/sql/20241029102200000001_self_service.down.sql
@@ -0,0 +1,29 @@
+CREATE INDEX IF NOT EXISTS selfservice_login_flows_nid_id_idx ON selfservice_login_flows (nid ASC, id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_login_flows_id_nid_idx ON selfservice_login_flows (id ASC, nid ASC);
+DROP INDEX IF EXISTS selfservice_login_flows_nid_idx;
+
+CREATE INDEX IF NOT EXISTS selfservice_errors_errors_nid_id_idx (nid ASC, id ASC);
+DROP INDEX IF EXISTS selfservice_errors_errors_nid_idx (nid ASC);
+
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_nid_id_idx ON selfservice_recovery_flows (nid ASC, id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_id_nid_idx ON selfservice_recovery_flows (id ASC, nid ASC);
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_recovered_identity_id_nid_idx ON selfservice_recovery_flows (recovered_identity_id ASC, nid ASC);
+
+DROP INDEX IF EXISTS selfservice_recovery_flows_nid_idx;
+DROP INDEX IF EXISTS selfservice_recovery_flows_recovered_identity_id_idx;
+
+CREATE INDEX IF NOT EXISTS selfservice_registration_flows_nid_id_idx ON selfservice_registration_flows (nid ASC, id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_registration_flows_id_nid_idx ON selfservice_registration_flows (id ASC, nid ASC);
+
+DROP INDEX IF EXISTS selfservice_registration_flows_nid_idx;
+
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_nid_id_idx ON selfservice_settings_flows (nid ASC, id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_id_nid_idx ON selfservice_settings_flows (id ASC, nid ASC);
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_identity_id_nid_idx ON selfservice_settings_flows (identity_id ASC, nid ASC);
+
+DROP INDEX IF EXISTS selfservice_settings_flows_nid_idx;
+DROP INDEX IF EXISTS selfservice_settings_flows_identity_id_idx;
+
+CREATE INDEX IF NOT EXISTS selfservice_verification_flows_nid_id_idx ON selfservice_verification_flows (nid ASC, id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_verification_flows_id_nid_idx ON selfservice_verification_flows (id ASC, nid ASC);
+DROP INDEX IF EXISTS selfservice_verification_flows_nid_idx ON selfservice_verification_flows;
diff --git a/persistence/sql/migrations/sql/20241029102200000001_self_service.mysql.down.sql b/persistence/sql/migrations/sql/20241029102200000001_self_service.mysql.down.sql
new file mode 100644
index 000000000000..149d7dbdce56
--- /dev/null
+++ b/persistence/sql/migrations/sql/20241029102200000001_self_service.mysql.down.sql
@@ -0,0 +1,26 @@
+CREATE INDEX IF NOT EXISTS selfservice_login_flows_nid_id_idx ON selfservice_login_flows (nid ASC, id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_login_flows_id_nid_idx ON selfservice_login_flows (id ASC, nid ASC);
+DROP INDEX selfservice_login_flows_nid_idx ON selfservice_login_flows;
+
+CREATE INDEX IF NOT EXISTS selfservice_errors_errors_nid_id_idx (nid ASC, id ASC);
+DROP INDEX IF EXISTS selfservice_errors_errors_nid_idx (nid ASC);
+
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_nid_id_idx ON selfservice_recovery_flows (nid ASC, id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_id_nid_idx ON selfservice_recovery_flows (id ASC, nid ASC);
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_recovered_identity_id_nid_idx ON selfservice_recovery_flows (recovered_identity_id ASC, nid ASC);
+DROP INDEX selfservice_recovery_flows_nid_idx ON selfservice_recovery_flows;
+DROP INDEX selfservice_recovery_flows_recovered_identity_id_idx ON selfservice_recovery_flows;
+
+CREATE INDEX IF NOT EXISTS selfservice_registration_flows_nid_id_idx ON selfservice_registration_flows (nid ASC, id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_registration_flows_id_nid_idx ON selfservice_registration_flows (id ASC, nid ASC);
+DROP INDEX selfservice_registration_flows_nid_idx ON selfservice_registration_flows;
+
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_nid_id_idx ON selfservice_settings_flows (nid ASC, id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_id_nid_idx ON selfservice_settings_flows (id ASC, nid ASC);
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_identity_id_nid_idx ON selfservice_settings_flows (identity_id ASC, nid ASC);
+DROP INDEX selfservice_settings_flows_nid_idx ON selfservice_settings_flows;
+DROP INDEX selfservice_settings_flows_identity_id_idx ON selfservice_settings_flows;
+
+CREATE INDEX selfservice_verification_flows_nid_id_idx ON selfservice_verification_flows (nid ASC, id ASC);
+CREATE INDEX selfservice_verification_flows_id_nid_idx ON selfservice_verification_flows (id ASC, nid ASC);
+DROP INDEX selfservice_verification_flows_nid_idx ON selfservice_verification_flows;
diff --git a/persistence/sql/migrations/sql/20241029102200000001_self_service.mysql.up.sql b/persistence/sql/migrations/sql/20241029102200000001_self_service.mysql.up.sql
new file mode 100644
index 000000000000..e5b15becd5dd
--- /dev/null
+++ b/persistence/sql/migrations/sql/20241029102200000001_self_service.mysql.up.sql
@@ -0,0 +1,26 @@
+CREATE INDEX IF NOT EXISTS selfservice_login_flows_nid_idx ON selfservice_login_flows (nid ASC);
+DROP INDEX IF EXISTS selfservice_login_flows_nid_id_idx ON selfservice_login_flows;
+DROP INDEX IF EXISTS selfservice_login_flows_id_nid_idx ON selfservice_login_flows;
+
+CREATE INDEX IF NOT EXISTS selfservice_errors_errors_nid_idx (nid ASC);
+DROP INDEX IF EXISTS selfservice_errors_errors_nid_id_idx (nid ASC, id ASC);
+
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_nid_idx ON selfservice_recovery_flows (nid ASC);
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_recovered_identity_id_idx ON selfservice_recovery_flows (recovered_identity_id ASC);
+DROP INDEX IF EXISTS selfservice_recovery_flows_nid_id_idx ON selfservice_recovery_flows;
+DROP INDEX IF EXISTS selfservice_recovery_flows_id_nid_idx ON selfservice_recovery_flows;
+DROP INDEX IF EXISTS selfservice_recovery_flows_recovered_identity_id_nid_idx ON selfservice_recovery_flows;
+
+CREATE INDEX IF NOT EXISTS selfservice_registration_flows_nid_idx ON selfservice_registration_flows (nid ASC);
+DROP INDEX IF EXISTS selfservice_registration_flows_nid_id_idx ON selfservice_registration_flows;
+DROP INDEX IF EXISTS selfservice_registration_flows_id_nid_idx ON selfservice_registration_flows;
+
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_nid_idx ON selfservice_settings_flows (nid ASC);
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_identity_id_idx ON selfservice_settings_flows (identity_id ASC);
+DROP INDEX IF EXISTS selfservice_settings_flows_nid_id_idx ON selfservice_settings_flows;
+DROP INDEX IF EXISTS selfservice_settings_flows_id_nid_idx ON selfservice_settings_flows;
+DROP INDEX IF EXISTS selfservice_settings_flows_identity_id_nid_idx ON selfservice_settings_flows;
+
+CREATE INDEX IF NOT EXISTS selfservice_verification_flows_nid_idx ON selfservice_verification_flows (nid ASC);
+DROP INDEX IF EXISTS selfservice_verification_flows_nid_id_idx ON selfservice_verification_flows;
+DROP INDEX IF EXISTS selfservice_verification_flows_id_nid_idx ON selfservice_verification_flows;
diff --git a/persistence/sql/migrations/sql/20241029102200000001_self_service.up.sql b/persistence/sql/migrations/sql/20241029102200000001_self_service.up.sql
new file mode 100644
index 000000000000..e62edceedc14
--- /dev/null
+++ b/persistence/sql/migrations/sql/20241029102200000001_self_service.up.sql
@@ -0,0 +1,26 @@
+CREATE INDEX IF NOT EXISTS selfservice_login_flows_nid_idx ON selfservice_login_flows (nid ASC);
+DROP INDEX IF EXISTS selfservice_login_flows_nid_id_idx;
+DROP INDEX IF EXISTS selfservice_login_flows_id_nid_idx;
+
+CREATE INDEX IF NOT EXISTS selfservice_errors_errors_nid_idx (nid ASC);
+DROP INDEX IF EXISTS selfservice_errors_errors_nid_id_idx (nid ASC, id ASC);
+
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_recovered_identity_id_idx ON selfservice_recovery_flows (recovered_identity_id ASC);
+CREATE INDEX IF NOT EXISTS selfservice_recovery_flows_nid_idx ON selfservice_recovery_flows (nid ASC);
+DROP INDEX IF EXISTS selfservice_recovery_flows_nid_id_idx;
+DROP INDEX IF EXISTS selfservice_recovery_flows_id_nid_idx;
+DROP INDEX IF EXISTS selfservice_recovery_flows_recovered_identity_id_nid_idx;
+
+CREATE INDEX IF NOT EXISTS selfservice_registration_flows_nid_idx ON selfservice_registration_flows (nid ASC);
+DROP INDEX IF EXISTS selfservice_registration_flows_nid_id_idx;
+DROP INDEX IF EXISTS selfservice_registration_flows_id_nid_idx;
+
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_nid_idx ON selfservice_settings_flows (nid ASC);
+CREATE INDEX IF NOT EXISTS selfservice_settings_flows_identity_id_idx ON selfservice_settings_flows (identity_id ASC);
+DROP INDEX IF EXISTS selfservice_settings_flows_nid_id_idx;
+DROP INDEX IF EXISTS selfservice_settings_flows_id_nid_idx;
+DROP INDEX IF EXISTS selfservice_settings_flows_identity_id_nid_idx;
+
+CREATE INDEX IF NOT EXISTS selfservice_verification_flows_nid_idx ON selfservice_verification_flows (nid ASC);
+DROP INDEX IF EXISTS selfservice_verification_flows_nid_id_idx;
+DROP INDEX IF EXISTS selfservice_verification_flows_id_nid_idx;