diff --git a/src/migrations/20230615122909-fix-env-sort-order.js b/src/migrations/20230615122909-fix-env-sort-order.js
new file mode 100644
index 0000000000..3a526b6241
--- /dev/null
+++ b/src/migrations/20230615122909-fix-env-sort-order.js
@@ -0,0 +1,32 @@
+'use strict';
+
+exports.up = function (db, callback) {
+    db.runSql(
+        `
+            WITH sorted_environments AS (
+                SELECT
+                    *,
+                    ROW_NUMBER() OVER (
+                        ORDER BY
+                            sort_order,
+                            created_at
+                        ) AS new_sort_order
+                FROM
+                    environments
+            )
+            UPDATE
+                environments
+            SET
+                sort_order = sorted_environments.new_sort_order
+            FROM
+                sorted_environments
+            WHERE
+                environments.name = sorted_environments.name;
+        `,
+        callback,
+    );
+};
+
+exports.down = function (db, callback) {
+    db.runSql(``, callback);
+};