diff --git a/server/scripts/setup-database.js b/server/scripts/setup-database.js
index 4131ffd..8e4d894 100644
--- a/server/scripts/setup-database.js
+++ b/server/scripts/setup-database.js
@@ -275,12 +275,12 @@ const setupDatabase = async () => {
     
     await sequelize.query(`
       CREATE INDEX IF NOT EXISTS idx_drone_detections_device_timestamp 
-      ON "drone_detections" (device_id, timestamp);
+      ON "drone_detections" (device_id, server_timestamp);
     `);
     
     await sequelize.query(`
       CREATE INDEX IF NOT EXISTS idx_heartbeats_device_timestamp 
-      ON "heartbeats" (device_id, timestamp);
+      ON "heartbeats" (device_id, received_at);
     `);
     
     await sequelize.query(`