diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index a17b9170..3e788c4b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -26,11 +26,10 @@
         "@xterm/xterm": "5.5.0",
         "axios": "1.7.4",
         "copy-to-clipboard": "3.3.3",
+        "dayjs": "^1.11.13",
         "generate-password": "1.7.1",
         "jwt-decode": "4.0.0",
         "md5": "2.3.0",
-        "moment": "2.30.1",
-        "moment-duration-format": "2.3.2",
         "msgpack5": "6.0.2",
         "pluralize": "8.0.0",
         "react": "^18.2.0",
@@ -105,6 +104,7 @@
         "less-loader": "12.2.0",
         "lint-staged": "15.2.7",
         "mini-css-extract-plugin": "2.9.0",
+        "mockdate": "^3.0.5",
         "msw": "2.3.4",
         "postcss": "8.4.40",
         "postcss-loader": "8.1.1",
@@ -7953,9 +7953,9 @@
       "integrity": "sha512-QWxYLR5P/6GStZcdem+V1xoto6DMadYWpMXU82ES3/RfR3Wdwr3D0+be7mgOJ+Ov0G9D5Dmb9T17sNLQYj9XOg=="
     },
     "node_modules/dayjs": {
-      "version": "1.11.10",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
-      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
     },
     "node_modules/debug": {
       "version": "4.3.4",
@@ -14044,6 +14044,12 @@
         "node": ">=10"
       }
     },
+    "node_modules/mockdate": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz",
+      "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==",
+      "dev": true
+    },
     "node_modules/moment": {
       "version": "2.30.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
@@ -14052,11 +14058,6 @@
         "node": "*"
       }
     },
-    "node_modules/moment-duration-format": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.3.2.tgz",
-      "integrity": "sha512-cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ=="
-    },
     "node_modules/moment-timezone": {
       "version": "0.5.44",
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.44.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 2d5045bd..bb78abdb 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,11 +16,10 @@
     "@stripe/stripe-js": "4.1.0",
     "axios": "1.7.4",
     "copy-to-clipboard": "3.3.3",
+    "dayjs": "^1.11.13",
     "generate-password": "1.7.1",
     "jwt-decode": "4.0.0",
     "md5": "2.3.0",
-    "moment": "2.30.1",
-    "moment-duration-format": "2.3.2",
     "msgpack5": "6.0.2",
     "pluralize": "8.0.0",
     "react": "^18.2.0",
@@ -99,6 +98,7 @@
     "less-loader": "12.2.0",
     "lint-staged": "15.2.7",
     "mini-css-extract-plugin": "2.9.0",
+    "mockdate": "^3.0.5",
     "msw": "2.3.4",
     "postcss": "8.4.40",
     "postcss-loader": "8.1.1",
diff --git a/frontend/src/js/actions/appActions.js b/frontend/src/js/actions/appActions.js
index aa00ad35..56d8f408 100644
--- a/frontend/src/js/actions/appActions.js
+++ b/frontend/src/js/actions/appActions.js
@@ -11,7 +11,8 @@
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
-import moment from 'moment';
+import dayjs from 'dayjs';
+import durationDayJs from 'dayjs/plugin/duration';
 import Cookies from 'universal-cookie';
 
 import GeneralApi from '../api/general-api';
@@ -50,6 +51,7 @@ import { getReleases } from './releaseActions';
 import { getGlobalSettings, getRoles, getUserSettings, saveGlobalSettings, saveUserSettings, setShowStartupNotification } from './userActions';
 
 const cookies = new Cookies();
+dayjs.extend(durationDayJs);
 
 export const commonErrorFallback = 'Please check your connection.';
 export const commonErrorHandler = (err, errorContext, dispatch, fallback, mightBeAuthRelated = false) => {
@@ -174,7 +176,7 @@ const interpretAppData = () => (dispatch, getState) => {
   const { canManageUsers } = getUserCapabilities(getState());
   const { interval, intervalUnit } = getOfflineThresholdSettings(getState());
   if (canManageUsers && intervalUnit && intervalUnit !== timeUnits.days) {
-    const duration = moment.duration(interval, intervalUnit);
+    const duration = dayjs.duration(interval, intervalUnit);
     const days = duration.asDays();
     if (days < 1) {
       tasks.push(Promise.resolve(setTimeout(() => dispatch(setShowStartupNotification(true)), TIMEOUTS.fiveSeconds)));
diff --git a/frontend/src/js/components/app.js b/frontend/src/js/components/app.js
index 1a64de65..52f519c2 100644
--- a/frontend/src/js/components/app.js
+++ b/frontend/src/js/components/app.js
@@ -20,7 +20,7 @@ import createCache from '@emotion/cache';
 import { CacheProvider } from '@emotion/react';
 import { CssBaseline, GlobalStyles, ThemeProvider, createTheme, styled } from '@mui/material';
 import { LocalizationProvider } from '@mui/x-date-pickers';
-import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 import { makeStyles } from 'tss-react/mui';
 
 import Cookies from 'universal-cookie';
@@ -221,7 +221,7 @@ export const AppProviders = ({ basename = 'ui' }) => (
   <React.StrictMode>
     <Provider store={store}>
       <CacheProvider value={cache}>
-        <LocalizationProvider dateAdapter={AdapterMoment}>
+        <LocalizationProvider dateAdapter={AdapterDayjs}>
           <ErrorBoundary>
             <BrowserRouter basename={basename}>
               <AppRoot />
diff --git a/frontend/src/js/components/auditlogs/auditlogs.js b/frontend/src/js/components/auditlogs/auditlogs.js
index e95641ca..16af9e77 100644
--- a/frontend/src/js/components/auditlogs/auditlogs.js
+++ b/frontend/src/js/components/auditlogs/auditlogs.js
@@ -17,7 +17,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Button, TextField } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 import historyImage from '../../../assets/img/history.png';
 import { getAuditLogs, getAuditLogsCsvLink, setAuditlogsState } from '../../actions/organizationActions';
@@ -181,11 +181,7 @@ export const AuditLogs = props => {
   const createCsvDownload = () => {
     setCsvLoading(true);
     dispatch(getAuditLogsCsvLink()).then(address => {
-      createDownload(
-        encodeURI(address),
-        `Mender-AuditLog-${moment(startDate).format(moment.HTML5_FMT.DATE)}-${moment(endDate).format(moment.HTML5_FMT.DATE)}.csv`,
-        token
-      );
+      createDownload(encodeURI(address), `Mender-AuditLog-${dayjs(startDate).format('YYYY-MM-DD')}-${dayjs(endDate).format('YYYY-MM-DD')}.csv`, token);
       setCsvLoading(false);
     });
   };
diff --git a/frontend/src/js/components/auditlogs/auditlogs.test.js b/frontend/src/js/components/auditlogs/auditlogs.test.js
index 43e9b5f7..d6f172e2 100644
--- a/frontend/src/js/components/auditlogs/auditlogs.test.js
+++ b/frontend/src/js/components/auditlogs/auditlogs.test.js
@@ -17,7 +17,7 @@ import { MemoryRouter } from 'react-router-dom';
 
 import { ThemeProvider, createTheme } from '@mui/material/styles';
 import { LocalizationProvider } from '@mui/x-date-pickers';
-import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 
 import { prettyDOM, screen, render as testingLibRender, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
@@ -56,7 +56,7 @@ const preloadedStateNoAuditlogs = {
 describe('Auditlogs Component', () => {
   it('renders correctly', async () => {
     const { baseElement } = render(
-      <LocalizationProvider dateAdapter={AdapterMoment}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
         <AuditLogs />
       </LocalizationProvider>,
       { preloadedState: preloadedStateNoAuditlogs }
@@ -73,7 +73,7 @@ describe('Auditlogs Component', () => {
     let store = getConfiguredStore({ preloadedState });
     const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
     render(
-      <LocalizationProvider dateAdapter={AdapterMoment}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
         <Provider store={store}>
           <AuditLogs />
         </Provider>
@@ -93,7 +93,7 @@ describe('Auditlogs Component', () => {
     const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
     const theme = createTheme(lightTheme);
     const ui = (
-      <LocalizationProvider dateAdapter={AdapterMoment}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
         <ThemeProvider theme={theme}>
           <MemoryRouter initialEntries={['/auditlog?startDate=2018-01-01']}>
             <Provider store={store}>
diff --git a/frontend/src/js/components/auditlogs/eventdetails/portforward.js b/frontend/src/js/components/auditlogs/eventdetails/portforward.js
index 26979357..39134325 100644
--- a/frontend/src/js/components/auditlogs/eventdetails/portforward.js
+++ b/frontend/src/js/components/auditlogs/eventdetails/portforward.js
@@ -16,8 +16,8 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import { useTheme } from '@mui/material/styles';
 
-import moment from 'moment';
-import momentDurationFormatSetup from 'moment-duration-format';
+import dayjs from 'dayjs';
+import duration from 'dayjs/plugin/duration';
 
 import { getDeviceById, getSessionDetails } from '../../../actions/deviceActions';
 import { getAuditlogDevice, getIdAttribute, getUserCapabilities } from '../../../selectors';
@@ -25,7 +25,7 @@ import Loader from '../../common/loader';
 import Time from '../../common/time';
 import DeviceDetails, { DetailInformation } from './devicedetails';
 
-momentDurationFormatSetup(moment);
+dayjs.extend(duration);
 
 export const PortForward = ({ item, onClose }) => {
   const theme = useTheme();
@@ -53,7 +53,7 @@ export const PortForward = ({ item, onClose }) => {
     'Session ID': item.meta.session_id[0],
     'Start time': <Time value={sessionDetails.start} />,
     'End time': <Time value={sessionDetails.end} />,
-    'Duration': moment.duration(moment(sessionDetails.end).diff(sessionDetails.start)).format('*hh:*mm:ss:SSS'),
+    'Duration': dayjs.duration(dayjs(sessionDetails.end).diff(sessionDetails.start)).format('HH:mm:ss:SSS'),
     User: item.actor.email
   };
 
diff --git a/frontend/src/js/components/auditlogs/eventdetails/terminalsession.js b/frontend/src/js/components/auditlogs/eventdetails/terminalsession.js
index cadec15a..d5cbf741 100644
--- a/frontend/src/js/components/auditlogs/eventdetails/terminalsession.js
+++ b/frontend/src/js/components/auditlogs/eventdetails/terminalsession.js
@@ -16,8 +16,8 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import { useTheme } from '@mui/material/styles';
 
-import moment from 'moment';
-import momentDurationFormatSetup from 'moment-duration-format';
+import dayjs from 'dayjs';
+import durationDayJs from 'dayjs/plugin/duration';
 
 import { getDeviceById, getSessionDetails } from '../../../actions/deviceActions';
 import { getAuditlogDevice, getCurrentSession, getIdAttribute, getUserCapabilities } from '../../../selectors';
@@ -26,7 +26,7 @@ import Time from '../../common/time';
 import DeviceDetails, { DetailInformation } from './devicedetails';
 import TerminalPlayer from './terminalplayer';
 
-momentDurationFormatSetup(moment);
+dayjs.extend(durationDayJs);
 
 export const TerminalSession = ({ item, onClose }) => {
   const theme = useTheme();
@@ -55,7 +55,7 @@ export const TerminalSession = ({ item, onClose }) => {
     'Session ID': item.meta.session_id[0],
     'Start time': <Time value={sessionDetails.start} />,
     'End time': <Time value={sessionDetails.end} />,
-    'Duration': moment.duration(moment(sessionDetails.end).diff(sessionDetails.start)).format('*hh:*mm:ss:SSS'),
+    'Duration': dayjs.duration(dayjs(sessionDetails.end).diff(sessionDetails.start)).format('HH:mm:ss:SSS'),
     User: item.actor.email
   };
 
diff --git a/frontend/src/js/components/common/forms/timeframe-picker.js b/frontend/src/js/components/common/forms/timeframe-picker.js
index 3b499ff0..f6fe082e 100644
--- a/frontend/src/js/components/common/forms/timeframe-picker.js
+++ b/frontend/src/js/components/common/forms/timeframe-picker.js
@@ -16,20 +16,20 @@ import { Controller, useFormContext } from 'react-hook-form';
 
 import { DatePicker } from '@mui/x-date-pickers/DatePicker';
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 const ensureStartOfDay = date => {
-  const momentDate = typeof date === 'string' ? moment(date.replace('Z', '')) : moment(date);
+  const momentDate = typeof date === 'string' ? dayjs(date.replace('Z', '')) : dayjs(date);
   return `${momentDate.format().split('T')[0]}T00:00:00.000`;
 };
 
 const ensureEndOfDay = date => {
-  const momentDate = typeof date === 'string' ? moment(date.replace('Z', '')) : moment(date);
+  const momentDate = typeof date === 'string' ? dayjs(date.replace('Z', '')) : dayjs(date);
   return `${momentDate.format().split('T')[0]}T23:59:59.999`;
 };
 
 export const TimeframePicker = ({ tonight: propsTonight }) => {
-  const [tonight] = useState(moment(propsTonight));
+  const [tonight] = useState(dayjs(propsTonight));
   const [maxStartDate, setMaxStartDate] = useState(tonight);
   const [minEndDate, setMinEndDate] = useState(tonight);
 
@@ -46,7 +46,7 @@ export const TimeframePicker = ({ tonight: propsTonight }) => {
     } else if (currentEndDate > now) {
       setValue('endDate', now);
     }
-    setMinEndDate(moment(startDate));
+    setMinEndDate(dayjs(startDate));
   }, [startDate, getValues, setValue]);
 
   useEffect(() => {
@@ -54,7 +54,7 @@ export const TimeframePicker = ({ tonight: propsTonight }) => {
     if (endDate < currentStartDate) {
       setValue('startDate', ensureStartOfDay(endDate));
     }
-    setMaxStartDate(moment(endDate));
+    setMaxStartDate(dayjs(endDate));
   }, [endDate, getValues, setValue]);
 
   const handleChangeStartDate = date => ensureStartOfDay(date);
@@ -74,7 +74,7 @@ export const TimeframePicker = ({ tonight: propsTonight }) => {
             label="From"
             maxDate={maxStartDate}
             onChange={e => onChange(handleChangeStartDate(e))}
-            value={value ? moment(value) : moment()}
+            value={value ? dayjs(value) : dayjs()}
           />
         )}
       />
@@ -88,7 +88,7 @@ export const TimeframePicker = ({ tonight: propsTonight }) => {
             label="To"
             minDate={minEndDate}
             onChange={e => onChange(handleChangeEndDate(e))}
-            value={value ? moment(value) : moment()}
+            value={value ? dayjs(value) : dayjs()}
           />
         )}
       />
diff --git a/frontend/src/js/components/common/forms/timeframe-picker.test.js b/frontend/src/js/components/common/forms/timeframe-picker.test.js
index 3d852cc5..7a3eb90d 100644
--- a/frontend/src/js/components/common/forms/timeframe-picker.test.js
+++ b/frontend/src/js/components/common/forms/timeframe-picker.test.js
@@ -15,7 +15,7 @@ import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
 import { LocalizationProvider } from '@mui/x-date-pickers';
-import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 
 import { screen } from '@testing-library/react';
 
@@ -35,7 +35,7 @@ const testRender = ui => {
 describe('TimeframePicker Component', () => {
   it('renders correctly', async () => {
     const { baseElement } = formRenderWrapper(
-      <LocalizationProvider dateAdapter={AdapterMoment}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
         <TimeframePicker tonight={new Date().toISOString()} />
       </LocalizationProvider>
     );
@@ -45,7 +45,7 @@ describe('TimeframePicker Component', () => {
   });
   it('works in different timezones correctly', async () => {
     testRender(
-      <LocalizationProvider dateAdapter={AdapterMoment}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
         <TimeframePicker tonight={new Date().toISOString()} />
       </LocalizationProvider>
     );
diff --git a/frontend/src/js/components/common/time.js b/frontend/src/js/components/common/time.js
index 81aceaab..543719f7 100644
--- a/frontend/src/js/components/common/time.js
+++ b/frontend/src/js/components/common/time.js
@@ -15,19 +15,21 @@ import React, { useEffect, useState } from 'react';
 
 import { Tooltip } from '@mui/material';
 
-import moment from 'moment';
+import dayjs from 'dayjs';
+import relativeTime from 'dayjs/plugin/relativeTime';
 import pluralize from 'pluralize';
 
 const defaultDateFormat = 'YYYY-MM-DD';
 const defaultTimeFormat = `${defaultDateFormat} HH:mm`;
 
 // based on react-time - https://github.com/andreypopp/react-time - which unfortunately is no longer maintained
+dayjs.extend(relativeTime);
 
 export const Time = ({ value, relative, format = defaultTimeFormat, valueFormat, titleFormat = defaultTimeFormat, Component = 'time', ...remainingProps }) => {
   if (!value) {
-    value = moment();
+    value = dayjs();
   }
-  value = moment(value, valueFormat, true);
+  value = dayjs(value, valueFormat, true);
 
   const machineReadable = value.format('YYYY-MM-DDTHH:mm:ssZ');
   const humanReadable = relative ? value.fromNow() : value.format(format);
@@ -46,11 +48,11 @@ export const RelativeTime = ({ className, shouldCount = 'both', updateTime }) =>
   const [updatedTime, setUpdatedTime] = useState();
 
   useEffect(() => {
-    setUpdatedTime(updatedTime => (updateTime !== updatedTime ? moment(updateTime) : updatedTime));
+    setUpdatedTime(updatedTime => (updateTime !== updatedTime ? dayjs(updateTime) : updatedTime));
   }, [updateTime]);
 
   let timeDisplay = <MaybeTime className={className} value={updatedTime} />;
-  const diffSeconds = updatedTime ? updatedTime.diff(moment(), 'seconds') : 0;
+  const diffSeconds = updatedTime ? updatedTime.diff(dayjs(), 'seconds') : 0;
   if (
     updatedTime &&
     diffSeconds > cutoff &&
@@ -63,7 +65,7 @@ export const RelativeTime = ({ className, shouldCount = 'both', updateTime }) =>
     );
   }
   return (
-    <Tooltip title={updatedTime ? updatedTime.toLocaleString() : ''} arrow enterDelay={500}>
+    <Tooltip title={updatedTime ? updatedTime.toDate().toString().slice(0, 33) : ''} arrow enterDelay={500}>
       <span>{timeDisplay}</span>
     </Tooltip>
   );
@@ -74,10 +76,10 @@ export const ApproximateRelativeDate = ({ className, updateTime }) => {
   const [updatedTime, setUpdatedTime] = useState();
 
   useEffect(() => {
-    setUpdatedTime(updatedTime => (updateTime !== updatedTime ? moment(updateTime, defaultDateFormat) : updatedTime));
+    setUpdatedTime(updatedTime => (updateTime !== updatedTime ? dayjs(updateTime, defaultDateFormat) : updatedTime));
   }, [updateTime]);
 
-  const diff = updatedTime ? Math.abs(updatedTime.diff(moment(), 'days')) : 0;
+  const diff = updatedTime ? Math.abs(updatedTime.diff(dayjs(), 'days')) : 0;
   if (updatedTime && diff <= cutoffDays) {
     return (
       <time className={className} dateTime={updatedTime.format(defaultDateFormat)}>
diff --git a/frontend/src/js/components/deployments/createdeployment.js b/frontend/src/js/components/deployments/createdeployment.js
index e2c457da..c00e7c08 100644
--- a/frontend/src/js/components/deployments/createdeployment.js
+++ b/frontend/src/js/components/deployments/createdeployment.js
@@ -32,7 +32,7 @@ import {
 } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 import pluralize from 'pluralize';
 
 import DeltaIcon from '../../../assets/img/deltaicon.svg';
@@ -100,7 +100,7 @@ export const getPhaseStartTime = (phases, index, startDate) => {
   // since we don't want to get stale phase start times when the creation dialog is open for a long time
   // we have to ensure start times are based on delay from previous phases
   // since there likely won't be 1000s of phases this should still be fine to recalculate
-  const newStartTime = phases.slice(0, index).reduce((accu, phase) => moment(accu).add(phase.delay, phase.delayUnit), startDate);
+  const newStartTime = phases.slice(0, index).reduce((accu, phase) => dayjs(accu).add(phase.delay, phase.delayUnit), startDate);
   return newStartTime.toISOString();
 };
 
diff --git a/frontend/src/js/components/deployments/createdeployment.test.js b/frontend/src/js/components/deployments/createdeployment.test.js
index 94f3b062..2ee27c37 100644
--- a/frontend/src/js/components/deployments/createdeployment.test.js
+++ b/frontend/src/js/components/deployments/createdeployment.test.js
@@ -14,7 +14,7 @@
 import React from 'react';
 
 import { LocalizationProvider } from '@mui/x-date-pickers';
-import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 
 import { defaultState, undefineds } from '../../../../tests/mockData';
 import { render } from '../../../../tests/setupTests';
@@ -63,7 +63,7 @@ describe('CreateDeployment Component', () => {
       };
       it(`renders ${Component.displayName || Component.name} correctly`, () => {
         const { baseElement } = render(
-          <LocalizationProvider dateAdapter={AdapterMoment}>
+          <LocalizationProvider dateAdapter={AdapterDayjs}>
             <Component {...props} />
           </LocalizationProvider>,
           { preloadedState }
@@ -75,7 +75,7 @@ describe('CreateDeployment Component', () => {
       });
       it(`renders ${Component.displayName || Component.name} correctly as enterprise`, () => {
         const { baseElement } = render(
-          <LocalizationProvider dateAdapter={AdapterMoment}>
+          <LocalizationProvider dateAdapter={AdapterDayjs}>
             <Component {...props} isEnterprise />
           </LocalizationProvider>,
           { preloadedState }
diff --git a/frontend/src/js/components/deployments/deployment-report/phaseprogress.js b/frontend/src/js/components/deployments/deployment-report/phaseprogress.js
index 0bbc10b2..13ac3e35 100644
--- a/frontend/src/js/components/deployments/deployment-report/phaseprogress.js
+++ b/frontend/src/js/components/deployments/deployment-report/phaseprogress.js
@@ -17,8 +17,6 @@ import { CheckCircle, ErrorRounded, Pause, PlayArrow, Warning as WarningIcon } f
 import { Button } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
-import moment from 'moment';
-import momentDurationFormatSetup from 'moment-duration-format';
 import pluralize from 'pluralize';
 
 import inprogressImage from '../../../../assets/img/pending_status.png';
@@ -37,8 +35,6 @@ const useStyles = makeStyles()(theme => ({
   phaseIndex: { margin: theme.spacing(0.5) }
 }));
 
-momentDurationFormatSetup(moment);
-
 const shortCircuitIndicators = [deploymentSubstates.alreadyInstalled, deploymentSubstates.noartifact];
 
 const substateIconMap = {
diff --git a/frontend/src/js/components/deployments/deployment-report/rolloutschedule.js b/frontend/src/js/components/deployments/deployment-report/rolloutschedule.js
index 50ff320b..f154db47 100644
--- a/frontend/src/js/components/deployments/deployment-report/rolloutschedule.js
+++ b/frontend/src/js/components/deployments/deployment-report/rolloutschedule.js
@@ -17,8 +17,9 @@ import { ArrowForward } from '@mui/icons-material';
 import { Chip } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
-import moment from 'moment';
-import momentDurationFormatSetup from 'moment-duration-format';
+import dayjs from 'dayjs';
+import durationDayJs from 'dayjs/plugin/duration';
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
 import pluralize from 'pluralize';
 
 import { DEPLOYMENT_STATES } from '../../../constants/deploymentConstants';
@@ -38,7 +39,8 @@ const useStyles = makeStyles()(theme => ({
   phasesOverviewArrow: { marginLeft: theme.spacing(4), marginRight: theme.spacing(4) }
 }));
 
-momentDurationFormatSetup(moment);
+dayjs.extend(durationDayJs);
+dayjs.extend(isSameOrAfter);
 
 const maxPhaseWidth = 270;
 
@@ -46,7 +48,7 @@ const PhaseLabel = ({ index }) => <div className="capitalized progress-step-numb
 
 export const RolloutSchedule = ({ deployment, headerClass, innerRef, onAbort, onUpdateControlChange }) => {
   const { classes } = useStyles();
-  const now = moment();
+  const now = dayjs();
   const { created: creationTime = now.toISOString(), filter, finished, status, update_control_map } = deployment;
 
   const { phases, reversedPhases, totalDeviceCount, ...remainder } = getDeploymentPhasesInfo(deployment);
@@ -96,7 +98,7 @@ export const RolloutSchedule = ({ deployment, headerClass, innerRef, onAbort, on
           let phaseTitle = status !== DEPLOYMENT_STATES.scheduled ? <div className="muted">Complete</div> : null;
           let isCurrentPhase = false;
           if (now.isBefore(startTime)) {
-            const duration = moment.duration(moment(startTime).diff(now));
+            const duration = dayjs.duration(dayjs(startTime).diff(now));
             phaseTitle = <div>{`Begins in ${duration.format('d [days] hh [h] mm [m]')}`}</div>;
           } else if (status === DEPLOYMENT_STATES.inprogress && phase.id === currentPhase.id) {
             phaseTitle = <div className="muted">Current phase</div>;
diff --git a/frontend/src/js/components/deployments/deployment-wizard/schedulerollout.js b/frontend/src/js/components/deployments/deployment-wizard/schedulerollout.js
index 09786528..6272001e 100644
--- a/frontend/src/js/components/deployments/deployment-wizard/schedulerollout.js
+++ b/frontend/src/js/components/deployments/deployment-wizard/schedulerollout.js
@@ -17,7 +17,7 @@ import { FormControl, MenuItem, Select } from '@mui/material';
 import { DateTimePicker } from '@mui/x-date-pickers';
 import { makeStyles } from 'tss-react/mui';
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 import { BENEFITS } from '../../../constants/appConstants';
 import EnterpriseNotification from '../../common/enterpriseNotification';
@@ -59,7 +59,7 @@ export const ScheduleRollout = ({ canSchedule, commonClasses, setDeploymentSetti
 
   const start_time = phases.length ? phases[0].start_ts : undefined;
 
-  const startTime = moment(start_time);
+  const startTime = dayjs(start_time);
   return (
     <>
       <h4 className={`margin-bottom-none margin-top-none ${canSchedule ? '' : commonClasses.disabled}`}>Select a start time</h4>
@@ -83,7 +83,7 @@ export const ScheduleRollout = ({ canSchedule, commonClasses, setDeploymentSetti
             onOpen={() => setIsPickerOpen(true)}
             onClose={() => setIsPickerOpen(false)}
             label="Starting at"
-            minDateTime={moment()}
+            minDateTime={dayjs()}
             disabled={!canSchedule}
             onChange={date => handleStartTimeChange(date.toISOString())}
             slotProps={{ textField: { style: { minWidth: 400 } } }}
diff --git a/frontend/src/js/components/deployments/deployments.test.js b/frontend/src/js/components/deployments/deployments.test.js
index 8621becd..42bb6a1e 100644
--- a/frontend/src/js/components/deployments/deployments.test.js
+++ b/frontend/src/js/components/deployments/deployments.test.js
@@ -14,7 +14,7 @@
 import React from 'react';
 
 import { LocalizationProvider } from '@mui/x-date-pickers';
-import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 
 import { act, fireEvent, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
@@ -121,7 +121,7 @@ describe('Deployments Component', () => {
       }
     };
     const ui = (
-      <LocalizationProvider dateAdapter={AdapterMoment}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
         <Deployments {...defaultLocationProps} />
       </LocalizationProvider>
     );
@@ -164,7 +164,7 @@ describe('Deployments Component', () => {
       }
     };
     const ui = (
-      <LocalizationProvider dateAdapter={AdapterMoment}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
         <Deployments {...defaultLocationProps} />
       </LocalizationProvider>
     );
@@ -245,7 +245,7 @@ describe('Deployments Component', () => {
       }
     };
     const ui = (
-      <LocalizationProvider dateAdapter={AdapterMoment}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
         <Deployments {...defaultLocationProps} />
       </LocalizationProvider>
     );
diff --git a/frontend/src/js/components/deployments/pastdeployments.test.js b/frontend/src/js/components/deployments/pastdeployments.test.js
index b1781796..594cea0e 100644
--- a/frontend/src/js/components/deployments/pastdeployments.test.js
+++ b/frontend/src/js/components/deployments/pastdeployments.test.js
@@ -14,7 +14,7 @@
 import React from 'react';
 
 import { LocalizationProvider } from '@mui/x-date-pickers';
-import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
+import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 
 import { act } from '@testing-library/react';
 
@@ -39,7 +39,7 @@ const state = {
 describe('PastDeployments Component', () => {
   it('renders correctly', async () => {
     const { baseElement } = render(
-      <LocalizationProvider dateAdapter={AdapterMoment}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
         <Past past={[]} groups={[]} refreshPast={() => {}} refreshDeployments={jest.fn} />
       </LocalizationProvider>,
       { state }
diff --git a/frontend/src/js/components/deployments/progressChart.js b/frontend/src/js/components/deployments/progressChart.js
index 1c217ab4..57e01264 100644
--- a/frontend/src/js/components/deployments/progressChart.js
+++ b/frontend/src/js/components/deployments/progressChart.js
@@ -18,8 +18,8 @@ import { Tooltip } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
 import { mdiDotsHorizontalCircleOutline as QueuedIcon, mdiSleep as SleepIcon } from '@mdi/js';
-import moment from 'moment';
-import momentDurationFormatSetup from 'moment-duration-format';
+import dayjs from 'dayjs';
+import durationDayJs from 'dayjs/plugin/duration';
 import pluralize from 'pluralize';
 
 import { TIMEOUTS } from '../../constants/appConstants';
@@ -27,7 +27,7 @@ import { groupDeploymentStats } from '../../helpers';
 import MaterialDesignIcon from '../common/materialdesignicon';
 import Time from '../common/time';
 
-momentDurationFormatSetup(moment);
+dayjs.extend(durationDayJs);
 
 const statusMap = {
   complete: {
@@ -264,7 +264,7 @@ export const ProgressDisplay = ({ className = '', deployment, minimal = false, s
 
   const currentPhase = reversedPhases.find(phase => new Date(phase.start_ts) < time) || phases[0];
   const currentPhaseIndex = phases.findIndex(phase => phase.id === currentPhase.id);
-  const nextPhaseStart = phases.length > currentPhaseIndex + 1 ? moment(phases[currentPhaseIndex + 1].start_ts) : moment(time);
+  const nextPhaseStart = phases.length > currentPhaseIndex + 1 ? dayjs(phases[currentPhaseIndex + 1].start_ts) : dayjs(time);
 
   const displayablePhases = getDisplayablePhases({
     currentPhase,
@@ -273,8 +273,8 @@ export const ProgressDisplay = ({ className = '', deployment, minimal = false, s
     ...remainder
   });
 
-  const momentaryTime = moment(time);
-  const duration = moment.duration(nextPhaseStart.diff(momentaryTime)).format('d [days] hh [h] mm [m] ss [s]');
+  const momentaryTime = dayjs(time);
+  const duration = dayjs.duration(nextPhaseStart.diff(momentaryTime)).format('d [days] hh [h] mm [m] ss [s]');
 
   return (
     <ProgressChartComponent
diff --git a/frontend/src/js/components/deployments/report.js b/frontend/src/js/components/deployments/report.js
index 3e04b38c..0efedee4 100644
--- a/frontend/src/js/components/deployments/report.js
+++ b/frontend/src/js/components/deployments/report.js
@@ -26,8 +26,6 @@ import { Button, Divider, Drawer, IconButton, Tooltip } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
 import copy from 'copy-to-clipboard';
-import moment from 'moment';
-import momentDurationFormatSetup from 'moment-duration-format';
 
 import { setSnackbar } from '../../actions/appActions';
 import { getDeploymentDevices, getDeviceLog, getSingleDeployment, updateDeploymentControlMap } from '../../actions/deploymentActions';
@@ -57,8 +55,6 @@ import DeviceList from './deployment-report/devicelist';
 import DeploymentOverview from './deployment-report/overview';
 import RolloutSchedule from './deployment-report/rolloutschedule';
 
-momentDurationFormatSetup(moment);
-
 const useStyles = makeStyles()(theme => ({
   divider: { marginTop: theme.spacing(2) },
   header: {
diff --git a/frontend/src/js/components/deployments/scheduleddeployments.js b/frontend/src/js/components/deployments/scheduleddeployments.js
index 6a57079a..61e07fea 100644
--- a/frontend/src/js/components/deployments/scheduleddeployments.js
+++ b/frontend/src/js/components/deployments/scheduleddeployments.js
@@ -12,7 +12,7 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { Calendar, momentLocalizer } from 'react-big-calendar';
+import { Calendar, dayjsLocalizer } from 'react-big-calendar';
 import 'react-big-calendar/lib/css/react-big-calendar.css';
 import { useDispatch, useSelector } from 'react-redux';
 
@@ -20,7 +20,7 @@ import { CalendarToday as CalendarTodayIcon, List as ListIcon, Refresh as Refres
 import { Button } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 import { setSnackbar } from '../../actions/appActions';
 import { getDeploymentsByStatus, setDeploymentsState } from '../../actions/deploymentActions';
@@ -46,7 +46,7 @@ const useStyles = makeStyles()(theme => ({
   tabSelect: { textTransform: 'none' }
 }));
 
-const localizer = momentLocalizer(moment);
+const localizer = dayjsLocalizer(dayjs);
 
 const headers = [
   ...defaultHeaders.slice(0, 2),
@@ -135,7 +135,7 @@ export const Scheduled = ({ abort, createClick, openReport, ...remainder }) => {
         endDate = new Date(deployment.phases[deployment.phases.length - 1].end_ts);
       } else if (deployment.filter_id || deployment.filter) {
         // calendar doesn't support never ending events so we arbitrarly set one year
-        endDate = moment(start).add(1, 'year');
+        endDate = dayjs(start).add(1, 'year');
       }
       return {
         allDay: !(deployment.filter_id || deployment.filter),
diff --git a/frontend/src/js/components/devices/device-details/__snapshots__/configuration.test.js.snap b/frontend/src/js/components/devices/device-details/__snapshots__/configuration.test.js.snap
index aca0b939..6ce12911 100644
--- a/frontend/src/js/components/devices/device-details/__snapshots__/configuration.test.js.snap
+++ b/frontend/src/js/components/devices/device-details/__snapshots__/configuration.test.js.snap
@@ -1152,9 +1152,9 @@ exports[`tiny components renders ConfigEmptyNote correctly 1`] = `
     >
       Updated: 
       <time
-        datetime="Invalid date"
+        datetime="Invalid Date"
       >
-        Invalid date
+        Invalid Date
       </time>
     </span>
   </div>
@@ -1228,9 +1228,9 @@ exports[`tiny components renders ConfigUpToDateNote correctly 1`] = `
       >
         Updated: 
         <time
-          datetime="Invalid date"
+          datetime="Invalid Date"
         >
-          Invalid date
+          Invalid Date
         </time>
       </span>
     </div>
diff --git a/frontend/src/js/components/devices/troubleshoot/terminal-wrapper.js b/frontend/src/js/components/devices/troubleshoot/terminal-wrapper.js
index 73a4027d..6b849fd7 100644
--- a/frontend/src/js/components/devices/troubleshoot/terminal-wrapper.js
+++ b/frontend/src/js/components/devices/troubleshoot/terminal-wrapper.js
@@ -19,8 +19,8 @@ import { Link } from 'react-router-dom';
 import { Button } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
-import moment from 'moment';
-import momentDurationFormatSetup from 'moment-duration-format';
+import dayjs from 'dayjs';
+import durationDayJs from 'dayjs/plugin/duration';
 
 import { BEGINNING_OF_TIME, TIMEOUTS } from '../../../constants/appConstants';
 import { getCurrentSession, getFeatures, getIsPreview, getTenantCapabilities, getUserCapabilities } from '../../../selectors';
@@ -31,7 +31,7 @@ import { getCode } from '../dialogs/make-gateway-dialog';
 import Terminal from '../troubleshoot/terminal';
 import ListOptions from '../widgets/listoptions';
 
-momentDurationFormatSetup(moment);
+dayjs.extend(durationDayJs);
 
 const useStyles = makeStyles()(theme => ({
   connectionActions: { marginTop: theme.spacing() },
@@ -49,7 +49,7 @@ const useStyles = makeStyles()(theme => ({
 }));
 
 const SessionInfo = ({ socketInitialized, startTime }) => {
-  const [elapsed, setElapsed] = useState(moment());
+  const [elapsed, setElapsed] = useState(dayjs());
   const timer = useRef();
   const { classes } = useStyles();
 
@@ -58,7 +58,7 @@ const SessionInfo = ({ socketInitialized, startTime }) => {
     if (!socketInitialized) {
       return;
     }
-    timer.current = setInterval(() => setElapsed(moment()), TIMEOUTS.halfASecond);
+    timer.current = setInterval(() => setElapsed(dayjs()), TIMEOUTS.halfASecond);
     return () => {
       clearInterval(timer.current);
     };
@@ -72,7 +72,7 @@ const SessionInfo = ({ socketInitialized, startTime }) => {
         {
           key: 'duration',
           title: 'Duration',
-          content: startTime ? `${moment.duration(elapsed.diff(moment(startTime))).format('hh:mm:ss', { trim: false })}` : '-'
+          content: startTime ? `${dayjs.duration(elapsed.diff(dayjs(startTime))).format('hh:mm:ss', { trim: false })}` : '-'
         }
       ].map(({ key, title, content }) => (
         <div key={key} className="flexbox">
diff --git a/frontend/src/js/components/header/header.js b/frontend/src/js/components/header/header.js
index ef0e277f..e5c74062 100644
--- a/frontend/src/js/components/header/header.js
+++ b/frontend/src/js/components/header/header.js
@@ -36,7 +36,7 @@ import {
 } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 import Cookies from 'universal-cookie';
 
 import enterpriseLogo from '../../../assets/img/headerlogo-enterprise.png';
@@ -281,7 +281,7 @@ export const Header = ({ mode }) => {
   };
 
   const showOffer =
-    isHosted && moment().isBefore(currentOffer.expires) && (organization.trial ? currentOffer.trial : currentOffer[organization.plan]) && !hasOfferCookie;
+    isHosted && dayjs().isBefore(currentOffer.expires) && (organization.trial ? currentOffer.trial : currentOffer[organization.plan]) && !hasOfferCookie;
 
   const headerLogo = isDarkMode(mode) ? (isEnterprise ? whiteEnterpriseLogo : whiteLogo) : isEnterprise ? enterpriseLogo : logo;
 
diff --git a/frontend/src/js/components/header/trialnotification.js b/frontend/src/js/components/header/trialnotification.js
index a9c57077..f63e711b 100644
--- a/frontend/src/js/components/header/trialnotification.js
+++ b/frontend/src/js/components/header/trialnotification.js
@@ -17,15 +17,13 @@ import { Link } from 'react-router-dom';
 import { InfoOutlined as InfoIcon, Payment } from '@mui/icons-material';
 import { Button } from '@mui/material';
 
-import moment from 'moment';
-import momentDurationFormatSetup from 'moment-duration-format';
+import dayjs from 'dayjs';
+import durationDayJs from 'dayjs/plugin/duration';
 import pluralize from 'pluralize';
 
 import { MenderTooltipClickable } from '../common/mendertooltip';
 
-momentDurationFormatSetup(moment);
-
-const today = new Date();
+dayjs.extend(durationDayJs);
 
 const TrialInformation = () => (
   <>
@@ -45,8 +43,8 @@ const TrialInformation = () => (
 );
 
 const TrialNotification = ({ iconClassName, sectionClassName, expiration }) => {
-  const expirationDate = moment(expiration);
-  const duration = moment.duration(expirationDate.diff(moment(today)));
+  const expirationDate = dayjs(expiration);
+  const duration = dayjs.duration(expirationDate.diff(dayjs()));
   const daysLeft = Math.floor(duration.asDays());
   return (
     <div className={`flexbox centered ${sectionClassName}`}>
diff --git a/frontend/src/js/components/settings/organization/__snapshots__/organization.test.js.snap b/frontend/src/js/components/settings/organization/__snapshots__/organization.test.js.snap
index 0c00c854..a7edcc42 100644
--- a/frontend/src/js/components/settings/organization/__snapshots__/organization.test.js.snap
+++ b/frontend/src/js/components/settings/organization/__snapshots__/organization.test.js.snap
@@ -514,373 +514,377 @@ exports[`MyOrganization Component renders correctly 1`] = `
   margin-right: 8px;
 }
 
-<div
-  class="margin-top-small"
->
-  <h2
-    class="margin-top-small"
-  >
-    Organization and billing
-  </h2>
-  <ul
-    class="MuiList-root MuiList-padding emotion-0"
-  >
-    <li
-      class="margin-top-small org-settings-item"
+<body>
+  <div>
+    <div
+      class="margin-top-small"
     >
-      <div
-        class="MuiListItem-root flexbox column MuiListItem-gutters MuiListItem-padding MuiListItem-alignItemsFlexStart emotion-1"
+      <h2
+        class="margin-top-small"
+      >
+        Organization and billing
+      </h2>
+      <ul
+        class="MuiList-root MuiList-padding emotion-0"
       >
-        <div
-          class="MuiListItemText-root MuiListItemText-multiline emotion-2"
+        <li
+          class="margin-top-small org-settings-item"
         >
-          <span
-            class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary emotion-3"
-          >
-            Organization name
-          </span>
           <div
-            class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary two-columns emotion-4"
+            class="MuiListItem-root flexbox column MuiListItem-gutters MuiListItem-padding MuiListItem-alignItemsFlexStart emotion-1"
           >
-            <div>
+            <div
+              class="MuiListItemText-root MuiListItemText-multiline emotion-2"
+            >
+              <span
+                class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary emotion-3"
+              >
+                Organization name
+              </span>
               <div
-                class="clickable emotion-5"
+                class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary two-columns emotion-4"
               >
-                test
-                <span>
-                  (
-                  1
-                  )
-                </span>
+                <div>
+                  <div
+                    class="clickable emotion-5"
+                  >
+                    test
+                    <span>
+                      (
+                      1
+                      )
+                    </span>
+                  </div>
+                </div>
+                <a
+                  class="align-right"
+                />
               </div>
             </div>
-            <a
-              class="align-right"
+            <hr
+              class="MuiDivider-root MuiDivider-fullWidth emotion-6"
             />
           </div>
-        </div>
-        <hr
-          class="MuiDivider-root MuiDivider-fullWidth emotion-6"
-        />
-      </div>
-    </li>
-    <li
-      class="margin-top-small org-settings-item"
-    >
-      <div
-        class="MuiListItem-root flexbox column MuiListItem-gutters MuiListItem-padding MuiListItem-alignItemsFlexStart emotion-1"
-      >
-        <div
-          class="MuiListItemText-root MuiListItemText-multiline emotion-8"
+        </li>
+        <li
+          class="margin-top-small org-settings-item"
         >
-          <span
-            class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary emotion-3"
+          <div
+            class="MuiListItem-root flexbox column MuiListItem-gutters MuiListItem-padding MuiListItem-alignItemsFlexStart emotion-1"
           >
             <div
-              class="flexbox center-aligned"
+              class="MuiListItemText-root MuiListItemText-multiline emotion-8"
             >
-              <div
-                class="emotion-10"
-              >
-                Organization token
-              </div>
-              <div
-                class=""
-                data-mui-internal-clone-element="true"
+              <span
+                class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary emotion-3"
               >
                 <div
-                  class="relative"
+                  class="flexbox center-aligned"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root MuiSvgIcon-colorPrimary MuiSvgIcon-fontSizeMedium  emotion-11"
-                    data-testid="HelpIcon"
-                    focusable="false"
-                    viewBox="0 0 24 24"
+                  <div
+                    class="emotion-10"
                   >
-                    <path
-                      d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 17h-2v-2h2zm2.07-7.75-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25"
-                    />
-                  </svg>
+                    Organization token
+                  </div>
                   <div
-                    class="emotion-12 "
-                  />
+                    class=""
+                    data-mui-internal-clone-element="true"
+                  >
+                    <div
+                      class="relative"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root MuiSvgIcon-colorPrimary MuiSvgIcon-fontSizeMedium  emotion-11"
+                        data-testid="HelpIcon"
+                        focusable="false"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 17h-2v-2h2zm2.07-7.75-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25"
+                        />
+                      </svg>
+                      <div
+                        class="emotion-12 "
+                      />
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </span>
-          <div
-            class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary emotion-4"
-          >
-            <div
-              class="emotion-14"
-            >
+              </span>
               <div
-                class="MuiListItem-root attributes MuiListItem-padding emotion-15"
+                class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary emotion-4"
               >
                 <div
-                  class="MuiListItemText-root emotion-16"
+                  class="emotion-14"
                 >
                   <div
-                    class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary emotion-4"
-                    title="test"
+                    class="MuiListItem-root attributes MuiListItem-padding emotion-15"
                   >
-                    <span
-                      class="inventory-text tenant-token-text"
+                    <div
+                      class="MuiListItemText-root emotion-16"
                     >
-                      test
-                    </span>
-                     
+                      <div
+                        class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary emotion-4"
+                        title="test"
+                      >
+                        <span
+                          class="inventory-text tenant-token-text"
+                        >
+                          test
+                        </span>
+                         
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
+            <hr
+              class="MuiDivider-root MuiDivider-fullWidth emotion-6"
+            />
           </div>
-        </div>
-        <hr
-          class="MuiDivider-root MuiDivider-fullWidth emotion-6"
-        />
-      </div>
+          <div>
+            <button
+              class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary emotion-19"
+              tabindex="0"
+              type="button"
+            >
+              <span
+                class="MuiButton-icon MuiButton-startIcon MuiButton-iconSizeMedium emotion-20"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium emotion-21"
+                  data-testid="FileCopyIcon"
+                  focusable="false"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12zm-1 4 6 6v10c0 1.1-.9 2-2 2H7.99C6.89 23 6 22.1 6 21l.01-14c0-1.1.89-2 1.99-2zm-1 7h5.5L14 6.5z"
+                  />
+                </svg>
+              </span>
+              Copy to clipboard
+              <span
+                class="MuiTouchRipple-root emotion-22"
+              />
+            </button>
+            <p
+              class="emotion-23"
+            />
+          </div>
+        </li>
+      </ul>
       <div>
-        <button
-          class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary emotion-19"
-          tabindex="0"
-          type="button"
+        <label
+          class="MuiFormControlLabel-root MuiFormControlLabel-labelPlacementEnd margin-bottom-small emotion-24"
         >
           <span
-            class="MuiButton-icon MuiButton-startIcon MuiButton-iconSizeMedium emotion-20"
+            class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeMedium PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeMedium MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeMedium emotion-25"
           >
+            <input
+              class="PrivateSwitchBase-input emotion-26"
+              data-indeterminate="false"
+              type="checkbox"
+            />
             <svg
               aria-hidden="true"
               class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium emotion-21"
-              data-testid="FileCopyIcon"
+              data-testid="CheckBoxOutlineBlankIcon"
               focusable="false"
               viewBox="0 0 24 24"
             >
               <path
-                d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12zm-1 4 6 6v10c0 1.1-.9 2-2 2H7.99C6.89 23 6 22.1 6 21l.01-14c0-1.1.89-2 1.99-2zm-1 7h5.5L14 6.5z"
+                d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
               />
             </svg>
+            <span
+              class="MuiTouchRipple-root emotion-22"
+            />
           </span>
-          Copy to clipboard
           <span
-            class="MuiTouchRipple-root emotion-22"
-          />
-        </button>
-        <p
-          class="emotion-23"
-        />
+            class="MuiTypography-root MuiTypography-body1 MuiFormControlLabel-label emotion-29"
+          >
+            Enable Single Sign-On
+          </span>
+        </label>
       </div>
-    </li>
-  </ul>
-  <div>
-    <label
-      class="MuiFormControlLabel-root MuiFormControlLabel-labelPlacementEnd margin-bottom-small emotion-24"
-    >
-      <span
-        class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeMedium PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeMedium MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeMedium emotion-25"
-      >
-        <input
-          class="PrivateSwitchBase-input emotion-26"
-          data-indeterminate="false"
-          type="checkbox"
-        />
-        <svg
-          aria-hidden="true"
-          class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium emotion-21"
-          data-testid="CheckBoxOutlineBlankIcon"
-          focusable="false"
-          viewBox="0 0 24 24"
-        >
-          <path
-            d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
-          />
-        </svg>
-        <span
-          class="MuiTouchRipple-root emotion-22"
-        />
-      </span>
-      <span
-        class="MuiTypography-root MuiTypography-body1 MuiFormControlLabel-label emotion-29"
-      >
-        Enable Single Sign-On
-      </span>
-    </label>
-  </div>
-  <div
-    class="flexbox center-aligned"
-  />
-  <div
-    class="emotion-30"
-  >
-    <h5>
-      Billing
-    </h5>
-    <ul
-      class="MuiList-root MuiList-padding emotion-0"
-    >
-      <li
-        class="margin-top-small org-settings-item"
+      <div
+        class="flexbox center-aligned"
+      />
+      <div
+        class="emotion-30"
       >
-        <div
-          class="MuiListItem-root flexbox column MuiListItem-gutters MuiListItem-padding MuiListItem-alignItemsFlexStart emotion-1"
+        <h5>
+          Billing
+        </h5>
+        <ul
+          class="MuiList-root MuiList-padding emotion-0"
         >
-          <div
-            class="MuiListItemText-root MuiListItemText-multiline emotion-2"
+          <li
+            class="margin-top-small org-settings-item"
           >
-            <span
-              class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary emotion-3"
-            >
-              Current plan
-            </span>
             <div
-              class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary two-columns emotion-4"
+              class="MuiListItem-root flexbox column MuiListItem-gutters MuiListItem-padding MuiListItem-alignItemsFlexStart emotion-1"
             >
-              <div>
-                Trial
-              </div>
-              <a
-                class="align-right"
-                href="https://mender.io/plans/pricing"
-                rel="noopener noreferrer"
-                target="_blank"
+              <div
+                class="MuiListItemText-root MuiListItemText-multiline emotion-2"
               >
-                Compare product plans
-              </a>
-            </div>
-          </div>
-          <hr
-            class="MuiDivider-root MuiDivider-fullWidth emotion-6"
-          />
-          <div
-            class="flexbox centered muted"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall emotion-37"
-              data-testid="ErrorIcon"
-              focusable="false"
-              viewBox="0 0 24 24"
-            >
-              <path
-                d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-2h2zm0-4h-2V7h2z"
+                <span
+                  class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary emotion-3"
+                >
+                  Current plan
+                </span>
+                <div
+                  class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary two-columns emotion-4"
+                >
+                  <div>
+                    Trial
+                  </div>
+                  <a
+                    class="align-right"
+                    href="https://mender.io/plans/pricing"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Compare product plans
+                  </a>
+                </div>
+              </div>
+              <hr
+                class="MuiDivider-root MuiDivider-fullWidth emotion-6"
               />
-            </svg>
-            <span
-              class="margin-left-small"
-            >
-              Your trial expires in 
-              6 months
-              . 
-              <a
-                href="/settings/upgrade"
+              <div
+                class="flexbox centered muted"
               >
-                Upgrade to a paid plan
-              </a>
-            </span>
-          </div>
-        </div>
-      </li>
-      <li
-        class="margin-top-small org-settings-item"
-      >
-        <div
-          class="MuiListItem-root flexbox column MuiListItem-gutters MuiListItem-padding MuiListItem-alignItemsFlexStart emotion-1"
-        >
-          <div
-            class="MuiListItemText-root MuiListItemText-multiline emotion-2"
+                <svg
+                  aria-hidden="true"
+                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall emotion-37"
+                  data-testid="ErrorIcon"
+                  focusable="false"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-2h2zm0-4h-2V7h2z"
+                  />
+                </svg>
+                <span
+                  class="margin-left-small"
+                >
+                  Your trial expires in 
+                  6 months
+                  . 
+                  <a
+                    href="/settings/upgrade"
+                  >
+                    Upgrade to a paid plan
+                  </a>
+                </span>
+              </div>
+            </div>
+          </li>
+          <li
+            class="margin-top-small org-settings-item"
           >
-            <span
-              class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary emotion-3"
-            >
-              Current add-ons
-            </span>
             <div
-              class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary two-columns emotion-4"
+              class="MuiListItem-root flexbox column MuiListItem-gutters MuiListItem-padding MuiListItem-alignItemsFlexStart emotion-1"
             >
-              <div>
-                Configure, Monitor
+              <div
+                class="MuiListItemText-root MuiListItemText-multiline emotion-2"
+              >
+                <span
+                  class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary emotion-3"
+                >
+                  Current add-ons
+                </span>
+                <div
+                  class="MuiTypography-root MuiTypography-body2 MuiListItemText-secondary two-columns emotion-4"
+                >
+                  <div>
+                    Configure, Monitor
+                  </div>
+                  <a
+                    class="align-right"
+                  >
+                    Purchase an add-on
+                  </a>
+                </div>
               </div>
-              <a
-                class="align-right"
+              <hr
+                class="MuiDivider-root MuiDivider-fullWidth emotion-6"
+              />
+              <div
+                class="flexbox centered muted"
               >
-                Purchase an add-on
-              </a>
+                <svg
+                  aria-hidden="true"
+                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall emotion-37"
+                  data-testid="ErrorIcon"
+                  focusable="false"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-2h2zm0-4h-2V7h2z"
+                  />
+                </svg>
+                <span
+                  class="margin-left-small"
+                >
+                  Your trial expires in 
+                  6 months
+                  . 
+                  <a
+                    href="/settings/upgrade"
+                  >
+                    Upgrade to a paid plan
+                  </a>
+                </span>
+              </div>
             </div>
-          </div>
-          <hr
-            class="MuiDivider-root MuiDivider-fullWidth emotion-6"
-          />
-          <div
-            class="flexbox centered muted"
-          >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall emotion-37"
-              data-testid="ErrorIcon"
-              focusable="false"
-              viewBox="0 0 24 24"
-            >
-              <path
-                d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m1 15h-2v-2h2zm0-4h-2V7h2z"
-              />
-            </svg>
-            <span
-              class="margin-left-small"
+            <div
+              class="margin-left-small margin-bottom"
             >
-              Your trial expires in 
-              6 months
-              . 
               <a
-                href="/settings/upgrade"
+                class="flexbox center-aligned"
+                href="https://mender.io/plans/pricing"
+                rel="noopener"
+                target="_blank"
               >
-                Upgrade to a paid plan
+                <div
+                  style="max-width: 200px;"
+                >
+                  Compare plans and add-ons at mender.io
+                </div>
+                <svg
+                  aria-hidden="true"
+                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall emotion-37"
+                  data-testid="OpenInNewIcon"
+                  focusable="false"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3z"
+                  />
+                </svg>
               </a>
-            </span>
-          </div>
-        </div>
-        <div
-          class="margin-left-small margin-bottom"
+            </div>
+          </li>
+        </ul>
+        <p
+          class="margin-left-small margin-right-small"
+          style="max-width: 500px;"
         >
           <a
-            class="flexbox center-aligned"
-            href="https://mender.io/plans/pricing"
-            rel="noopener"
-            target="_blank"
+            href=""
           >
-            <div
-              style="max-width: 200px;"
-            >
-              Compare plans and add-ons at mender.io
-            </div>
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall emotion-37"
-              data-testid="OpenInNewIcon"
-              focusable="false"
-              viewBox="0 0 24 24"
-            >
-              <path
-                d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3z"
-              />
-            </svg>
+            End trial
+             and deactivate account
           </a>
-        </div>
-      </li>
-    </ul>
-    <p
-      class="margin-left-small margin-right-small"
-      style="max-width: 500px;"
-    >
-      <a
-        href=""
-      >
-        End trial
-         and deactivate account
-      </a>
-    </p>
+        </p>
+      </div>
+    </div>
   </div>
-</div>
+</body>
 `;
 
 exports[`smaller components renders CancelSubscriptionAlert correctly 1`] = `
diff --git a/frontend/src/js/components/settings/organization/billing.js b/frontend/src/js/components/settings/organization/billing.js
index 7afe9711..aa920f8f 100644
--- a/frontend/src/js/components/settings/organization/billing.js
+++ b/frontend/src/js/components/settings/organization/billing.js
@@ -20,7 +20,8 @@ import { Error as ErrorIcon, OpenInNew as OpenInNewIcon } from '@mui/icons-mater
 import { LinearProgress, List } from '@mui/material';
 import { makeStyles } from 'tss-react/mui';
 
-import moment from 'moment';
+import dayjs from 'dayjs';
+import relativeTime from 'dayjs/plugin/relativeTime';
 
 import { cancelRequest } from '../../../actions/organizationActions';
 import { ADDONS, PLANS } from '../../../constants/appConstants';
@@ -41,11 +42,13 @@ const useStyles = makeStyles()(theme => ({
   }
 }));
 
+dayjs.extend(relativeTime);
+
 export const TrialExpirationNote = ({ trial_expiration }) => (
   <div className="flexbox centered muted">
     <ErrorIcon fontSize="small" />
     <span className="margin-left-small">
-      Your trial expires in {moment().from(moment(trial_expiration), true)}. <Link to="/settings/upgrade">Upgrade to a paid plan</Link>
+      Your trial expires in {dayjs().from(dayjs(trial_expiration), true)}. <Link to="/settings/upgrade">Upgrade to a paid plan</Link>
     </span>
   </div>
 );
diff --git a/frontend/src/js/components/settings/organization/organization.js b/frontend/src/js/components/settings/organization/organization.js
index cd6f96b5..415c8328 100644
--- a/frontend/src/js/components/settings/organization/organization.js
+++ b/frontend/src/js/components/settings/organization/organization.js
@@ -21,7 +21,7 @@ import { Button, Checkbox, Collapse, Dialog, DialogActions, DialogContent, Dialo
 import { makeStyles } from 'tss-react/mui';
 
 import copy from 'copy-to-clipboard';
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 import { setSnackbar } from '../../../actions/appActions';
 import {
@@ -139,7 +139,7 @@ export const Organization = () => {
   const onTokenExpansion = useCallback(() => setShowTokenWarning(true), []);
 
   const onDownloadReportClick = () =>
-    dispatch(downloadLicenseReport()).then(report => createFileDownload(report, `Mender-license-report-${moment().format(moment.HTML5_FMT.DATE)}`, token));
+    dispatch(downloadLicenseReport()).then(report => createFileDownload(report, `Mender-license-report-${dayjs().format('YYYY-MM-DD')}`, token));
 
   const onTenantInfoClick = () => {
     copy(`Organization: ${org.name}, Tenant ID: ${org.id}`);
diff --git a/frontend/src/js/components/settings/organization/organization.test.js b/frontend/src/js/components/settings/organization/organization.test.js
index 982a7a17..0309bec9 100644
--- a/frontend/src/js/components/settings/organization/organization.test.js
+++ b/frontend/src/js/components/settings/organization/organization.test.js
@@ -17,6 +17,7 @@ import { drawerClasses } from '@mui/material';
 
 import { act, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import MockDate from 'mockdate';
 
 import { defaultState, undefineds } from '../../../../../tests/mockData';
 import { render } from '../../../../../tests/setupTests';
@@ -79,14 +80,14 @@ describe('MyOrganization Component', () => {
         }
       }
     };
-    Date.now = jest.fn(() => new Date('2020-07-01T12:00:00.000Z'));
+    MockDate.set(new Date('2020-07-01T12:00:00.000Z'));
   });
 
   it('renders correctly', async () => {
     const { baseElement } = render(<MyOrganization />, {
       preloadedState: { ...preloadedState, users: { ...preloadedState.users, currentSession: getSessionInfo() } }
     });
-    const view = baseElement.firstChild.firstChild;
+    const view = baseElement;
     expect(view).toMatchSnapshot();
     expect(view).toEqual(expect.not.stringMatching(undefineds));
   });
diff --git a/frontend/src/js/components/settings/upgrade.js b/frontend/src/js/components/settings/upgrade.js
index fb28d824..70595c57 100644
--- a/frontend/src/js/components/settings/upgrade.js
+++ b/frontend/src/js/components/settings/upgrade.js
@@ -17,7 +17,7 @@ import { useNavigate } from 'react-router-dom';
 
 import { InfoOutlined as InfoOutlinedIcon, LocalOffer as LocalOfferIcon } from '@mui/icons-material';
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 import { setSnackbar } from '../../actions/appActions';
 import { getDeviceLimit } from '../../actions/deviceActions';
@@ -73,7 +73,7 @@ const upgradeNotes = {
 };
 
 export const Upgrade = () => {
-  const offerValid = moment().isBefore('2021-01-01');
+  const offerValid = dayjs().isBefore('2021-01-01');
   const [addOns, setAddOns] = useState([]);
   const [updatedPlan, setUpdatedPlan] = useState(PLANS.os.id);
   const [upgraded, setUpgraded] = useState(false);
diff --git a/frontend/tests/licenses/directDependencies.csv b/frontend/tests/licenses/directDependencies.csv
index 98c41b42..0dd2c63b 100644
--- a/frontend/tests/licenses/directDependencies.csv
+++ b/frontend/tests/licenses/directDependencies.csv
@@ -45,6 +45,7 @@
 "core-js","MIT","https://github.com/zloirock/core-js"
 "crypto-browserify","MIT","https://github.com/crypto-browserify/crypto-browserify"
 "css-loader","MIT","https://github.com/webpack-contrib/css-loader"
+"dayjs","MIT","https://github.com/iamkun/dayjs"
 "esbuild-loader","MIT","https://github.com/privatenumber/esbuild-loader"
 "eslint-plugin-import","MIT","https://github.com/import-js/eslint-plugin-import"
 "eslint-plugin-prettier","MIT","https://github.com/prettier/eslint-plugin-prettier"
@@ -70,8 +71,7 @@
 "md5","BSD-3-Clause","https://github.com/pvorb/node-md5"
 "mender-gui","Apache-2.0","https://github.com/mendersoftware/gui"
 "mini-css-extract-plugin","MIT","https://github.com/webpack-contrib/mini-css-extract-plugin"
-"moment-duration-format","MIT","https://github.com/jsmreese/moment-duration-format"
-"moment","MIT","https://github.com/moment/moment"
+"mockdate","MIT","https://github.com/boblauer/MockDate"
 "msgpack5","MIT","https://github.com/mcollina/msgpack5"
 "msw","MIT","https://github.com/mswjs/msw"
 "pluralize","MIT","https://github.com/blakeembrey/pluralize"