diff --git a/src/index.js b/src/index.js
index 666fc66a9..9e159b97c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,7 +3,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import {createBrowserHistory} from 'history';
-import {Router, Route, Switch, Redirect} from 'react-router-dom';
+import {BrowserRouter as Router, Route, Routes, Navigate} from 'react-router-dom';
 
 // core components
 import Admin from './ui/layouts/Admin.js';
@@ -15,11 +15,11 @@ const hist = createBrowserHistory();
 
 ReactDOM.render(
     <Router history={hist}>
-      <Switch>
-        <Route path="/admin" component={Admin} />
-        <Route path="/login" component={Login} />
-        <Redirect from="/" to="/admin/dashboard" />
-      </Switch>
+      <Routes>
+        <Route exact path="/admin" element={<Admin/>} />
+        <Route exact path="/login" element={<Login/>} />
+        <Route exact path="/" element={<Navigate from="/" to="/login" />} />
+      </Routes>
     </Router>,
     document.getElementById('root'),
 );
diff --git a/src/ui/layouts/Admin.js b/src/ui/layouts/Admin.js
index 18d930513..64c64ec1b 100644
--- a/src/ui/layouts/Admin.js
+++ b/src/ui/layouts/Admin.js
@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 /* eslint-disable require-jsdoc */
 import React from 'react';
-import {Switch, Route, Redirect} from 'react-router-dom';
+import {Routes, Route, Navigate} from 'react-router-dom';
 import {makeStyles} from '@material-ui/core/styles';
 import Navbar from '../components/Navbars/Navbar.js';
 import Footer from '../components/Footer/Footer.js';
@@ -14,21 +14,21 @@ import logo from '../assets/img/reactlogo.png';
 let ps;
 
 const switchRoutes = (
-  <Switch>
+  <Routes>
     {routes.map((prop, key) => {
       if (prop.layout === '/admin') {
         return (
           <Route
             exact path={prop.layout + prop.path}
-            component={prop.component}
+            element={prop.component}
             key={key}
           />
         );
       }
       return null;
     })}
-    <Redirect from="/admin" to="/admin/dashboard" />
-  </Switch>
+    <Navigate from="/admin" to="/admin/dashboard" />
+  </Routes>
 );
 
 const useStyles = makeStyles(styles);
diff --git a/src/ui/views/Dashboard/Components/PushTable.js b/src/ui/views/Dashboard/Components/PushTable.js
index a661be367..7de67532f 100644
--- a/src/ui/views/Dashboard/Components/PushTable.js
+++ b/src/ui/views/Dashboard/Components/PushTable.js
@@ -6,7 +6,7 @@ import BugReport from '@material-ui/icons/BugReport';
 import Code from '@material-ui/icons/Code';
 import Table from '../../../components/Table/Table.js';
 import CustomTabs from '../../../components/CustomTabs/CustomTabs.js';
-import {Redirect} from 'react-router-dom';
+import {Navigate} from 'react-router-dom';
 
 
 export default function PushesWaitingAuthorizationGraph() {
@@ -46,7 +46,7 @@ export default function PushesWaitingAuthorizationGraph() {
 
   if (isLoading) return (<div>Loading ...</div>);
   if (isError) return (<div>Something went wrong ...</div>);
-  if (!auth) return (<Redirect to={{pathname: '/login'}} />);
+  if (!auth) return (<Navigate to={{pathname: '/login'}} />);
 
   return (
     <CustomTabs
diff --git a/src/ui/views/Login/Login.js b/src/ui/views/Login/Login.js
index 35fbc5bfd..a018f86ec 100644
--- a/src/ui/views/Login/Login.js
+++ b/src/ui/views/Login/Login.js
@@ -15,7 +15,7 @@ import CardHeader from '../../components/Card/CardHeader.js';
 import CardBody from '../../components/Card/CardBody.js';
 import CardFooter from '../../components/Card/CardFooter.js';
 import axios from 'axios';
-import {Redirect} from 'react-router-dom';
+import {Navigate} from 'react-router-dom';
 
 const styles = {
   cardCategoryWhite: {
@@ -72,7 +72,7 @@ export default function UserProfile() {
 
   if (success) {
     return (
-      <Redirect to={{pathname: '/', state: {authed: true}}} />
+      <Navigate to={{pathname: '/', state: {authed: true}}} />
     );
   }
 
diff --git a/src/ui/views/OpenPushRequests/components/PushesTable.js b/src/ui/views/OpenPushRequests/components/PushesTable.js
index 256742efa..413093b71 100644
--- a/src/ui/views/OpenPushRequests/components/PushesTable.js
+++ b/src/ui/views/OpenPushRequests/components/PushesTable.js
@@ -3,7 +3,7 @@
 import React, {useState, useEffect} from 'react';
 import {makeStyles} from '@material-ui/core/styles';
 import moment from 'moment';
-import {useHistory} from 'react-router-dom';
+import {useNavigate} from 'react-router-dom';
 import Button from '@material-ui/core/Button';
 import Table from '@material-ui/core/Table';
 import TableBody from '@material-ui/core/TableBody';
@@ -12,7 +12,7 @@ import TableContainer from '@material-ui/core/TableContainer';
 import TableHead from '@material-ui/core/TableHead';
 import TableRow from '@material-ui/core/TableRow';
 import Paper from '@material-ui/core/Paper';
-import {Redirect} from 'react-router-dom';
+import {Navigate} from 'react-router-dom';
 import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js';
 import {getPushes} from '../../../services/git-push';
 
@@ -23,7 +23,7 @@ export default function PushesTable(props) {
   const [auth, setAuth] = useState(true);
   const [isLoading, setIsLoading] = useState(false);
   const [isError, setIsError] = useState(false);
-  const history = useHistory();
+  const history = useNavigate();
 
 
   const openPush = (push) => history.push(`/admin/push/${push}`);
@@ -40,7 +40,7 @@ export default function PushesTable(props) {
 
   if (isLoading) return (<div>Loading ...</div>);
   if (isError) return (<div>Something went wrong ...</div>);
-  if (!auth) return (<Redirect to={{pathname: '/login'}} />);
+  if (!auth) return (<Navigate to={{pathname: '/login'}} />);
 
   return (
     <TableContainer component={Paper}>
diff --git a/src/ui/views/PushDetails/PushDetails.js b/src/ui/views/PushDetails/PushDetails.js
index 40911b2d5..ca275661d 100644
--- a/src/ui/views/PushDetails/PushDetails.js
+++ b/src/ui/views/PushDetails/PushDetails.js
@@ -1,9 +1,9 @@
 /* eslint-disable max-len */
 /* eslint-disable require-jsdoc */
 import React, {useState, useEffect} from 'react';
-import {Redirect} from 'react-router-dom';
+import {Navigate} from 'react-router-dom';
 import moment from 'moment';
-import {useHistory} from 'react-router-dom';
+import {useNavigate} from 'react-router-dom';
 import Icon from '@material-ui/core/Icon';
 import GridItem from '../../components/Grid/GridItem.js';
 import GridContainer from '../../components/Grid/GridContainer.js';
@@ -28,7 +28,7 @@ export default function Dashboard(props) {
   const [auth, setAuth] = useState(true);
   const [isLoading, setIsLoading] = useState(true);
   const [isError, setIsError] = useState(false);
-  const history = useHistory();
+  const history = useNavigate();
 
   useEffect(() => {
     getPush(id, setIsLoading, setData, setAuth, setIsError);
@@ -51,7 +51,7 @@ export default function Dashboard(props) {
 
   if (isLoading) return (<div>Loading ...</div>);
   if (isError) return (<div>Something went wrong ...</div>);
-  if (!auth) return (<Redirect to={{pathname: '/login'}} />);
+  if (!auth) return (<Navigate to={{pathname: '/login'}} />);
 
   let headerData = {
     title: 'Waiting Approval',
diff --git a/src/ui/views/RepoDetails/Components/AddUser.js b/src/ui/views/RepoDetails/Components/AddUser.js
index 3f568aa67..f594d1ab2 100644
--- a/src/ui/views/RepoDetails/Components/AddUser.js
+++ b/src/ui/views/RepoDetails/Components/AddUser.js
@@ -15,7 +15,7 @@ import Button from '../../../components/CustomButtons/Button.js';
 import DialogTitle from '@material-ui/core/DialogTitle';
 import Select from '@material-ui/core/Select';
 import Dialog from '@material-ui/core/Dialog';
-import {Redirect} from 'react-router-dom';
+import {Navigate} from 'react-router-dom';
 
 import {addUser} from '../../../services/repo.js';
 import {getUsers} from '../../../services/user.js';
@@ -60,7 +60,7 @@ function AddUserDialog(props) {
 
   if (isLoading) return (<div>Loading ...</div>);
   if (isError) return (<div>Something went wrong ...</div>);
-  if (!auth) return (<Redirect to={{pathname: '/login'}} />);
+  if (!auth) return (<Navigate to={{pathname: '/login'}} />);
 
   console.log(JSON.stringify(props));
 
diff --git a/src/ui/views/RepoDetails/RepoDetails.js b/src/ui/views/RepoDetails/RepoDetails.js
index e76a4517f..69b4782a5 100644
--- a/src/ui/views/RepoDetails/RepoDetails.js
+++ b/src/ui/views/RepoDetails/RepoDetails.js
@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 /* eslint-disable require-jsdoc */
 import React, {useState, useEffect} from 'react';
-import {Redirect} from 'react-router-dom';
+import {Navigate} from 'react-router-dom';
 // import Icon from '@material-ui/core/Icon';
 import GridItem from '../../components/Grid/GridItem.js';
 import GridContainer from '../../components/Grid/GridContainer.js';
@@ -53,7 +53,7 @@ export default function RepoDetails(props) {
 
   if (isLoading) return (<div>Loading ...</div>);
   if (isError) return (<div>Something went wrong ...</div>);
-  if (!auth) return (<Redirect to={{pathname: '/login'}} />);
+  if (!auth) return (<Navigate to={{pathname: '/login'}} />);
 
   return (
     <GridContainer>
diff --git a/src/ui/views/RepoList/Components/Repositories.js b/src/ui/views/RepoList/Components/Repositories.js
index 67645f134..2fce50d8a 100644
--- a/src/ui/views/RepoList/Components/Repositories.js
+++ b/src/ui/views/RepoList/Components/Repositories.js
@@ -2,7 +2,7 @@
 /* eslint-disable require-jsdoc */
 import React, {useState, useEffect} from 'react';
 import {makeStyles} from '@material-ui/core/styles';
-import {useHistory} from 'react-router-dom';
+import {useNavigate} from 'react-router-dom';
 import Button from '@material-ui/core/Button';
 import Table from '@material-ui/core/Table';
 import TableBody from '@material-ui/core/TableBody';
@@ -11,7 +11,7 @@ import TableContainer from '@material-ui/core/TableContainer';
 import TableHead from '@material-ui/core/TableHead';
 import TableRow from '@material-ui/core/TableRow';
 import Paper from '@material-ui/core/Paper';
-import {Redirect} from 'react-router-dom';
+import {Navigate} from 'react-router-dom';
 import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js';
 import {getRepos} from '../../../services/repo';
 
@@ -22,7 +22,7 @@ export default function Repositories(props) {
   const [auth, setAuth] = useState(true);
   const [isLoading, setIsLoading] = useState(false);
   const [isError, setIsError] = useState(false);
-  const history = useHistory();
+  const history = useNavigate();
 
 
   const openRepo = (repo) => history.push(`/admin/repo/${repo}`);
@@ -39,7 +39,7 @@ export default function Repositories(props) {
 
   if (isLoading) return (<div>Loading ...</div>);
   if (isError) return (<div>Something went wrong ...</div>);
-  if (!auth) return (<Redirect to={{pathname: '/login'}} />);
+  if (!auth) return (<Navigate to={{pathname: '/login'}} />);
 
   return (
     <TableContainer component={Paper}>
diff --git a/src/ui/views/User/User.js b/src/ui/views/User/User.js
index 3cdcb881c..34e065db1 100644
--- a/src/ui/views/User/User.js
+++ b/src/ui/views/User/User.js
@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 /* eslint-disable require-jsdoc */
 import React, {useState, useEffect} from 'react';
-import {Redirect} from 'react-router-dom';
+import {Navigate} from 'react-router-dom';
 import Icon from '@material-ui/core/Icon';
 import GridItem from '../../components/Grid/GridItem.js';
 import GridContainer from '../../components/Grid/GridContainer.js';
@@ -49,7 +49,7 @@ export default function Dashboard(props) {
 
   if (isLoading) return (<div>Loading ...</div>);
   if (isError) return (<div>Something went wrong ...</div>);
-  if (!auth) return (<Redirect to={{pathname: '/login'}} />);
+  if (!auth) return (<Navigate to={{pathname: '/login'}} />);
 
   console.log(data);
 
diff --git a/src/ui/views/UserList/Components/UserList.js b/src/ui/views/UserList/Components/UserList.js
index f7d99581e..17b788a8f 100644
--- a/src/ui/views/UserList/Components/UserList.js
+++ b/src/ui/views/UserList/Components/UserList.js
@@ -2,7 +2,7 @@
 /* eslint-disable require-jsdoc */
 import React, {useState, useEffect} from 'react';
 import {makeStyles} from '@material-ui/core/styles';
-import {useHistory} from 'react-router-dom';
+import {useNavigate} from 'react-router-dom';
 import GridItem from '../../../components/Grid/GridItem.js';
 import GridContainer from '../../../components/Grid/GridContainer.js';
 import Button from '@material-ui/core/Button';
@@ -13,7 +13,7 @@ import TableContainer from '@material-ui/core/TableContainer';
 import TableHead from '@material-ui/core/TableHead';
 import TableRow from '@material-ui/core/TableRow';
 import Paper from '@material-ui/core/Paper';
-import {Redirect} from 'react-router-dom';
+import {Navigate} from 'react-router-dom';
 import styles from '../../../assets/jss/material-dashboard-react/views/dashboardStyle.js';
 import {getUsers} from '../../../services/user';
 import NewUser from './NewUser';
@@ -25,7 +25,7 @@ export default function UserList(props) {
   const [auth, setAuth] = useState(true);
   const [isLoading, setIsLoading] = useState(false);
   const [isError, setIsError] = useState(false);
-  const history = useHistory();
+  const history = useNavigate();
 
   const openUser = (username) => history.push(`/admin/user/${username}`);
 
@@ -41,7 +41,7 @@ export default function UserList(props) {
 
   if (isLoading) return (<div>Loading ...</div>);
   if (isError) return (<div>Something went wrong ...</div>);
-  if (!auth) return (<Redirect to={{pathname: '/login'}} />);
+  if (!auth) return (<Navigate to={{pathname: '/login'}} />);
 
   return (
     <GridContainer>