diff --git a/packages/app/package.json b/packages/app/package.json
index c254fd1e198b..9294f05f3326 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -25,6 +25,7 @@
     "@cypress-design/vue-icon": "^0.26.0",
     "@cypress-design/vue-statusicon": "^0.5.7",
     "@cypress-design/vue-tabs": "^0.5.1",
+    "@faker-js/faker": "5.5.3",
     "@graphql-typed-document-node/core": "^3.1.0",
     "@headlessui/vue": "1.4.0",
     "@iconify-json/mdi": "1.1.63",
@@ -51,7 +52,6 @@
     "dayjs": "^1.9.3",
     "disparity": "^3.0.0",
     "engine.io-client": "3.5.2",
-    "faker": "5.5.3",
     "fuzzysort": "^1.1.4",
     "graphql": "^15.5.1",
     "graphql-tag": "^2.12.5",
diff --git a/packages/app/src/components/FileMatchButton.cy.tsx b/packages/app/src/components/FileMatchButton.cy.tsx
index c5b351bcecb6..70daba6d114c 100644
--- a/packages/app/src/components/FileMatchButton.cy.tsx
+++ b/packages/app/src/components/FileMatchButton.cy.tsx
@@ -2,7 +2,7 @@
 // Defining emits for "Button.vue" removes the native handler on the
 // <button> element. vue-tsc just can't handle this yet.
 import FileMatchButton from './FileMatchButton.vue'
-import faker from 'faker'
+import faker from '@faker-js/faker'
 import { ref } from 'vue'
 const fileMatchButtonSelector = '[data-cy=file-match-button]'
 
diff --git a/packages/app/src/components/FileMatchIndicator.cy.tsx b/packages/app/src/components/FileMatchIndicator.cy.tsx
index ac2c80b62330..cea7249dba71 100644
--- a/packages/app/src/components/FileMatchIndicator.cy.tsx
+++ b/packages/app/src/components/FileMatchIndicator.cy.tsx
@@ -1,5 +1,5 @@
 import FileMatchIndicator from './FileMatchIndicator.vue'
-import faker from 'faker'
+import faker from '@faker-js/faker'
 
 faker.seed(1)
 
diff --git a/packages/frontend-shared/cypress/fixtures/config.json b/packages/frontend-shared/cypress/fixtures/config.json
index 84627b241198..a88d6e939039 100644
--- a/packages/frontend-shared/cypress/fixtures/config.json
+++ b/packages/frontend-shared/cypress/fixtures/config.json
@@ -284,7 +284,7 @@
               "vue3-file-selector",
               "just-my-luck",
               "combine-properties",
-              "faker",
+              "@faker-js/faker",
               "cypress/support/customPercyCommand"
             ]
           }
diff --git a/packages/frontend-shared/package.json b/packages/frontend-shared/package.json
index 3f51ad696547..3b7a710593d1 100644
--- a/packages/frontend-shared/package.json
+++ b/packages/frontend-shared/package.json
@@ -23,6 +23,7 @@
   "devDependencies": {
     "@antfu/utils": "^0.7.8",
     "@cypress-design/css": "^0.13.3",
+    "@faker-js/faker": "5.5.3",
     "@graphql-typed-document-node/core": "^3.1.0",
     "@headlessui/vue": "1.4.0",
     "@iconify-json/logos": "1.1.42",
@@ -52,7 +53,6 @@
     "cypress-real-events": "1.6.0",
     "dayjs": "^1.9.3",
     "fake-uuid": "^1.0.0",
-    "faker": "5.5.3",
     "floating-vue": "2.0.0-beta.17",
     "fuzzysort": "^1.1.4",
     "graphql": "^15.5.1",
diff --git a/packages/frontend-shared/script/testStubSpecs.ts b/packages/frontend-shared/script/testStubSpecs.ts
index ea9b0f086943..c34f270bc564 100644
--- a/packages/frontend-shared/script/testStubSpecs.ts
+++ b/packages/frontend-shared/script/testStubSpecs.ts
@@ -1,5 +1,5 @@
 import JustMyLuck from 'just-my-luck'
-import faker from 'faker'
+import faker from '@faker-js/faker'
 import { template, keys, reduce, templateSettings } from 'lodash'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
diff --git a/packages/frontend-shared/src/components/Alert.cy.tsx b/packages/frontend-shared/src/components/Alert.cy.tsx
index 57f9c9133d21..e2719a798ab6 100644
--- a/packages/frontend-shared/src/components/Alert.cy.tsx
+++ b/packages/frontend-shared/src/components/Alert.cy.tsx
@@ -1,6 +1,6 @@
 import CoffeeIcon from '~icons/mdi/coffee'
 import LoadingIcon from '~icons/mdi/loading'
-import faker from 'faker'
+import faker from '@faker-js/faker'
 import Alert from './Alert.vue'
 import { defaultMessages } from '../locales/i18n'
 import { ref } from 'vue'
diff --git a/packages/frontend-shared/src/components/Collapsible.cy.tsx b/packages/frontend-shared/src/components/Collapsible.cy.tsx
index 5f7c7d553a30..3d481f2865c3 100644
--- a/packages/frontend-shared/src/components/Collapsible.cy.tsx
+++ b/packages/frontend-shared/src/components/Collapsible.cy.tsx
@@ -1,5 +1,5 @@
 import Collapsible from './Collapsible.vue'
-import faker from 'faker'
+import faker from '@faker-js/faker'
 
 faker.seed(1)
 
diff --git a/packages/frontend-shared/src/components/ListRowHeader.cy.tsx b/packages/frontend-shared/src/components/ListRowHeader.cy.tsx
index 4bfc67631030..aca6254c3552 100644
--- a/packages/frontend-shared/src/components/ListRowHeader.cy.tsx
+++ b/packages/frontend-shared/src/components/ListRowHeader.cy.tsx
@@ -1,5 +1,5 @@
 import ListRowHeader from './ListRowHeader.vue'
-import faker from 'faker'
+import faker from '@faker-js/faker'
 import { IconFileChangesAdded, IconActionAdd } from '@cypress-design/vue-icon'
 import Button from '@cy/components/Button.vue'
 
diff --git a/packages/frontend-shared/src/warning/Warning.cy.tsx b/packages/frontend-shared/src/warning/Warning.cy.tsx
index 497292a8dc9c..ce3b56670910 100644
--- a/packages/frontend-shared/src/warning/Warning.cy.tsx
+++ b/packages/frontend-shared/src/warning/Warning.cy.tsx
@@ -1,6 +1,6 @@
 import { defaultMessages } from '@cy/i18n'
 import Warning from './Warning.vue'
-import faker from 'faker'
+import faker from '@faker-js/faker'
 import { ref } from 'vue'
 
 faker.seed(1)
diff --git a/packages/launchpad/src/components/code/FileRow.cy.tsx b/packages/launchpad/src/components/code/FileRow.cy.tsx
index 660cb11180f6..2ba9f588f8c8 100644
--- a/packages/launchpad/src/components/code/FileRow.cy.tsx
+++ b/packages/launchpad/src/components/code/FileRow.cy.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable no-irregular-whitespace */
 import FileRow from './FileRow.vue'
-import faker from 'faker'
+import faker from '@faker-js/faker'
 import { defaultMessages } from '@cy/i18n'
 
 const content = `import { defineConfig } from 'cypress'
diff --git a/packages/launchpad/src/warning/WarningList.cy.tsx b/packages/launchpad/src/warning/WarningList.cy.tsx
index 1e51fe8568be..f77b38982455 100644
--- a/packages/launchpad/src/warning/WarningList.cy.tsx
+++ b/packages/launchpad/src/warning/WarningList.cy.tsx
@@ -1,6 +1,6 @@
 import { WarningListFragmentDoc } from '../generated/graphql-test'
 import WarningList from './WarningList.vue'
-import faker from 'faker'
+import faker from '@faker-js/faker'
 import { defaultMessages } from '@cy/i18n'
 import { WarningList_RemoveWarningDocument } from '../generated/graphql'
 
diff --git a/yarn.lock b/yarn.lock
index 62dff73f7fa4..cfcb244050c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3339,6 +3339,11 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
   integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
+"@faker-js/faker@5.5.3":
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.5.3.tgz#18e3af6b8eae7984072bbeb0c0858474d7c4cefe"
+  integrity sha512-R11tGE6yIFwqpaIqcfkcg7AICXzFg14+5h5v0TfF/9+RMDL6jhzCy/pxHVOfbALGdtVYdt6JdR21tuxEgl34dw==
+
 "@fellow/coffeelint2@^2.2.3":
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/@fellow/coffeelint2/-/coffeelint2-2.2.6.tgz#df7ff93baed710931a0d6b8e7adb25ec089a5011"
@@ -15775,11 +15780,6 @@ fake-uuid@^1.0.0:
   resolved "https://registry.yarnpkg.com/fake-uuid/-/fake-uuid-1.0.0.tgz#7d570548f188ea5e5f4cf0d742a8b2d19b468412"
   integrity sha512-EK0o9XKlJNhW01NkMRb+9mxXe6b9vxu/jXc3XRxbCwZpFPcT3ZcEsRG8cu0IgpIU8iiRmaYBLJBMViPZVOwnmQ==
 
-faker@5.5.3:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e"
-  integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==
-
 fancy-log@^1.3.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"