diff --git a/mobile/lib/pages/common/album_additional_shared_user_selection.page.dart b/mobile/lib/pages/common/album_additional_shared_user_selection.page.dart
index 5e253a7b58..02026b828d 100644
--- a/mobile/lib/pages/common/album_additional_shared_user_selection.page.dart
+++ b/mobile/lib/pages/common/album_additional_shared_user_selection.page.dart
@@ -10,7 +10,7 @@ import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
 
-@RoutePage<List<String>?>()
+@RoutePage()
 class AlbumAdditionalSharedUserSelectionPage extends HookConsumerWidget {
   final Album album;
 
diff --git a/mobile/lib/pages/common/album_asset_selection.page.dart b/mobile/lib/pages/common/album_asset_selection.page.dart
index b1281a2486..18ceb3e144 100644
--- a/mobile/lib/pages/common/album_asset_selection.page.dart
+++ b/mobile/lib/pages/common/album_asset_selection.page.dart
@@ -12,7 +12,7 @@ import 'package:immich_mobile/widgets/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:isar/isar.dart';
 
-@RoutePage<AssetSelectionPageResult?>()
+@RoutePage()
 class AlbumAssetSelectionPage extends HookConsumerWidget {
   const AlbumAssetSelectionPage({
     super.key,
diff --git a/mobile/lib/pages/common/album_shared_user_selection.page.dart b/mobile/lib/pages/common/album_shared_user_selection.page.dart
index d8cf4ecd27..aefa8e2736 100644
--- a/mobile/lib/pages/common/album_shared_user_selection.page.dart
+++ b/mobile/lib/pages/common/album_shared_user_selection.page.dart
@@ -13,7 +13,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
 import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
 
-@RoutePage<List<String>>()
+@RoutePage()
 class AlbumSharedUserSelectionPage extends HookConsumerWidget {
   const AlbumSharedUserSelectionPage({super.key, required this.assets});
 
diff --git a/mobile/lib/pages/search/map/map_location_picker.page.dart b/mobile/lib/pages/search/map/map_location_picker.page.dart
index db0c980c89..2fd1e1ee9e 100644
--- a/mobile/lib/pages/search/map/map_location_picker.page.dart
+++ b/mobile/lib/pages/search/map/map_location_picker.page.dart
@@ -12,7 +12,7 @@ import 'package:immich_mobile/widgets/map/map_theme_override.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 import 'package:immich_mobile/utils/map_utils.dart';
 
-@RoutePage<LatLng?>()
+@RoutePage()
 class MapLocationPickerPage extends HookConsumerWidget {
   final LatLng initialLatLng;
 
diff --git a/mobile/lib/providers/search/people.provider.g.dart b/mobile/lib/providers/search/people.provider.g.dart
index c68f7a75fc..db2edfb956 100644
--- a/mobile/lib/providers/search/people.provider.g.dart
+++ b/mobile/lib/providers/search/people.provider.g.dart
@@ -21,7 +21,7 @@ final getAllPeopleProvider =
 );
 
 typedef GetAllPeopleRef = AutoDisposeFutureProviderRef<List<PersonResponseDto>>;
-String _$personAssetsHash() => r'1d6eff5ca3aa630b58c4dad9516193b21896984d';
+String _$personAssetsHash() => r'3dfecb67a54d07e4208bcb9581b2625acd2e1832';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 3b28c73b27..211c847726 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/entities/logger_message.entity.dart';
 import 'package:immich_mobile/entities/user.entity.dart';
-import 'package:immich_mobile/models/albums/asset_selection_page_result.model.dart';
 import 'package:immich_mobile/models/memories/memory.model.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/models/shared_link/shared_link.model.dart';
@@ -69,7 +68,7 @@ import 'package:photo_manager/photo_manager.dart' hide LatLng;
 part 'router.gr.dart';
 
 @AutoRouterConfig(replaceInRouteName: 'Page,Route')
-class AppRouter extends _$AppRouter {
+class AppRouter extends RootStackRouter {
   late final AuthGuard _authGuard;
   late final DuplicateGuard _duplicateGuard;
   late final BackupPermissionGuard _backupPermissionGuard;
diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart
index 77d031b5ed..a4259676c7 100644
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -9,379 +9,6 @@
 
 part of 'router.dart';
 
-abstract class _$AppRouter extends RootStackRouter {
-  // ignore: unused_element
-  _$AppRouter({super.navigatorKey});
-
-  @override
-  final Map<String, PageFactory> pagesMap = {
-    ActivitiesRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const ActivitiesPage(),
-      );
-    },
-    AlbumAdditionalSharedUserSelectionRoute.name: (routeData) {
-      final args =
-          routeData.argsAs<AlbumAdditionalSharedUserSelectionRouteArgs>();
-      return AutoRoutePage<List<String>?>(
-        routeData: routeData,
-        child: AlbumAdditionalSharedUserSelectionPage(
-          key: args.key,
-          album: args.album,
-        ),
-      );
-    },
-    AlbumAssetSelectionRoute.name: (routeData) {
-      final args = routeData.argsAs<AlbumAssetSelectionRouteArgs>();
-      return AutoRoutePage<AssetSelectionPageResult?>(
-        routeData: routeData,
-        child: AlbumAssetSelectionPage(
-          key: args.key,
-          existingAssets: args.existingAssets,
-          canDeselect: args.canDeselect,
-          query: args.query,
-        ),
-      );
-    },
-    AlbumOptionsRoute.name: (routeData) {
-      final args = routeData.argsAs<AlbumOptionsRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: AlbumOptionsPage(
-          key: args.key,
-          album: args.album,
-        ),
-      );
-    },
-    AlbumPreviewRoute.name: (routeData) {
-      final args = routeData.argsAs<AlbumPreviewRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: AlbumPreviewPage(
-          key: args.key,
-          album: args.album,
-        ),
-      );
-    },
-    AlbumSharedUserSelectionRoute.name: (routeData) {
-      final args = routeData.argsAs<AlbumSharedUserSelectionRouteArgs>();
-      return AutoRoutePage<List<String>>(
-        routeData: routeData,
-        child: AlbumSharedUserSelectionPage(
-          key: args.key,
-          assets: args.assets,
-        ),
-      );
-    },
-    AlbumViewerRoute.name: (routeData) {
-      final args = routeData.argsAs<AlbumViewerRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: AlbumViewerPage(
-          key: args.key,
-          albumId: args.albumId,
-        ),
-      );
-    },
-    AllMotionPhotosRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const AllMotionPhotosPage(),
-      );
-    },
-    AllPeopleRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const AllPeoplePage(),
-      );
-    },
-    AllPlacesRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const AllPlacesPage(),
-      );
-    },
-    AllVideosRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const AllVideosPage(),
-      );
-    },
-    AppLogDetailRoute.name: (routeData) {
-      final args = routeData.argsAs<AppLogDetailRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: AppLogDetailPage(
-          key: args.key,
-          logMessage: args.logMessage,
-        ),
-      );
-    },
-    AppLogRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const AppLogPage(),
-      );
-    },
-    ArchiveRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const ArchivePage(),
-      );
-    },
-    BackupAlbumSelectionRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const BackupAlbumSelectionPage(),
-      );
-    },
-    BackupControllerRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const BackupControllerPage(),
-      );
-    },
-    BackupOptionsRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const BackupOptionsPage(),
-      );
-    },
-    ChangePasswordRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const ChangePasswordPage(),
-      );
-    },
-    CreateAlbumRoute.name: (routeData) {
-      final args = routeData.argsAs<CreateAlbumRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: CreateAlbumPage(
-          key: args.key,
-          isSharedAlbum: args.isSharedAlbum,
-          initialAssets: args.initialAssets,
-        ),
-      );
-    },
-    CropImageRoute.name: (routeData) {
-      final args = routeData.argsAs<CropImageRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: CropImagePage(
-          key: args.key,
-          image: args.image,
-        ),
-      );
-    },
-    EditImageRoute.name: (routeData) {
-      final args = routeData.argsAs<EditImageRouteArgs>(
-          orElse: () => const EditImageRouteArgs());
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: EditImagePage(
-          key: args.key,
-          image: args.image,
-          asset: args.asset,
-        ),
-      );
-    },
-    FailedBackupStatusRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const FailedBackupStatusPage(),
-      );
-    },
-    FavoritesRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const FavoritesPage(),
-      );
-    },
-    GalleryViewerRoute.name: (routeData) {
-      final args = routeData.argsAs<GalleryViewerRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: GalleryViewerPage(
-          key: args.key,
-          renderList: args.renderList,
-          initialIndex: args.initialIndex,
-          heroOffset: args.heroOffset,
-          showStack: args.showStack,
-        ),
-      );
-    },
-    HeaderSettingsRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const HeaderSettingsPage(),
-      );
-    },
-    LibraryRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const LibraryPage(),
-      );
-    },
-    LoginRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const LoginPage(),
-      );
-    },
-    MapLocationPickerRoute.name: (routeData) {
-      final args = routeData.argsAs<MapLocationPickerRouteArgs>(
-          orElse: () => const MapLocationPickerRouteArgs());
-      return AutoRoutePage<LatLng?>(
-        routeData: routeData,
-        child: MapLocationPickerPage(
-          key: args.key,
-          initialLatLng: args.initialLatLng,
-        ),
-      );
-    },
-    MapRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const MapPage(),
-      );
-    },
-    MemoryRoute.name: (routeData) {
-      final args = routeData.argsAs<MemoryRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: MemoryPage(
-          memories: args.memories,
-          memoryIndex: args.memoryIndex,
-          key: args.key,
-        ),
-      );
-    },
-    PartnerDetailRoute.name: (routeData) {
-      final args = routeData.argsAs<PartnerDetailRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: PartnerDetailPage(
-          key: args.key,
-          partner: args.partner,
-        ),
-      );
-    },
-    PartnerRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const PartnerPage(),
-      );
-    },
-    PermissionOnboardingRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const PermissionOnboardingPage(),
-      );
-    },
-    PersonResultRoute.name: (routeData) {
-      final args = routeData.argsAs<PersonResultRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: PersonResultPage(
-          key: args.key,
-          personId: args.personId,
-          personName: args.personName,
-        ),
-      );
-    },
-    PhotosRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const PhotosPage(),
-      );
-    },
-    RecentlyAddedRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const RecentlyAddedPage(),
-      );
-    },
-    SearchInputRoute.name: (routeData) {
-      final args = routeData.argsAs<SearchInputRouteArgs>(
-          orElse: () => const SearchInputRouteArgs());
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: SearchInputPage(
-          key: args.key,
-          prefilter: args.prefilter,
-        ),
-      );
-    },
-    SearchRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const SearchPage(),
-      );
-    },
-    SettingsRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const SettingsPage(),
-      );
-    },
-    SettingsSubRoute.name: (routeData) {
-      final args = routeData.argsAs<SettingsSubRouteArgs>();
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: SettingsSubPage(
-          args.section,
-          key: args.key,
-        ),
-      );
-    },
-    SharedLinkEditRoute.name: (routeData) {
-      final args = routeData.argsAs<SharedLinkEditRouteArgs>(
-          orElse: () => const SharedLinkEditRouteArgs());
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: SharedLinkEditPage(
-          key: args.key,
-          existingLink: args.existingLink,
-          assetsList: args.assetsList,
-          albumId: args.albumId,
-        ),
-      );
-    },
-    SharedLinkRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const SharedLinkPage(),
-      );
-    },
-    SharingRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const SharingPage(),
-      );
-    },
-    SplashScreenRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const SplashScreenPage(),
-      );
-    },
-    TabControllerRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const TabControllerPage(),
-      );
-    },
-    TrashRoute.name: (routeData) {
-      return AutoRoutePage<dynamic>(
-        routeData: routeData,
-        child: const TrashPage(),
-      );
-    },
-  };
-}
-
 /// generated route for
 /// [ActivitiesPage]
 class ActivitiesRoute extends PageRouteInfo<void> {
@@ -393,7 +20,12 @@ class ActivitiesRoute extends PageRouteInfo<void> {
 
   static const String name = 'ActivitiesRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const ActivitiesPage();
+    },
+  );
 }
 
 /// generated route for
@@ -415,8 +47,16 @@ class AlbumAdditionalSharedUserSelectionRoute
 
   static const String name = 'AlbumAdditionalSharedUserSelectionRoute';
 
-  static const PageInfo<AlbumAdditionalSharedUserSelectionRouteArgs> page =
-      PageInfo<AlbumAdditionalSharedUserSelectionRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<AlbumAdditionalSharedUserSelectionRouteArgs>();
+      return AlbumAdditionalSharedUserSelectionPage(
+        key: args.key,
+        album: args.album,
+      );
+    },
+  );
 }
 
 class AlbumAdditionalSharedUserSelectionRouteArgs {
@@ -458,8 +98,18 @@ class AlbumAssetSelectionRoute
 
   static const String name = 'AlbumAssetSelectionRoute';
 
-  static const PageInfo<AlbumAssetSelectionRouteArgs> page =
-      PageInfo<AlbumAssetSelectionRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<AlbumAssetSelectionRouteArgs>();
+      return AlbumAssetSelectionPage(
+        key: args.key,
+        existingAssets: args.existingAssets,
+        canDeselect: args.canDeselect,
+        query: args.query,
+      );
+    },
+  );
 }
 
 class AlbumAssetSelectionRouteArgs {
@@ -502,8 +152,16 @@ class AlbumOptionsRoute extends PageRouteInfo<AlbumOptionsRouteArgs> {
 
   static const String name = 'AlbumOptionsRoute';
 
-  static const PageInfo<AlbumOptionsRouteArgs> page =
-      PageInfo<AlbumOptionsRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<AlbumOptionsRouteArgs>();
+      return AlbumOptionsPage(
+        key: args.key,
+        album: args.album,
+      );
+    },
+  );
 }
 
 class AlbumOptionsRouteArgs {
@@ -540,8 +198,16 @@ class AlbumPreviewRoute extends PageRouteInfo<AlbumPreviewRouteArgs> {
 
   static const String name = 'AlbumPreviewRoute';
 
-  static const PageInfo<AlbumPreviewRouteArgs> page =
-      PageInfo<AlbumPreviewRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<AlbumPreviewRouteArgs>();
+      return AlbumPreviewPage(
+        key: args.key,
+        album: args.album,
+      );
+    },
+  );
 }
 
 class AlbumPreviewRouteArgs {
@@ -579,8 +245,16 @@ class AlbumSharedUserSelectionRoute
 
   static const String name = 'AlbumSharedUserSelectionRoute';
 
-  static const PageInfo<AlbumSharedUserSelectionRouteArgs> page =
-      PageInfo<AlbumSharedUserSelectionRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<AlbumSharedUserSelectionRouteArgs>();
+      return AlbumSharedUserSelectionPage(
+        key: args.key,
+        assets: args.assets,
+      );
+    },
+  );
 }
 
 class AlbumSharedUserSelectionRouteArgs {
@@ -617,8 +291,16 @@ class AlbumViewerRoute extends PageRouteInfo<AlbumViewerRouteArgs> {
 
   static const String name = 'AlbumViewerRoute';
 
-  static const PageInfo<AlbumViewerRouteArgs> page =
-      PageInfo<AlbumViewerRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<AlbumViewerRouteArgs>();
+      return AlbumViewerPage(
+        key: args.key,
+        albumId: args.albumId,
+      );
+    },
+  );
 }
 
 class AlbumViewerRouteArgs {
@@ -648,7 +330,12 @@ class AllMotionPhotosRoute extends PageRouteInfo<void> {
 
   static const String name = 'AllMotionPhotosRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const AllMotionPhotosPage();
+    },
+  );
 }
 
 /// generated route for
@@ -662,7 +349,12 @@ class AllPeopleRoute extends PageRouteInfo<void> {
 
   static const String name = 'AllPeopleRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const AllPeoplePage();
+    },
+  );
 }
 
 /// generated route for
@@ -676,7 +368,12 @@ class AllPlacesRoute extends PageRouteInfo<void> {
 
   static const String name = 'AllPlacesRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const AllPlacesPage();
+    },
+  );
 }
 
 /// generated route for
@@ -690,7 +387,12 @@ class AllVideosRoute extends PageRouteInfo<void> {
 
   static const String name = 'AllVideosRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const AllVideosPage();
+    },
+  );
 }
 
 /// generated route for
@@ -711,8 +413,16 @@ class AppLogDetailRoute extends PageRouteInfo<AppLogDetailRouteArgs> {
 
   static const String name = 'AppLogDetailRoute';
 
-  static const PageInfo<AppLogDetailRouteArgs> page =
-      PageInfo<AppLogDetailRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<AppLogDetailRouteArgs>();
+      return AppLogDetailPage(
+        key: args.key,
+        logMessage: args.logMessage,
+      );
+    },
+  );
 }
 
 class AppLogDetailRouteArgs {
@@ -742,7 +452,12 @@ class AppLogRoute extends PageRouteInfo<void> {
 
   static const String name = 'AppLogRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const AppLogPage();
+    },
+  );
 }
 
 /// generated route for
@@ -756,7 +471,12 @@ class ArchiveRoute extends PageRouteInfo<void> {
 
   static const String name = 'ArchiveRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const ArchivePage();
+    },
+  );
 }
 
 /// generated route for
@@ -770,7 +490,12 @@ class BackupAlbumSelectionRoute extends PageRouteInfo<void> {
 
   static const String name = 'BackupAlbumSelectionRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const BackupAlbumSelectionPage();
+    },
+  );
 }
 
 /// generated route for
@@ -784,7 +509,12 @@ class BackupControllerRoute extends PageRouteInfo<void> {
 
   static const String name = 'BackupControllerRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const BackupControllerPage();
+    },
+  );
 }
 
 /// generated route for
@@ -798,7 +528,12 @@ class BackupOptionsRoute extends PageRouteInfo<void> {
 
   static const String name = 'BackupOptionsRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const BackupOptionsPage();
+    },
+  );
 }
 
 /// generated route for
@@ -812,7 +547,12 @@ class ChangePasswordRoute extends PageRouteInfo<void> {
 
   static const String name = 'ChangePasswordRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const ChangePasswordPage();
+    },
+  );
 }
 
 /// generated route for
@@ -835,8 +575,17 @@ class CreateAlbumRoute extends PageRouteInfo<CreateAlbumRouteArgs> {
 
   static const String name = 'CreateAlbumRoute';
 
-  static const PageInfo<CreateAlbumRouteArgs> page =
-      PageInfo<CreateAlbumRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<CreateAlbumRouteArgs>();
+      return CreateAlbumPage(
+        key: args.key,
+        isSharedAlbum: args.isSharedAlbum,
+        initialAssets: args.initialAssets,
+      );
+    },
+  );
 }
 
 class CreateAlbumRouteArgs {
@@ -876,8 +625,16 @@ class CropImageRoute extends PageRouteInfo<CropImageRouteArgs> {
 
   static const String name = 'CropImageRoute';
 
-  static const PageInfo<CropImageRouteArgs> page =
-      PageInfo<CropImageRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<CropImageRouteArgs>();
+      return CropImagePage(
+        key: args.key,
+        image: args.image,
+      );
+    },
+  );
 }
 
 class CropImageRouteArgs {
@@ -916,8 +673,18 @@ class EditImageRoute extends PageRouteInfo<EditImageRouteArgs> {
 
   static const String name = 'EditImageRoute';
 
-  static const PageInfo<EditImageRouteArgs> page =
-      PageInfo<EditImageRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<EditImageRouteArgs>(
+          orElse: () => const EditImageRouteArgs());
+      return EditImagePage(
+        key: args.key,
+        image: args.image,
+        asset: args.asset,
+      );
+    },
+  );
 }
 
 class EditImageRouteArgs {
@@ -950,7 +717,12 @@ class FailedBackupStatusRoute extends PageRouteInfo<void> {
 
   static const String name = 'FailedBackupStatusRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const FailedBackupStatusPage();
+    },
+  );
 }
 
 /// generated route for
@@ -964,7 +736,12 @@ class FavoritesRoute extends PageRouteInfo<void> {
 
   static const String name = 'FavoritesRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const FavoritesPage();
+    },
+  );
 }
 
 /// generated route for
@@ -991,8 +768,19 @@ class GalleryViewerRoute extends PageRouteInfo<GalleryViewerRouteArgs> {
 
   static const String name = 'GalleryViewerRoute';
 
-  static const PageInfo<GalleryViewerRouteArgs> page =
-      PageInfo<GalleryViewerRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<GalleryViewerRouteArgs>();
+      return GalleryViewerPage(
+        key: args.key,
+        renderList: args.renderList,
+        initialIndex: args.initialIndex,
+        heroOffset: args.heroOffset,
+        showStack: args.showStack,
+      );
+    },
+  );
 }
 
 class GalleryViewerRouteArgs {
@@ -1031,7 +819,12 @@ class HeaderSettingsRoute extends PageRouteInfo<void> {
 
   static const String name = 'HeaderSettingsRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const HeaderSettingsPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1045,7 +838,12 @@ class LibraryRoute extends PageRouteInfo<void> {
 
   static const String name = 'LibraryRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const LibraryPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1059,7 +857,12 @@ class LoginRoute extends PageRouteInfo<void> {
 
   static const String name = 'LoginRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const LoginPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1080,8 +883,17 @@ class MapLocationPickerRoute extends PageRouteInfo<MapLocationPickerRouteArgs> {
 
   static const String name = 'MapLocationPickerRoute';
 
-  static const PageInfo<MapLocationPickerRouteArgs> page =
-      PageInfo<MapLocationPickerRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<MapLocationPickerRouteArgs>(
+          orElse: () => const MapLocationPickerRouteArgs());
+      return MapLocationPickerPage(
+        key: args.key,
+        initialLatLng: args.initialLatLng,
+      );
+    },
+  );
 }
 
 class MapLocationPickerRouteArgs {
@@ -1111,7 +923,12 @@ class MapRoute extends PageRouteInfo<void> {
 
   static const String name = 'MapRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const MapPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1134,7 +951,17 @@ class MemoryRoute extends PageRouteInfo<MemoryRouteArgs> {
 
   static const String name = 'MemoryRoute';
 
-  static const PageInfo<MemoryRouteArgs> page = PageInfo<MemoryRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<MemoryRouteArgs>();
+      return MemoryPage(
+        memories: args.memories,
+        memoryIndex: args.memoryIndex,
+        key: args.key,
+      );
+    },
+  );
 }
 
 class MemoryRouteArgs {
@@ -1174,8 +1001,16 @@ class PartnerDetailRoute extends PageRouteInfo<PartnerDetailRouteArgs> {
 
   static const String name = 'PartnerDetailRoute';
 
-  static const PageInfo<PartnerDetailRouteArgs> page =
-      PageInfo<PartnerDetailRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<PartnerDetailRouteArgs>();
+      return PartnerDetailPage(
+        key: args.key,
+        partner: args.partner,
+      );
+    },
+  );
 }
 
 class PartnerDetailRouteArgs {
@@ -1205,7 +1040,12 @@ class PartnerRoute extends PageRouteInfo<void> {
 
   static const String name = 'PartnerRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const PartnerPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1219,7 +1059,12 @@ class PermissionOnboardingRoute extends PageRouteInfo<void> {
 
   static const String name = 'PermissionOnboardingRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const PermissionOnboardingPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1242,8 +1087,17 @@ class PersonResultRoute extends PageRouteInfo<PersonResultRouteArgs> {
 
   static const String name = 'PersonResultRoute';
 
-  static const PageInfo<PersonResultRouteArgs> page =
-      PageInfo<PersonResultRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<PersonResultRouteArgs>();
+      return PersonResultPage(
+        key: args.key,
+        personId: args.personId,
+        personName: args.personName,
+      );
+    },
+  );
 }
 
 class PersonResultRouteArgs {
@@ -1276,7 +1130,12 @@ class PhotosRoute extends PageRouteInfo<void> {
 
   static const String name = 'PhotosRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const PhotosPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1290,7 +1149,12 @@ class RecentlyAddedRoute extends PageRouteInfo<void> {
 
   static const String name = 'RecentlyAddedRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const RecentlyAddedPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1311,8 +1175,17 @@ class SearchInputRoute extends PageRouteInfo<SearchInputRouteArgs> {
 
   static const String name = 'SearchInputRoute';
 
-  static const PageInfo<SearchInputRouteArgs> page =
-      PageInfo<SearchInputRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<SearchInputRouteArgs>(
+          orElse: () => const SearchInputRouteArgs());
+      return SearchInputPage(
+        key: args.key,
+        prefilter: args.prefilter,
+      );
+    },
+  );
 }
 
 class SearchInputRouteArgs {
@@ -1342,7 +1215,12 @@ class SearchRoute extends PageRouteInfo<void> {
 
   static const String name = 'SearchRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const SearchPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1356,7 +1234,12 @@ class SettingsRoute extends PageRouteInfo<void> {
 
   static const String name = 'SettingsRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const SettingsPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1377,8 +1260,16 @@ class SettingsSubRoute extends PageRouteInfo<SettingsSubRouteArgs> {
 
   static const String name = 'SettingsSubRoute';
 
-  static const PageInfo<SettingsSubRouteArgs> page =
-      PageInfo<SettingsSubRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<SettingsSubRouteArgs>();
+      return SettingsSubPage(
+        args.section,
+        key: args.key,
+      );
+    },
+  );
 }
 
 class SettingsSubRouteArgs {
@@ -1419,8 +1310,19 @@ class SharedLinkEditRoute extends PageRouteInfo<SharedLinkEditRouteArgs> {
 
   static const String name = 'SharedLinkEditRoute';
 
-  static const PageInfo<SharedLinkEditRouteArgs> page =
-      PageInfo<SharedLinkEditRouteArgs>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<SharedLinkEditRouteArgs>(
+          orElse: () => const SharedLinkEditRouteArgs());
+      return SharedLinkEditPage(
+        key: args.key,
+        existingLink: args.existingLink,
+        assetsList: args.assetsList,
+        albumId: args.albumId,
+      );
+    },
+  );
 }
 
 class SharedLinkEditRouteArgs {
@@ -1456,7 +1358,12 @@ class SharedLinkRoute extends PageRouteInfo<void> {
 
   static const String name = 'SharedLinkRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const SharedLinkPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1470,7 +1377,12 @@ class SharingRoute extends PageRouteInfo<void> {
 
   static const String name = 'SharingRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const SharingPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1484,7 +1396,12 @@ class SplashScreenRoute extends PageRouteInfo<void> {
 
   static const String name = 'SplashScreenRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const SplashScreenPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1498,7 +1415,12 @@ class TabControllerRoute extends PageRouteInfo<void> {
 
   static const String name = 'TabControllerRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const TabControllerPage();
+    },
+  );
 }
 
 /// generated route for
@@ -1512,5 +1434,10 @@ class TrashRoute extends PageRouteInfo<void> {
 
   static const String name = 'TrashRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const TrashPage();
+    },
+  );
 }
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 69a608b0cf..efe353e2ea 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0"
   async:
     dependency: "direct main"
     description:
@@ -61,18 +61,18 @@ packages:
     dependency: "direct main"
     description:
       name: auto_route
-      sha256: "6cad3f408863ffff2b5757967c802b18415dac4acb1b40c5cdd45d0a26e5080f"
+      sha256: bb673104dbdc22667d01ec668df3d2a358b6e3da481428eeb1151933cfc1a7d6
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.3"
+    version: "9.2.0"
   auto_route_generator:
     dependency: "direct dev"
     description:
       name: auto_route_generator
-      sha256: ba28133d3a3bf0a66772bcc98dade5843753cd9f1a8fb4802b842895515b67d3
+      sha256: c9086eb07271e51b44071ad5cff34e889f3156710b964a308c2ab590769e79e6
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "9.0.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -117,10 +117,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21"
+      sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.8"
+    version: "2.4.11"
   build_runner_core:
     dependency: transitive
     description:
@@ -237,10 +237,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189"
+      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.10.0"
   collection:
     dependency: "direct main"
     description:
@@ -341,10 +341,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.6"
   dartx:
     dependency: transitive
     description:
@@ -1431,10 +1431,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16
+      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   source_span:
     dependency: transitive
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 6752ad59b6..6c765b966d 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   cached_network_image: ^3.3.1
   flutter_cache_manager: ^3.3.1
   intl: ^0.19.0
-  auto_route: ^8.0.2
+  auto_route: ^9.2.0
   fluttertoast: ^8.2.4
   video_player: ^2.8.2
   chewie: ^1.7.4
@@ -94,7 +94,7 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^4.0.0
   build_runner: ^2.4.8
-  auto_route_generator: ^8.0.0
+  auto_route_generator: ^9.0.0
   flutter_launcher_icons: ^0.13.1
   flutter_native_splash: ^2.3.9
   isar_generator: ^3.1.0+1