diff --git a/src/migrations/20220811221515-add-environtment-indexes.js b/src/migrations/20220811221515-add-environtment-indexes.js
new file mode 100644
index 0000000000..3ee8889c77
--- /dev/null
+++ b/src/migrations/20220811221515-add-environtment-indexes.js
@@ -0,0 +1,21 @@
+exports.up = function (db, cb) {
+    db.runSql(
+        `
+            CREATE INDEX IF NOT EXISTS idx_feature_strategies_environment
+                ON feature_strategies(environment);
+
+            CREATE INDEX IF NOT EXISTS idx_feature_environments_environment
+                ON feature_environments(environment); `,
+        cb,
+    );
+};
+
+exports.down = function (db, cb) {
+    db.runSql(
+        `
+            DROP INDEX idx_feature_strategies_environment;
+            DROP INDEX idx_feature_environments_environment;
+`,
+        cb,
+    );
+};