diff --git a/migrations/20230919165634_messages.down.sql b/migrations/20230919165634_messages.down.sql
deleted file mode 100644
index 36f514b..0000000
--- a/migrations/20230919165634_messages.down.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS messages;
\ No newline at end of file
diff --git a/migrations/20230919165634_messages.up.sql b/migrations/20230919165634_messages.up.sql
deleted file mode 100644
index be17db5..0000000
--- a/migrations/20230919165634_messages.up.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE IF NOT EXISTS messages
-(
-    id     BIGSERIAL PRIMARY KEY,
-    message JSONB NOT NULL
-);
diff --git a/migrations/20240325124203_aggregates.down.sql b/migrations/20240325124203_aggregates.down.sql
deleted file mode 100644
index b0e28f3..0000000
--- a/migrations/20240325124203_aggregates.down.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS indexer_aggregates;
diff --git a/migrations/20240325124203_aggregates.up.sql b/migrations/20240325124203_aggregates.up.sql
deleted file mode 100644
index 0706fe8..0000000
--- a/migrations/20240325124203_aggregates.up.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE IF NOT EXISTS indexer_aggregates
-(
-    id SERIAL PRIMARY KEY,
-    timestamp BIGINT NOT NULL,
-    graph_account VARCHAR(255) NOT NULL,
-    message_count BIGINT NOT NULL,
-    subgraphs_count BIGINT NOT NULL,
-    UNIQUE(graph_account, timestamp)
-);
diff --git a/migrations/20240726113334_create_messages_and_indexer_aggregates_up.sql b/migrations/20240726113334_create_messages_and_indexer_aggregates_up.sql
new file mode 100644
index 0000000..9f9057d
--- /dev/null
+++ b/migrations/20240726113334_create_messages_and_indexer_aggregates_up.sql
@@ -0,0 +1,21 @@
+CREATE TABLE IF NOT EXISTS messages
+(
+    id     BIGSERIAL PRIMARY KEY,
+    message JSONB NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS indexer_aggregates
+(
+    id SERIAL PRIMARY KEY,
+    timestamp BIGINT NOT NULL,
+    graph_account VARCHAR(255) NOT NULL,
+    message_count BIGINT NOT NULL,
+    subgraphs_count BIGINT NOT NULL,
+    UNIQUE(graph_account, timestamp)
+);
+
+CREATE INDEX idx_message_nonce 
+ON messages ((CAST(message->>'nonce' AS BIGINT)));
+
+CREATE INDEX idx_message_graph_account 
+ON messages ((message->>'graph_account'));
diff --git a/migrations/20240726113339_create_messages_and_indexer_aggregates_down.sql b/migrations/20240726113339_create_messages_and_indexer_aggregates_down.sql
new file mode 100644
index 0000000..a799cb6
--- /dev/null
+++ b/migrations/20240726113339_create_messages_and_indexer_aggregates_down.sql
@@ -0,0 +1,5 @@
+DROP INDEX IF EXISTS idx_message_nonce;
+DROP INDEX IF EXISTS idx_message_graph_account;
+
+DROP TABLE IF EXISTS indexer_aggregates;
+DROP TABLE IF EXISTS messages;