diff --git a/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.cockroach.down.sql b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.cockroach.down.sql
new file mode 100644
index 000000000000..5ecab22bf36e
--- /dev/null
+++ b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.cockroach.down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_verifiable_addresses_nid_identity_id_idx";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.cockroach.up.sql b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.cockroach.up.sql
new file mode 100644
index 000000000000..ced74f360389
--- /dev/null
+++ b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.cockroach.up.sql
@@ -0,0 +1 @@
+CREATE INDEX "identity_verifiable_addresses_nid_identity_id_idx" ON "identity_verifiable_addresses" (nid, identity_id);
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.mysql.down.sql b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.mysql.down.sql
new file mode 100644
index 000000000000..0dc2148caed5
--- /dev/null
+++ b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.mysql.down.sql
@@ -0,0 +1 @@
+DROP INDEX `identity_verifiable_addresses_nid_identity_id_idx` ON `identity_verifiable_addresses`;
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.mysql.up.sql b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.mysql.up.sql
new file mode 100644
index 000000000000..0fee3ecbcb66
--- /dev/null
+++ b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.mysql.up.sql
@@ -0,0 +1 @@
+CREATE INDEX `identity_verifiable_addresses_nid_identity_id_idx` ON `identity_verifiable_addresses` (`nid`, `identity_id`);
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.postgres.down.sql b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.postgres.down.sql
new file mode 100644
index 000000000000..4bb7cb319ef6
--- /dev/null
+++ b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.postgres.down.sql
@@ -0,0 +1 @@
+DROP INDEX "identity_verifiable_addresses_nid_identity_id_idx";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.postgres.up.sql b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.postgres.up.sql
new file mode 100644
index 000000000000..ced74f360389
--- /dev/null
+++ b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.postgres.up.sql
@@ -0,0 +1 @@
+CREATE INDEX "identity_verifiable_addresses_nid_identity_id_idx" ON "identity_verifiable_addresses" (nid, identity_id);
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.sqlite3.down.sql b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.sqlite3.down.sql
new file mode 100644
index 000000000000..5ecab22bf36e
--- /dev/null
+++ b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.sqlite3.down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "identity_verifiable_addresses_nid_identity_id_idx";
\ No newline at end of file
diff --git a/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.sqlite3.up.sql b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.sqlite3.up.sql
new file mode 100644
index 000000000000..ced74f360389
--- /dev/null
+++ b/persistence/sql/migrations/sql/20220114135828000000_verified_address_identity_index.sqlite3.up.sql
@@ -0,0 +1 @@
+CREATE INDEX "identity_verifiable_addresses_nid_identity_id_idx" ON "identity_verifiable_addresses" (nid, identity_id);
\ No newline at end of file
diff --git a/persistence/sql/migrations/templates/20220114135828_verified_address_identity_index.down.fizz b/persistence/sql/migrations/templates/20220114135828_verified_address_identity_index.down.fizz
new file mode 100644
index 000000000000..a2947f7a83b3
--- /dev/null
+++ b/persistence/sql/migrations/templates/20220114135828_verified_address_identity_index.down.fizz
@@ -0,0 +1 @@
+drop_index("identity_verifiable_addresses", "identity_verifiable_addresses_nid_identity_id_idx")
diff --git a/persistence/sql/migrations/templates/20220114135828_verified_address_identity_index.up.fizz b/persistence/sql/migrations/templates/20220114135828_verified_address_identity_index.up.fizz
new file mode 100644
index 000000000000..d82e66992d70
--- /dev/null
+++ b/persistence/sql/migrations/templates/20220114135828_verified_address_identity_index.up.fizz
@@ -0,0 +1 @@
+add_index("identity_verifiable_addresses", ["nid", "identity_id"], { "name": "identity_verifiable_addresses_nid_identity_id_idx" })