diff --git a/packages/manager/apps/hpc-vmware-managed-vcd/public/translations/dashboard/Messages_en_GB.json b/packages/manager/apps/hpc-vmware-managed-vcd/public/translations/dashboard/Messages_en_GB.json
index 8a123beb94a1..b7c9c76da97d 100644
--- a/packages/manager/apps/hpc-vmware-managed-vcd/public/translations/dashboard/Messages_en_GB.json
+++ b/packages/manager/apps/hpc-vmware-managed-vcd/public/translations/dashboard/Messages_en_GB.json
@@ -17,7 +17,7 @@
   "managed_vcd_dashboard_service_management": "Service management",
   "managed_vcd_dashboard_mailing_list": "Mailing list",
   "managed_vcd_dashboard_service_renew": "Renewal",
-  "managed_vcd_dashboard_service_cancellation": "Close service",
+  "managed_vcd_dashboard_service_cancellation": "Cancel the service",
   "managed_vcd_dashboard_password": "Password",
   "managed_vcd_dashboard_password_renew": "Renew the admin password",
   "managed_vcd_dashboard_password_tooltip": "If you would like to change your admin password, please contact support",
diff --git a/packages/manager/apps/hpc-vmware-managed-vcd/src/App.tsx b/packages/manager/apps/hpc-vmware-managed-vcd/src/App.tsx
index 6e36769594e4..b013cc1f7ddb 100644
--- a/packages/manager/apps/hpc-vmware-managed-vcd/src/App.tsx
+++ b/packages/manager/apps/hpc-vmware-managed-vcd/src/App.tsx
@@ -1,9 +1,14 @@
-import React from 'react';
+import React, { Suspense } from 'react';
 import { QueryClientProvider, QueryClient } from '@tanstack/react-query';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
-import { RouterProvider, createHashRouter } from 'react-router-dom';
-import { Routes } from './routes/routes';
+import {
+  RouterProvider,
+  createHashRouter,
+  createRoutesFromElements,
+} from 'react-router-dom';
+import Routes from '@/routes/routes';
 import { MessageContextProvider } from './context/Message.context';
+import Loading from './components/loading/Loading.component';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -14,12 +19,14 @@ const queryClient = new QueryClient({
 });
 
 function App() {
-  const router = createHashRouter(Routes);
+  const routes = createHashRouter(createRoutesFromElements(Routes));
 
   return (
     <QueryClientProvider client={queryClient}>
       <MessageContextProvider>
-        <RouterProvider router={router} />
+        <Suspense fallback={<Loading />}>
+          <RouterProvider router={routes} />
+        </Suspense>
       </MessageContextProvider>
       <ReactQueryDevtools />
     </QueryClientProvider>
diff --git a/packages/manager/apps/hpc-vmware-managed-vcd/src/components/tiles/datacentre-general-information-tile/DatacentreGeneralInformationTile.spec.tsx b/packages/manager/apps/hpc-vmware-managed-vcd/src/components/tiles/datacentre-general-information-tile/DatacentreGeneralInformationTile.spec.tsx
index 64caeda35f5f..065798021a0c 100644
--- a/packages/manager/apps/hpc-vmware-managed-vcd/src/components/tiles/datacentre-general-information-tile/DatacentreGeneralInformationTile.spec.tsx
+++ b/packages/manager/apps/hpc-vmware-managed-vcd/src/components/tiles/datacentre-general-information-tile/DatacentreGeneralInformationTile.spec.tsx
@@ -24,6 +24,16 @@ vi.mock('@ovh-ux/manager-react-shell-client', async (importOriginal) => {
   };
 });
 
+vi.mock('react-router-dom', async (importOriginal) => {
+  const module: typeof import('react-router-dom') = await importOriginal();
+  return {
+    ...module,
+    useNavigate: () => vi.fn(),
+    useParams: () => ({ id: 'id' }),
+    Route: module.Route,
+  };
+});
+
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
@@ -35,11 +45,6 @@ const queryClient = new QueryClient({
   },
 });
 
-vi.mock('react-router-dom', () => ({
-  useNavigate: () => ({ navigate: vi.fn() }),
-  useParams: () => ({ id: 'id' }),
-}));
-
 const vcdOrg = {
   currentState: {
     apiUrl: 'https://vcd.my.demo.lab',
diff --git a/packages/manager/apps/hpc-vmware-managed-vcd/src/components/tiles/organization-service-tile/OrganizationServiceManagementTile.spec.tsx b/packages/manager/apps/hpc-vmware-managed-vcd/src/components/tiles/organization-service-tile/OrganizationServiceManagementTile.spec.tsx
index 07dcb9d3e15f..6eb5263bb245 100644
--- a/packages/manager/apps/hpc-vmware-managed-vcd/src/components/tiles/organization-service-tile/OrganizationServiceManagementTile.spec.tsx
+++ b/packages/manager/apps/hpc-vmware-managed-vcd/src/components/tiles/organization-service-tile/OrganizationServiceManagementTile.spec.tsx
@@ -11,12 +11,15 @@ import OrganizationServiceManagementTile from './OrganizationServiceManagementTi
 import { labels } from '../../../test-utils';
 import { subRoutes, urls } from '../../../routes/routes.constant';
 
-vi.mock('react-router-dom', async (importOriginal) => ({
-  ...(await importOriginal()),
-  useHref: () => urls.resetPassword.replace(subRoutes.dashboard, 'id'),
-  useNavigate: () => ({ navigate: vi.fn() }),
-  useParams: () => ({ id: 'id' }),
-}));
+vi.mock('react-router-dom', async (importOriginal) => {
+  const module: typeof import('react-router-dom') = await importOriginal();
+  return {
+    ...module,
+    useHref: () => urls.resetPassword.replace(subRoutes.dashboard, 'id'),
+    useNavigate: () => vi.fn(),
+    useParams: () => ({ id: 'id' }),
+  };
+});
 
 const shellContext = {
   environment: {
diff --git a/packages/manager/apps/hpc-vmware-managed-vcd/src/routes/routes.tsx b/packages/manager/apps/hpc-vmware-managed-vcd/src/routes/routes.tsx
index 76661897741d..f486e7dfbfee 100644
--- a/packages/manager/apps/hpc-vmware-managed-vcd/src/routes/routes.tsx
+++ b/packages/manager/apps/hpc-vmware-managed-vcd/src/routes/routes.tsx
@@ -1,243 +1,244 @@
+import { ErrorBoundary } from '@ovh-ux/manager-react-components';
 import React from 'react';
-import { RouteObject } from 'react-router-dom';
+import { Route } from 'react-router-dom';
 import { PageType } from '@ovh-ux/manager-react-shell-client';
 import NotFound from '@/pages/404';
 import { urls } from '@/routes/routes.constant';
 
-const lazyRouteConfig = (importFn: CallableFunction): Partial<RouteObject> => {
-  return {
-    lazy: async () => {
-      const { default: moduleDefault, ...moduleExports } = await importFn();
-      return {
-        Component: moduleDefault,
-        ...moduleExports,
-      };
-    },
-  };
-};
+const LayoutPage = React.lazy(() => import('@/pages/layout'));
+const OnboardingPage = React.lazy(() =>
+  import('@/pages/onboarding/Onboarding.page'),
+);
+const ListingPage = React.lazy(() =>
+  import('@/pages/listing/organizations/Organizations.page'),
+);
+const OrganizationDashboardPage = React.lazy(() =>
+  import('@/pages/dashboard/organization/OrganizationDashboard.page'),
+);
+const OrganizationGeneralInformationPage = React.lazy(() =>
+  import(
+    '@/pages/dashboard/organization/general-information/OrganizationGeneralInformation.page'
+  ),
+);
+const OrganizationEditNamePage = React.lazy(() =>
+  import(
+    '@/pages/dashboard/organization/general-information/edit/EditName.page'
+  ),
+);
+const OrganizationEditDescriptionPage = React.lazy(() =>
+  import(
+    '@/pages/dashboard/organization/general-information/edit/EditDescription.page'
+  ),
+);
+const OrganizationResetPasswordPage = React.lazy(() =>
+  import(
+    '@/pages/dashboard/organization/general-information/edit/EditPassword.page'
+  ),
+);
+const DatacentresPage = React.lazy(() =>
+  import('@/pages/listing/datacentres/Datacentres.page'),
+);
+const DatacentreDashboardPage = React.lazy(() =>
+  import('@/pages/dashboard/datacentre/DatacentreDashboard.page'),
+);
+const DatacentreGeneralInformationPage = React.lazy(() =>
+  import(
+    '@/pages/dashboard/datacentre/general-informations/DatacentreGeneralInformation.page'
+  ),
+);
+const DatacentreEditDescriptionPage = React.lazy(() =>
+  import(
+    '@/pages/dashboard/datacentre/general-informations/edit/EditVdcDescription.page'
+  ),
+);
+const DatacentreStoragePage = React.lazy(() =>
+  import('@/pages/dashboard/datacentre/storage/DatacentreStorage.page'),
+);
+const DatacentreStorageOrderPage = React.lazy(() =>
+  import(
+    '@/pages/dashboard/datacentre/storage-order/DatacentreStorageOrder.page'
+  ),
+);
+const DatacentreComputePage = React.lazy(() =>
+  import('@/pages/dashboard/datacentre/compute/DatacentreCompute.page'),
+);
+const DatacentreComputeOrderPage = React.lazy(() =>
+  import(
+    '@/pages/dashboard/datacentre/compute-order/DatacentreComputeOrder.page'
+  ),
+);
 
-export const Routes: any = [
-  {
-    path: urls.root,
-    ...lazyRouteConfig(() => import('@/pages/layout')),
-    children: [
-      {
-        id: 'listing',
-        path: urls.listing,
-        ...lazyRouteConfig(() =>
-          import('@/pages/listing/organizations/Organizations.page'),
-        ),
-        handle: {
+export default (
+  <Route
+    path={urls.root}
+    Component={LayoutPage}
+    id={'root'}
+    errorElement={
+      <ErrorBoundary
+        redirectionApp="hpc-vmware-managed-vcd-backup"
+        isPreloaderHide={true}
+        isRouteShellSync={true}
+      />
+    }
+  >
+    <Route
+      id={'listing'}
+      path={urls.listing}
+      Component={ListingPage}
+      handle={{
+        tracking: {
+          pageName: 'listing',
+          pageType: PageType.listing,
+        },
+      }}
+    />
+    <Route path={urls.dashboard} Component={OrganizationDashboardPage}>
+      <Route
+        id={'dashboard'}
+        path={''}
+        Component={OrganizationGeneralInformationPage}
+        handle={{
           tracking: {
-            pageName: 'listing',
-            pageType: PageType.listing,
+            pageName: 'general-informations',
+            pageType: PageType.dashboard,
           },
-        },
-      },
-      {
-        path: urls.dashboard,
-        ...lazyRouteConfig(() =>
-          import('@/pages/dashboard/organization/OrganizationDashboard.page'),
-        ),
-        children: [
-          {
-            id: 'dashboard',
-            path: '',
-            ...lazyRouteConfig(() =>
-              import(
-                '@/pages/dashboard/organization/general-information/OrganizationGeneralInformation.page'
-              ),
-            ),
-            handle: {
-              tracking: {
-                pageName: 'general-informations',
-                pageType: PageType.dashboard,
-              },
+        }}
+      >
+        <Route
+          id={'edit-name'}
+          path={urls.editName}
+          Component={OrganizationEditNamePage}
+          handle={{
+            tracking: {
+              pageName: 'edit-name',
+              pageType: PageType.popup,
             },
-            children: [
-              {
-                id: 'edit-name',
-                path: urls.editName,
-                ...lazyRouteConfig(() =>
-                  import(
-                    '@/pages/dashboard/organization/general-information/edit/EditName.page'
-                  ),
-                ),
-                handle: {
-                  tracking: {
-                    pageName: 'edit-name',
-                    pageType: PageType.popup,
-                  },
-                },
-              },
-              {
-                id: 'edit-description',
-                path: urls.editDescription,
-                ...lazyRouteConfig(() =>
-                  import(
-                    '@/pages/dashboard/organization/general-information/edit/EditDescription.page'
-                  ),
-                ),
-                handle: {
-                  tracking: {
-                    pageName: 'edit-description',
-                    pageType: PageType.popup,
-                  },
-                },
-              },
-              {
-                id: 'reset-password',
-                path: urls.resetPassword,
-                ...lazyRouteConfig(() =>
-                  import(
-                    '@/pages/dashboard/organization/general-information/edit/EditPassword.page'
-                  ),
-                ),
-                handle: {
-                  tracking: {
-                    pageName: 'reset-password',
-                    pageType: PageType.popup,
-                  },
-                },
-              },
-            ],
-          },
-          {
-            id: 'datacentres',
-            path: urls.datacentres,
-            ...lazyRouteConfig(() =>
-              import('@/pages/listing/datacentres/Datacentres.page'),
-            ),
-            handle: {
-              tracking: {
-                pageName: 'datacenters',
-                pageType: PageType.listing,
-              },
+          }}
+        />
+        <Route
+          id={'edit-description'}
+          path={urls.editDescription}
+          Component={OrganizationEditDescriptionPage}
+          handle={{
+            tracking: {
+              pageName: 'edit-description',
+              pageType: PageType.popup,
+            },
+          }}
+        />
+        <Route
+          id={'reset-password'}
+          path={urls.resetPassword}
+          Component={OrganizationResetPasswordPage}
+          handle={{
+            tracking: {
+              pageName: 'reset-password',
+              pageType: PageType.popup,
             },
+          }}
+        />
+      </Route>
+      <Route
+        id={'datacentres'}
+        path={urls.datacentres}
+        Component={DatacentresPage}
+        handle={{
+          tracking: {
+            pageName: 'datacenters',
+            pageType: PageType.listing,
           },
-        ],
-      },
-      {
-        path: urls.datacentreDashboard,
-        ...lazyRouteConfig(() =>
-          import('@/pages/dashboard/datacentre/DatacentreDashboard.page'),
-        ),
-        handle: {
+        }}
+      />
+    </Route>
+    <Route
+      path={urls.datacentreDashboard}
+      Component={DatacentreDashboardPage}
+      handle={{
+        tracking: {
+          pageName: 'datacenter',
+          pageType: PageType.dashboard,
+        },
+      }}
+    >
+      <Route
+        id={'vDcDashboard'}
+        path={''}
+        Component={DatacentreGeneralInformationPage}
+        handle={{
           tracking: {
             pageName: 'datacenter',
             pageType: PageType.dashboard,
           },
-        },
-        children: [
-          {
-            id: 'vDcDashboard',
-            path: '',
-            ...lazyRouteConfig(() =>
-              import(
-                '@/pages/dashboard/datacentre/general-informations/DatacentreGeneralInformation.page'
-              ),
-            ),
-            handle: {
-              tracking: {
-                pageName: 'datacenter',
-                pageType: PageType.dashboard,
-              },
-            },
-            children: [
-              {
-                id: 'vdc-edit-description',
-                path: urls.datacentreEditDescription,
-                ...lazyRouteConfig(() =>
-                  import(
-                    '@/pages/dashboard/datacentre/general-informations/edit/EditVdcDescription.page'
-                  ),
-                ),
-                handle: {
-                  tracking: {
-                    pageName: 'vdc-edit-description',
-                    pageType: PageType.popup,
-                  },
-                },
-              },
-            ],
-          },
-          {
-            id: 'vDcStorage',
-            path: urls.datacentreStorage,
-            ...lazyRouteConfig(() =>
-              import(
-                '@/pages/dashboard/datacentre/storage/DatacentreStorage.page'
-              ),
-            ),
-            handle: {
-              tracking: {
-                pageName: 'storage',
-                pageType: PageType.listing,
-              },
-            },
-          },
-          {
-            id: 'vDcStorage-order',
-            path: urls.datacentreStorageOrder,
-            ...lazyRouteConfig(() =>
-              import(
-                '@/pages/dashboard/datacentre/storage-order/DatacentreStorageOrder.page'
-              ),
-            ),
-            handle: {
-              tracking: {
-                pageName: 'storage-order',
-                pageType: PageType.funnel,
-              },
+        }}
+      >
+        <Route
+          id={'vdc-edit-description'}
+          path={urls.datacentreEditDescription}
+          Component={DatacentreEditDescriptionPage}
+          handle={{
+            tracking: {
+              pageName: 'vdc-edit-description',
+              pageType: PageType.popup,
             },
+          }}
+        />
+      </Route>
+      <Route
+        id={'vDcStorage'}
+        path={urls.datacentreStorage}
+        Component={DatacentreStoragePage}
+        handle={{
+          tracking: {
+            pageName: 'storage',
+            pageType: PageType.listing,
           },
-          {
-            id: 'vDcCompute',
-            path: urls.datacentreCompute,
-            ...lazyRouteConfig(() =>
-              import(
-                '@/pages/dashboard/datacentre/compute/DatacentreCompute.page'
-              ),
-            ),
-            handle: {
-              tracking: {
-                pageName: 'compute',
-                pageType: PageType.listing,
-              },
-            },
+        }}
+      />
+      <Route
+        id={'vDcStorage-order'}
+        path={urls.datacentreStorageOrder}
+        Component={DatacentreStorageOrderPage}
+        handle={{
+          tracking: {
+            pageName: 'storage-order',
+            pageType: PageType.funnel,
           },
-          {
-            id: 'vDcCompute-order',
-            path: urls.datacentreComputeOrder,
-            ...lazyRouteConfig(() =>
-              import(
-                '@/pages/dashboard/datacentre/compute-order/DatacentreComputeOrder.page'
-              ),
-            ),
-            handle: {
-              tracking: {
-                pageName: 'compute-order',
-                pageType: PageType.funnel,
-              },
-            },
+        }}
+      />
+      <Route
+        id={'vDcCompute'}
+        path={urls.datacentreCompute}
+        Component={DatacentreComputePage}
+        handle={{
+          tracking: {
+            pageName: 'compute',
+            pageType: PageType.listing,
           },
-        ],
-      },
-      {
-        id: 'onboarding',
-        path: urls.onboarding,
-        ...lazyRouteConfig(() => import('@/pages/onboarding/Onboarding.page')),
-        handle: {
+        }}
+      />
+      <Route
+        id={'vDcCompute-order'}
+        path={urls.datacentreComputeOrder}
+        Component={DatacentreComputeOrderPage}
+        handle={{
           tracking: {
-            pageName: 'onboarding',
-            pageType: PageType.onboarding,
+            pageName: 'compute-order',
+            pageType: PageType.funnel,
           },
+        }}
+      />
+    </Route>
+    <Route
+      id={'onboarding'}
+      path={urls.onboarding}
+      Component={OnboardingPage}
+      handle={{
+        tracking: {
+          pageName: 'onboarding',
+          pageType: PageType.onboarding,
         },
-      },
-    ],
-  },
-  {
-    path: '*',
-    element: <NotFound />,
-  },
-];
+      }}
+    />
+    <Route path={'*'} element={<NotFound />} />
+  </Route>
+);
diff --git a/packages/manager/apps/hpc-vmware-managed-vcd/src/test-utils/TestApp.tsx b/packages/manager/apps/hpc-vmware-managed-vcd/src/test-utils/TestApp.tsx
index 99fa0eaedc42..b871fe48eceb 100644
--- a/packages/manager/apps/hpc-vmware-managed-vcd/src/test-utils/TestApp.tsx
+++ b/packages/manager/apps/hpc-vmware-managed-vcd/src/test-utils/TestApp.tsx
@@ -1,11 +1,17 @@
-import React from 'react';
+import React, { Suspense } from 'react';
 import { QueryClientProvider, QueryClient } from '@tanstack/react-query';
-import { createMemoryRouter, RouterProvider } from 'react-router-dom';
-import { Routes } from '../routes/routes';
+import {
+  createMemoryRouter,
+  RouterProvider,
+  createRoutesFromElements,
+} from 'react-router-dom';
+import Routes from '@/routes/routes';
 import { MessageContextProvider } from '@/context/Message.context';
+import Loading from '@/components/loading/Loading.component';
 
 export function TestApp({ initialRoute = '/' }) {
-  const router = createMemoryRouter(Routes, {
+  const routes = createRoutesFromElements(Routes);
+  const router = createMemoryRouter(routes, {
     initialEntries: [initialRoute],
     initialIndex: 0,
   });
@@ -17,7 +23,9 @@ export function TestApp({ initialRoute = '/' }) {
   return (
     <QueryClientProvider client={queryClient}>
       <MessageContextProvider>
-        <RouterProvider router={router} />
+        <Suspense fallback={<Loading />}>
+          <RouterProvider router={router} />
+        </Suspense>
       </MessageContextProvider>
     </QueryClientProvider>
   );
diff --git a/packages/manager/apps/veeam-backup/public/translations/dashboard/Messages_en_GB.json b/packages/manager/apps/veeam-backup/public/translations/dashboard/Messages_en_GB.json
index 5af857a3fbec..6149c4c8eef8 100644
--- a/packages/manager/apps/veeam-backup/public/translations/dashboard/Messages_en_GB.json
+++ b/packages/manager/apps/veeam-backup/public/translations/dashboard/Messages_en_GB.json
@@ -14,7 +14,7 @@
   "subscription": "Subscription",
   "next_billing": "Next payment date",
   "creation_date": "Created on",
-  "delete_service": "Close service",
+  "delete_service": "Cancel the service",
   "contacts": "Contacts",
   "automatic_renew": "Automatic renewal",
   "manual_renew": "Manual renewal",