diff --git a/apps/hackathon/src/components/navigation.tsx b/apps/hackathon/src/components/navigation.tsx
index b4a8b7b..fb4ddc7 100644
--- a/apps/hackathon/src/components/navigation.tsx
+++ b/apps/hackathon/src/components/navigation.tsx
@@ -1,5 +1,5 @@
 import { FC, useState } from 'react';
-import { Link, useNavigate } from 'react-router';
+import { Link, useNavigate } from '@tanstack/react-router';
 import { useUserMe, useMyTeams } from '@imphnen-frontend-service/service';
 import { useSession } from '@imphnen-frontend-service/service';
 
diff --git a/apps/hackathon/src/components/sidebar.tsx b/apps/hackathon/src/components/sidebar.tsx
index 0f760d3..a0f979f 100644
--- a/apps/hackathon/src/components/sidebar.tsx
+++ b/apps/hackathon/src/components/sidebar.tsx
@@ -1,10 +1,10 @@
 import { FC, useEffect } from 'react';
-import { Link, useLocation } from 'react-router';
+import { Link, useLocation } from '@tanstack/react-router';
 import {
   useMyTeams,
   useAuthStore,
 } from '@imphnen-frontend-service/service';
-import { useNavigate } from 'react-router';
+import { useNavigate } from '@tanstack/react-router';
 import { toast } from 'sonner';
 import { useTheme } from './theme-provider';
 import { Icon } from '@iconify/react';
diff --git a/libs/ui/src/organisms/backoffice-sidebar/backoffice-sidebar.tsx b/libs/ui/src/organisms/backoffice-sidebar/backoffice-sidebar.tsx
index bd2f709..12a2891 100644
--- a/libs/ui/src/organisms/backoffice-sidebar/backoffice-sidebar.tsx
+++ b/libs/ui/src/organisms/backoffice-sidebar/backoffice-sidebar.tsx
@@ -20,7 +20,7 @@ import {
 } from '@ant-design/icons';
 import { Button } from '../../atoms';
 import { FC, ReactElement, useState } from 'react';
-import { Link, useLocation } from 'react-router-dom';
+import { Link, useLocation } from '@tanstack/react-router';
 import { cn, For } from '@imphnen-frontend-service/utils';
 import { useSession } from '@imphnen-frontend-service/service';
 
diff --git a/libs/ui/src/organisms/navbar/navbar.tsx b/libs/ui/src/organisms/navbar/navbar.tsx
index 2adb1ae..9064dc7 100644
--- a/libs/ui/src/organisms/navbar/navbar.tsx
+++ b/libs/ui/src/organisms/navbar/navbar.tsx
@@ -1,6 +1,6 @@
 import { MenuOutlined } from '@ant-design/icons';
 import { FC, ReactElement, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link } from '@tanstack/react-router';
 import { Button } from '../../atoms/button';
 import { useModalLogin } from '@imphnen-frontend-service/utils';
 import { useSession } from '@imphnen-frontend-service/service';