diff --git a/qan-api2/migrations/sql/23_add_index_queryid.down.sql b/qan-api2/migrations/sql/23_add_index_queryid.down.sql
new file mode 100644
index 0000000000..b01c2a0ff3
--- /dev/null
+++ b/qan-api2/migrations/sql/23_add_index_queryid.down.sql
@@ -0,0 +1 @@
+ALTER TABLE metrics DROP INDEX idx_metrics_queryid;
diff --git a/qan-api2/migrations/sql/23_add_index_queryid.up.sql b/qan-api2/migrations/sql/23_add_index_queryid.up.sql
new file mode 100644
index 0000000000..39d05d6cc0
--- /dev/null
+++ b/qan-api2/migrations/sql/23_add_index_queryid.up.sql
@@ -0,0 +1 @@
+ALTER TABLE metrics ADD INDEX idx_metrics_queryid queryid TYPE set(100);
diff --git a/qan-api2/migrations/sql/24_add_index_period_start.down.sql b/qan-api2/migrations/sql/24_add_index_period_start.down.sql
new file mode 100644
index 0000000000..5d5b6d3267
--- /dev/null
+++ b/qan-api2/migrations/sql/24_add_index_period_start.down.sql
@@ -0,0 +1 @@
+ALTER TABLE metrics DROP INDEX idx_metrics_period_start;
diff --git a/qan-api2/migrations/sql/24_add_index_period_start.up.sql b/qan-api2/migrations/sql/24_add_index_period_start.up.sql
new file mode 100644
index 0000000000..2a6f6b7f99
--- /dev/null
+++ b/qan-api2/migrations/sql/24_add_index_period_start.up.sql
@@ -0,0 +1 @@
+ALTER TABLE metrics ADD INDEX idx_metrics_period_start period_start TYPE minmax;
diff --git a/qan-api2/migrations/sql/25_add_index_service_id.down.sql b/qan-api2/migrations/sql/25_add_index_service_id.down.sql
new file mode 100644
index 0000000000..92c95ac0a7
--- /dev/null
+++ b/qan-api2/migrations/sql/25_add_index_service_id.down.sql
@@ -0,0 +1 @@
+ALTER TABLE metrics DROP INDEX idx_metrics_service_id;
diff --git a/qan-api2/migrations/sql/25_add_index_service_id.up.sql b/qan-api2/migrations/sql/25_add_index_service_id.up.sql
new file mode 100644
index 0000000000..257b84e72c
--- /dev/null
+++ b/qan-api2/migrations/sql/25_add_index_service_id.up.sql
@@ -0,0 +1 @@
+ALTER TABLE metrics ADD INDEX idx_metrics_service_id service_id TYPE set(100);