diff --git a/src/features/manga/services/Mangas.ts b/src/features/manga/services/Mangas.ts
index 87f41cba..1c4a1412 100644
--- a/src/features/manga/services/Mangas.ts
+++ b/src/features/manga/services/Mangas.ts
@@ -258,7 +258,6 @@ export class Mangas {
                     (chapter) => chapter.mangaId,
                 );
 
-                // TODO - Filter for scanlators directly in getChapterIdsWithState once fixed on the server
                 const filteredChaptersToConsiderByMangaId = mapValues((chapters) => {
                     const { mangaId } = chapters![0]!;
                     const manga = mangaByMangaId[mangaId]![0]!;
diff --git a/src/features/migration/screens/MigrationSelectMangas.tsx b/src/features/migration/screens/MigrationSelectMangas.tsx
index a918c4ee..e6951689 100644
--- a/src/features/migration/screens/MigrationSelectMangas.tsx
+++ b/src/features/migration/screens/MigrationSelectMangas.tsx
@@ -32,6 +32,7 @@ import { Mangas } from '@/features/manga/services/Mangas.ts';
 import { STABLE_EMPTY_ARRAY } from '@/base/Base.constants.ts';
 import { MigrationContinueButton } from '@/features/migration/components/MigrationContinueButton.tsx';
 import { GET_MIGRATABLE_SOURCE_MANGAS } from '@/lib/graphql/manga/MangaQuery.ts';
+import { MangaOrderBy, SortOrder } from '@/lib/graphql/generated/graphql-base.types.ts';
 
 const getSourceError = (error: unknown): unknown => {
     const message = getErrorMessage(error);
@@ -79,25 +80,23 @@ export const MigrationSelectMangas = () => {
                 sourceId,
                 inLibrary: true,
             },
-            // TODO(release) - enable again once minimum server version gets updated
-            // order: [
-            //     {
-            //         by: MangaOrderBy.Title,
-            //         byType: SortOrder.Asc,
-            //     },
-            //     {
-            //         by: MangaOrderBy.InLibraryAt,
-            //         byType: SortOrder.Desc,
-            //     },
-            // ],
+            order: [
+                {
+                    by: MangaOrderBy.Title,
+                    byType: SortOrder.Asc,
+                },
+                {
+                    by: MangaOrderBy.InLibraryAt,
+                    byType: SortOrder.Desc,
+                },
+            ],
         },
         {
             skip: !sourceIds,
         },
     );
 
-    const tmpMangas = migratableSourceMangasData?.mangas.nodes ?? STABLE_EMPTY_ARRAY;
-    const mangas = useMemo(() => tmpMangas.toSorted((a, b) => a.title.localeCompare(b.title)), [tmpMangas]);
+    const mangas = migratableSourceMangasData?.mangas.nodes ?? STABLE_EMPTY_ARRAY;
     const mangaIds = useMemo(() => Mangas.getIds(mangas), [mangas]);
 
     const { selectedItemIds, handleSelection, handleSelectAll, areAllItemsSelected, areNoItemsSelected } =
diff --git a/versionToServerVersionMapping.json b/versionToServerVersionMapping.json
index 86b68341..fc6a292d 100644
--- a/versionToServerVersionMapping.json
+++ b/versionToServerVersionMapping.json
@@ -1,7 +1,12 @@
 [
     {
         "uiVersion": "PREVIEW",
-        "serverVersion": "r2099"
+        "serverVersion": "r2217"
+    },
+    {
+        "tag": "OLD-PREVIEW",
+        "uiVersion": "r3293",
+        "serverVersion": "r2221"
     },
     {
         "tag": "v20260509.01",