diff --git a/db/post_batch_processing_migrations/00022_drop_non_unique_indexes.sql b/db/post_batch_processing_migrations/00022_drop_non_unique_indexes.sql
new file mode 100644
index 0000000..f43aa5a
--- /dev/null
+++ b/db/post_batch_processing_migrations/00022_drop_non_unique_indexes.sql
@@ -0,0 +1,9 @@
+-- +goose Up
+DROP INDEX eth.log_cids_index;
+DROP INDEX eth.tx_tx_hash_index;
+DROP INDEX eth.header_block_hash_index;
+
+-- +goose Down
+CREATE INDEX header_block_hash_index ON eth.header_cids USING btree (block_hash);
+CREATE INDEX tx_tx_hash_index ON eth.transaction_cids USING btree (tx_hash);
+CREATE INDEX log_cids_index ON eth.log_cids USING btree (rct_id, index);
diff --git a/db/post_batch_processing_migrations/00022_create_pk_constraints.sql b/db/post_batch_processing_migrations/00023_create_pk_constraints.sql
similarity index 100%
rename from db/post_batch_processing_migrations/00022_create_pk_constraints.sql
rename to db/post_batch_processing_migrations/00023_create_pk_constraints.sql
diff --git a/db/post_batch_processing_migrations/00023_make_tables_logged.sql b/db/post_batch_processing_migrations/00024_make_tables_logged.sql
similarity index 100%
rename from db/post_batch_processing_migrations/00023_make_tables_logged.sql
rename to db/post_batch_processing_migrations/00024_make_tables_logged.sql
diff --git a/db/post_batch_processing_migrations/00024_create_fk_relations.sql b/db/post_batch_processing_migrations/00025_create_fk_relations.sql
similarity index 100%
rename from db/post_batch_processing_migrations/00024_create_fk_relations.sql
rename to db/post_batch_processing_migrations/00025_create_fk_relations.sql
diff --git a/db/post_batch_processing_migrations/00025_create_postgraphile_comments.sql b/db/post_batch_processing_migrations/00026_create_postgraphile_comments.sql
similarity index 100%
rename from db/post_batch_processing_migrations/00025_create_postgraphile_comments.sql
rename to db/post_batch_processing_migrations/00026_create_postgraphile_comments.sql
diff --git a/db/post_batch_processing_migrations/00026_create_cid_indexes.sql b/db/post_batch_processing_migrations/00027_create_cid_indexes.sql
similarity index 100%
rename from db/post_batch_processing_migrations/00026_create_cid_indexes.sql
rename to db/post_batch_processing_migrations/00027_create_cid_indexes.sql
diff --git a/db/post_batch_processing_migrations/00027_create_stored_functions.sql b/db/post_batch_processing_migrations/00028_create_stored_functions.sql
similarity index 100%
rename from db/post_batch_processing_migrations/00027_create_stored_functions.sql
rename to db/post_batch_processing_migrations/00028_create_stored_functions.sql
diff --git a/db/post_batch_processing_migrations/00028_create_postgraphile_triggers.sql b/db/post_batch_processing_migrations/00029_create_postgraphile_triggers.sql
similarity index 100%
rename from db/post_batch_processing_migrations/00028_create_postgraphile_triggers.sql
rename to db/post_batch_processing_migrations/00029_create_postgraphile_triggers.sql