diff --git a/addons/api/mirage/factories/account.js b/addons/api/mirage/factories/account.js
index 9ab7b259b..34656d14a 100644
--- a/addons/api/mirage/factories/account.js
+++ b/addons/api/mirage/factories/account.js
@@ -1,5 +1,5 @@
 import factory from '../generated/factories/account';
-import { random, internet } from 'faker';
+import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 
@@ -18,13 +18,13 @@ export default factory.extend({
   attributes() {
     switch (this.type) {
       case 'password':
-        return { login_name: random.words() };
+        return { login_name: faker.random.words() };
       case 'oidc':
         return {
-          issuer: internet.ip(),
+          issuer: faker.internet.ip(),
           subject: 'sub',
-          email: internet.email(),
-          full_name: random.words(),
+          email: faker.internet.email(),
+          full_name: faker.random.words(),
         };
     }
   },
diff --git a/addons/api/mirage/factories/credential-library.js b/addons/api/mirage/factories/credential-library.js
index 4aed98912..5808adcad 100644
--- a/addons/api/mirage/factories/credential-library.js
+++ b/addons/api/mirage/factories/credential-library.js
@@ -1,5 +1,5 @@
 import factory from '../generated/factories/credential-library';
-import { random, system } from 'faker';
+import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 
@@ -22,8 +22,8 @@ export default factory.extend({
       case 'vault':
         return {
           http_method: 'GET',
-          http_request_body: random.word(),
-          path: system.directoryPath(),
+          http_request_body: faker.random.word(),
+          path: faker.system.directoryPath(),
         };
     }
   },
diff --git a/addons/api/mirage/factories/credential-store.js b/addons/api/mirage/factories/credential-store.js
index 42ca84eab..c59d9a44f 100644
--- a/addons/api/mirage/factories/credential-store.js
+++ b/addons/api/mirage/factories/credential-store.js
@@ -1,5 +1,5 @@
 import factory from '../generated/factories/credential-store';
-import { random, internet, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
@@ -34,11 +34,11 @@ export default factory.extend({
     switch (this.type) {
       case 'vault':
         return {
-          address: internet.ip(),
-          namespace: random.word(),
+          address: faker.internet.ip(),
+          namespace: faker.random.word(),
           ca_cert: 'ca-cert-123',
-          tls_server_name: internet.domainName(),
-          tls_skip_verify: datatype.boolean(),
+          tls_server_name: faker.internet.domainName(),
+          tls_skip_verify: faker.datatype.boolean(),
           token_hmac: 'token-hmac-abcde0987654321',
           client_certificate: 'client-cert-123',
           client_certificate_key_hmac: 'client-cert-key-hmac-abcde0987654321',
diff --git a/addons/api/mirage/factories/credential.js b/addons/api/mirage/factories/credential.js
index 5ab002ffb..e257205b3 100644
--- a/addons/api/mirage/factories/credential.js
+++ b/addons/api/mirage/factories/credential.js
@@ -1,5 +1,5 @@
 import factory from '../generated/factories/credential';
-import { random } from 'faker';
+import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generatedId from '../helpers/id';
 
@@ -15,7 +15,7 @@ export default factory.extend({
     ],
   attributes() {
     return {
-      username: random.word(),
+      username: faker.random.word(),
     };
   },
 });
diff --git a/addons/api/mirage/factories/host-catalog.js b/addons/api/mirage/factories/host-catalog.js
index 207c06d37..124d52b8f 100644
--- a/addons/api/mirage/factories/host-catalog.js
+++ b/addons/api/mirage/factories/host-catalog.js
@@ -1,7 +1,7 @@
 import factory from '../generated/factories/host-catalog';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
-import { datatype, address, random } from 'faker';
+import { faker } from '@faker-js/faker';
 import generateId from '../helpers/id';
 
 const types = ['static', 'plugin'];
@@ -38,7 +38,7 @@ export default factory.extend({
       return {
         id: `plugin-id-${i}`,
         name: pluginTypes[pluginTypeCounter++ % pluginTypes.length],
-        description: random.words(),
+        description: faker.random.words(),
       };
     }
   },
@@ -47,15 +47,15 @@ export default factory.extend({
     switch (this.plugin?.name) {
       case 'aws':
         return {
-          disable_credential_rotation: datatype.boolean(),
-          region: address.state(),
+          disable_credential_rotation: faker.datatype.boolean(),
+          region: faker.address.state(),
         };
       case 'azure':
         return {
-          disable_credential_rotation: datatype.boolean(),
-          tenant_id: datatype.hexaDecimal(6),
-          client_id: datatype.hexaDecimal(6),
-          subscription_id: datatype.hexaDecimal(8),
+          disable_credential_rotation: faker.datatype.boolean(),
+          tenant_id: faker.datatype.hexadecimal(6),
+          client_id: faker.datatype.hexadecimal(6),
+          subscription_id: faker.datatype.hexadecimal(8),
         };
     }
   },
@@ -64,13 +64,13 @@ export default factory.extend({
     switch (this.plugin?.name) {
       case 'aws':
         return {
-          access_key_id: datatype.hexaDecimal(8),
-          secret_access_key: datatype.string(12),
+          access_key_id: faker.datatype.hexadecimal(8),
+          secret_access_key: faker.datatype.string(12),
         };
       case 'azure':
         return {
-          secret_id: datatype.hexaDecimal(6),
-          secret_value: datatype.string(12),
+          secret_id: faker.datatype.hexadecimal(6),
+          secret_value: faker.datatype.string(12),
         };
     }
   },
diff --git a/addons/api/mirage/factories/host-set.js b/addons/api/mirage/factories/host-set.js
index 43b99e35b..d805d0feb 100644
--- a/addons/api/mirage/factories/host-set.js
+++ b/addons/api/mirage/factories/host-set.js
@@ -1,6 +1,6 @@
 import factory from '../generated/factories/host-set';
 import permissions from '../helpers/permissions';
-import { datatype, internet, database } from 'faker';
+import { faker } from '@faker-js/faker';
 import generateId from '../helpers/id';
 
 export default factory.extend({
@@ -22,26 +22,26 @@ export default factory.extend({
   },
   preferred_endpoints() {
     if (this.type === 'plugin') {
-      const enpointsAmount = datatype.number({ min: 1, max: 5 });
+      const enpointsAmount = faker.datatype.number({ min: 1, max: 5 });
       let result = [];
       for (let i = 0; i < enpointsAmount; ++i) {
-        result.push(internet.ip());
+        result.push(faker.internet.ip());
       }
       return result;
     }
   },
   sync_interval_seconds() {
     if (this.type === 'plugin') {
-      return datatype.number();
+      return faker.datatype.number();
     }
   },
   // AWS specific
   filters() {
     if (this.plugin?.name === 'aws') {
-      const filtersAmount = datatype.number({ min: 1, max: 5 });
+      const filtersAmount = faker.datatype.number({ min: 1, max: 5 });
       let result = [];
       for (let i = 0; i < filtersAmount; ++i) {
-        result.push(`${datatype.string(3)}=${datatype.string(8)}`);
+        result.push(`${faker.datatype.string(3)}=${faker.datatype.string(8)}`);
       }
       return result;
     }
@@ -49,7 +49,7 @@ export default factory.extend({
   // Azure specific
   filter() {
     if (this.plugin?.name === 'azure') {
-      return `${database.column()}=${database.collation()}`;
+      return `${faker.database.column()}=${faker.database.collation()}`;
     }
   },
 });
diff --git a/addons/api/mirage/factories/host.js b/addons/api/mirage/factories/host.js
index 79bcad1e5..cab4d9184 100644
--- a/addons/api/mirage/factories/host.js
+++ b/addons/api/mirage/factories/host.js
@@ -1,6 +1,6 @@
 import factory from '../generated/factories/host';
 import permissions from '../helpers/permissions';
-import { internet, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 import generateId from '../helpers/id';
 
 export default factory.extend({
@@ -25,12 +25,12 @@ export default factory.extend({
     const addressesAmount = Math.floor(Math.random() * 6) + 1;
     let result = [];
     for (let i = 0; i < addressesAmount; ++i) {
-      result.push(internet.ip());
+      result.push(faker.internet.ip());
     }
     return result;
   },
   external_id() {
-    return datatype.uuid();
+    return faker.datatype.uuid();
   },
   // Only aws plugins have dns_names
   dns_names() {
@@ -38,7 +38,7 @@ export default factory.extend({
       const dnsNamesAmount = Math.floor(Math.random() * 6) + 1;
       let result = [];
       for (let i = 0; i < dnsNamesAmount; i++) {
-        result.push(internet.domainName());
+        result.push(faker.internet.domainName());
       }
       return result;
     }
diff --git a/addons/api/mirage/factories/managed-group.js b/addons/api/mirage/factories/managed-group.js
index b43b2b68d..609e4db3a 100644
--- a/addons/api/mirage/factories/managed-group.js
+++ b/addons/api/mirage/factories/managed-group.js
@@ -1,5 +1,5 @@
 import factory from '../generated/factories/managed-group';
-import { random } from 'faker';
+import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 
@@ -22,7 +22,7 @@ export default factory.extend({
     switch (this.type) {
       case 'oidc':
         return {
-          filter: random.words(),
+          filter: faker.random.words(),
         };
     }
   },
diff --git a/addons/api/mirage/factories/session.js b/addons/api/mirage/factories/session.js
index f73895473..c42088d85 100644
--- a/addons/api/mirage/factories/session.js
+++ b/addons/api/mirage/factories/session.js
@@ -1,11 +1,12 @@
 import factory from '../generated/factories/session';
 import { trait } from 'ember-cli-mirage';
-import { random } from 'faker';
+import { faker } from '@faker-js/faker';
 import generateId from '../helpers/id';
 
 const statusStrings = ['pending', 'active', 'canceling', 'terminated'];
 
-export const pickRandomStatusString = () => random.arrayElement(statusStrings);
+export const pickRandomStatusString = () =>
+  faker.helpers.arrayElement(statusStrings);
 
 export default factory.extend({
   id: () => generateId('ss_'),
diff --git a/addons/api/mirage/factories/target.js b/addons/api/mirage/factories/target.js
index 64248f999..55d12aad8 100644
--- a/addons/api/mirage/factories/target.js
+++ b/addons/api/mirage/factories/target.js
@@ -1,6 +1,6 @@
 import factory from '../generated/factories/target';
 import { trait } from 'ember-cli-mirage';
-import { random, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 
@@ -27,8 +27,9 @@ export default factory.extend({
   /**
    * -1 means "unlimited" and we want to generate these on occasion.
    */
-  session_connection_limit: () => random.arrayElement([-1, datatype.number()]),
-  worker_filter: (i) => (i % 2 === 0 ? random.words() : null),
+  session_connection_limit: () =>
+    faker.helpers.arrayElement([-1, faker.datatype.number()]),
+  worker_filter: (i) => (i % 2 === 0 ? faker.random.words() : null),
   type: (i) => types[i % types.length],
   /**
    * Generates attributes fields by type.
@@ -37,7 +38,7 @@ export default factory.extend({
     if (target.type === 'tcp' || target.type === 'ssh') {
       target.update({
         attributes: {
-          default_port: datatype.number(),
+          default_port: faker.datatype.number(),
         },
       });
     }
diff --git a/addons/api/mirage/factories/worker.js b/addons/api/mirage/factories/worker.js
index b54f1155d..816ade736 100644
--- a/addons/api/mirage/factories/worker.js
+++ b/addons/api/mirage/factories/worker.js
@@ -1,10 +1,10 @@
 import factory from '../generated/factories/user';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
-import { random } from 'faker';
+import { faker } from '@faker-js/faker';
 
 const types = ['pki', 'kms'];
-const tags = ['dev', random.word(), random.word()];
+const tags = ['dev', faker.random.word(), faker.random.word()];
 
 export default factory.extend({
   id: () => generateId('w_'),
diff --git a/addons/api/mirage/generated/factories/account.js b/addons/api/mirage/generated/factories/account.js
index 92a515a73..7faa5cd87 100644
--- a/addons/api/mirage/generated/factories/account.js
+++ b/addons/api/mirage/generated/factories/account.js
@@ -1,14 +1,12 @@
 import { Factory } from 'ember-cli-mirage';
-import { date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedAccountFactory
  */
 export default Factory.extend({
   type: 'password',
-  // name: () => random.words(),
-  // description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  version: () => datatype.number(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  version: () => faker.datatype.number(),
 });
diff --git a/addons/api/mirage/generated/factories/auth-method.js b/addons/api/mirage/generated/factories/auth-method.js
index 89df46c74..7bb41e6ae 100644
--- a/addons/api/mirage/generated/factories/auth-method.js
+++ b/addons/api/mirage/generated/factories/auth-method.js
@@ -1,16 +1,16 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedAuthMethodModelFactory
  */
 export default Factory.extend({
   type: 'password',
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  disabled: () => datatype.boolean(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  disabled: () => faker.datatype.boolean(),
 
   attributes: function () {
     let attrs;
diff --git a/addons/api/mirage/generated/factories/credential-library.js b/addons/api/mirage/generated/factories/credential-library.js
index b2e001493..e29a22502 100644
--- a/addons/api/mirage/generated/factories/credential-library.js
+++ b/addons/api/mirage/generated/factories/credential-library.js
@@ -1,12 +1,12 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedCredentialLibraryModelFactory
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
 });
diff --git a/addons/api/mirage/generated/factories/credential-store.js b/addons/api/mirage/generated/factories/credential-store.js
index 2b8a86dd2..69b1727d0 100644
--- a/addons/api/mirage/generated/factories/credential-store.js
+++ b/addons/api/mirage/generated/factories/credential-store.js
@@ -1,12 +1,12 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedCredentialStoreModelFactory
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
 });
diff --git a/addons/api/mirage/generated/factories/credential.js b/addons/api/mirage/generated/factories/credential.js
index 1df2627e3..b2f755e30 100644
--- a/addons/api/mirage/generated/factories/credential.js
+++ b/addons/api/mirage/generated/factories/credential.js
@@ -1,13 +1,13 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedCredentialModelFactory
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  version: () => datatype.number(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  version: () => faker.datatype.number(),
 });
diff --git a/addons/api/mirage/generated/factories/group.js b/addons/api/mirage/generated/factories/group.js
index 287378be0..1361e5ee3 100644
--- a/addons/api/mirage/generated/factories/group.js
+++ b/addons/api/mirage/generated/factories/group.js
@@ -1,14 +1,14 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedGroupModelFactory
  * Group contains all fields related to a Group resource
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  disabled: () => datatype.boolean(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  disabled: () => faker.datatype.boolean(),
 });
diff --git a/addons/api/mirage/generated/factories/host-catalog.js b/addons/api/mirage/generated/factories/host-catalog.js
index 36d5e64c6..bf0972918 100644
--- a/addons/api/mirage/generated/factories/host-catalog.js
+++ b/addons/api/mirage/generated/factories/host-catalog.js
@@ -1,14 +1,14 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedHostCatalogModelFactory
  */
 export default Factory.extend({
   type: 'static',
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  disabled: () => datatype.boolean(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  disabled: () => faker.datatype.boolean(),
 });
diff --git a/addons/api/mirage/generated/factories/host-set.js b/addons/api/mirage/generated/factories/host-set.js
index 9a8000ef9..19c07e33f 100644
--- a/addons/api/mirage/generated/factories/host-set.js
+++ b/addons/api/mirage/generated/factories/host-set.js
@@ -1,15 +1,15 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedHostSetModelFactory
  */
 export default Factory.extend({
   type: 'static',
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  version: () => datatype.number(),
-  size: () => datatype.number(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  version: () => faker.datatype.number(),
+  size: () => faker.datatype.number(),
 });
diff --git a/addons/api/mirage/generated/factories/host.js b/addons/api/mirage/generated/factories/host.js
index 6b26bab0b..e6dbc1487 100644
--- a/addons/api/mirage/generated/factories/host.js
+++ b/addons/api/mirage/generated/factories/host.js
@@ -1,17 +1,17 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype, internet } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedHostModelFactory
  */
 export default Factory.extend({
   type: 'static',
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  version: () => datatype.number(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  version: () => faker.datatype.number(),
   attributes: () => {
-    return { address: internet.ipv6() };
+    return { address: faker.internet.ipv6() };
   },
 });
diff --git a/addons/api/mirage/generated/factories/managed-group.js b/addons/api/mirage/generated/factories/managed-group.js
index a041c0f50..446265c03 100644
--- a/addons/api/mirage/generated/factories/managed-group.js
+++ b/addons/api/mirage/generated/factories/managed-group.js
@@ -1,14 +1,14 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedManagedGroupFactory
  * A managed group is a resource that represents a collection of accounts.
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  version: () => datatype.number(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  version: () => faker.datatype.number(),
 });
diff --git a/addons/api/mirage/generated/factories/org.js b/addons/api/mirage/generated/factories/org.js
index cc1d6200b..1f1b01fa5 100644
--- a/addons/api/mirage/generated/factories/org.js
+++ b/addons/api/mirage/generated/factories/org.js
@@ -1,13 +1,13 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedOrgModelFactory
  *
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
 });
diff --git a/addons/api/mirage/generated/factories/project.js b/addons/api/mirage/generated/factories/project.js
index 4463e664a..71c64abd7 100644
--- a/addons/api/mirage/generated/factories/project.js
+++ b/addons/api/mirage/generated/factories/project.js
@@ -1,14 +1,14 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedProjectModelFactory
  * Project contains all fields related to a Project resource
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  disabled: () => datatype.boolean(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  disabled: () => faker.datatype.boolean(),
 });
diff --git a/addons/api/mirage/generated/factories/role.js b/addons/api/mirage/generated/factories/role.js
index ab2ccbfec..5b27ef6ca 100644
--- a/addons/api/mirage/generated/factories/role.js
+++ b/addons/api/mirage/generated/factories/role.js
@@ -1,15 +1,15 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedRoleModelFactory
  * Role contains all field related to a Role resource
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  disabled: () => datatype.boolean(),
-  version: () => datatype.number(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  disabled: () => faker.datatype.boolean(),
+  version: () => faker.datatype.number(),
 });
diff --git a/addons/api/mirage/generated/factories/scope.js b/addons/api/mirage/generated/factories/scope.js
index b96133c1e..9432ddbd2 100644
--- a/addons/api/mirage/generated/factories/scope.js
+++ b/addons/api/mirage/generated/factories/scope.js
@@ -1,13 +1,13 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedScopeModelFactory
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  disabled: () => datatype.boolean(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  disabled: () => faker.datatype.boolean(),
 });
diff --git a/addons/api/mirage/generated/factories/session.js b/addons/api/mirage/generated/factories/session.js
index 2f21b07e9..72fde5a03 100644
--- a/addons/api/mirage/generated/factories/session.js
+++ b/addons/api/mirage/generated/factories/session.js
@@ -1,12 +1,12 @@
 import { Factory } from 'ember-cli-mirage';
-import { date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedSessionModelFactory
  */
 export default Factory.extend({
   type: 'tcp',
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  version: () => datatype.number(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  version: () => faker.datatype.number(),
 });
diff --git a/addons/api/mirage/generated/factories/target.js b/addons/api/mirage/generated/factories/target.js
index b5b9b33c6..35e072290 100644
--- a/addons/api/mirage/generated/factories/target.js
+++ b/addons/api/mirage/generated/factories/target.js
@@ -1,18 +1,18 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedTargetModelFactory
  */
 export default Factory.extend({
   type: 'tcp',
-  name: () => random.words(),
-  session_max_seconds: () => datatype.number(),
-  session_connection_limit: () => datatype.number(),
-  worker_filter: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  disabled: () => datatype.boolean(),
-  version: () => datatype.number(),
+  name: () => faker.random.words(),
+  session_max_seconds: () => faker.datatype.number(),
+  session_connection_limit: () => faker.datatype.number(),
+  worker_filter: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  disabled: () => faker.datatype.boolean(),
+  version: () => faker.datatype.number(),
 });
diff --git a/addons/api/mirage/generated/factories/user.js b/addons/api/mirage/generated/factories/user.js
index 12b40a6e1..8abf4668d 100644
--- a/addons/api/mirage/generated/factories/user.js
+++ b/addons/api/mirage/generated/factories/user.js
@@ -1,15 +1,15 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype, internet } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedUserModelFactory
  * User contains all fields related to a User resource
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  disabled: () => datatype.boolean(),
-  email: () => internet.email().toLowerCase(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  disabled: () => faker.datatype.boolean(),
+  email: () => faker.internet.email().toLowerCase(),
 });
diff --git a/addons/api/mirage/generated/factories/worker.js b/addons/api/mirage/generated/factories/worker.js
index d9b3cff54..b022ae882 100644
--- a/addons/api/mirage/generated/factories/worker.js
+++ b/addons/api/mirage/generated/factories/worker.js
@@ -1,17 +1,17 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype, internet } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedUserModelFactory
  * User contains all fields related to a User resource
  */
 export default Factory.extend({
-  name: () => random.words(),
-  description: () => random.words(),
-  created_time: () => date.recent(),
-  updated_time: () => date.recent(),
-  version: () => datatype.number(),
-  address: () => `${internet.ipv6()}${internet.port()}`,
-  last_status_time: () => date.recent(),
-  active_connection_count: () => datatype.number(),
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  version: () => faker.datatype.number(),
+  address: () => `${faker.internet.ipv6()}${faker.internet.port()}`,
+  last_status_time: () => faker.date.recent(),
+  active_connection_count: () => faker.datatype.number(),
 });
diff --git a/addons/api/mirage/scenarios/ipc.js b/addons/api/mirage/scenarios/ipc.js
index 752284b9d..929e4ec0f 100644
--- a/addons/api/mirage/scenarios/ipc.js
+++ b/addons/api/mirage/scenarios/ipc.js
@@ -1,4 +1,4 @@
-import { datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 export default function initializeMockIPC(server, config) {
   const isTesting = config.environment === 'test';
@@ -61,7 +61,7 @@ export default function initializeMockIPC(server, config) {
       const raw = btoa(JSON.stringify(decoded));
       return {
         address: window.location.hostname,
-        port: datatype.number(),
+        port: faker.datatype.number(),
         protocol: type,
         session_id: newSession.id,
         credentials: [
diff --git a/addons/core/package.json b/addons/core/package.json
index b5bf35cd5..2e3bccdcc 100644
--- a/addons/core/package.json
+++ b/addons/core/package.json
@@ -49,6 +49,7 @@
     "@babel/plugin-proposal-decorators": "^7.18.6",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.8.1",
+    "@faker-js/faker": "^7.3.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
@@ -73,7 +74,6 @@
     "eslint-plugin-ember": "^10.6.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-qunit": "^7.3.0",
-    "faker": "^5.5.3",
     "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
diff --git a/ui/admin/package.json b/ui/admin/package.json
index 7a1f77c7b..d92220bdd 100644
--- a/ui/admin/package.json
+++ b/ui/admin/package.json
@@ -44,6 +44,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/render-modifiers": "^2.0.4",
     "@ember/test-helpers": "^2.8.1",
+    "@faker-js/faker": "^7.3.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "babel-loader": "^8.2.5",
@@ -84,7 +85,6 @@
     "eslint-plugin-ember": "^10.6.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-qunit": "^7.3.0",
-    "faker": "^5.5.3",
     "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index 2eda938b8..ea3ca2032 100755
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -59,6 +59,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/render-modifiers": "^2.0.4",
     "@ember/test-helpers": "^2.8.1",
+    "@faker-js/faker": "^7.3.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@playwright/test": "^1.15.0",
@@ -104,7 +105,6 @@
     "eslint-plugin-ember": "^10.6.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-qunit": "^7.3.0",
-    "faker": "^5.5.3",
     "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
diff --git a/yarn.lock b/yarn.lock
index 9c7c673bb..db6ae3df1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4273,6 +4273,11 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@faker-js/faker@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.3.0.tgz#a508df35ded585c4e071cb5d9d7c89623c837fae"
+  integrity sha512-1W0PZezq2rxlAssoWemi9gFRD8IQxvf0FPL5Km3TOmGHFG7ib0TbFBJ0yC7D/1NsxunjNTK6WjUXV8ao/mKZ5w==
+
 "@formatjs/ecma402-abstract@1.6.4":
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.4.tgz#cff5ef03837fb6bae70b16d04940213c17e87884"
@@ -9420,14 +9425,14 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@4.14.2, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.5, browserslist@^4.16.6, browserslist@^4.16.7, browserslist@^4.17.3, browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.20.2, browserslist@^4.21.0:
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.2.tgz#59a400757465535954946a400b841ed37e2b4ecf"
-  integrity sha512-MonuOgAtUB46uP5CezYbRaYKBNt2LxP0yX+Pmj4LkcDFGkn9Cbpi83d9sCjwQDErXsIJSzY5oKGDbgOlF/LPAA==
+  version "4.21.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
+  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
   dependencies:
-    caniuse-lite "^1.0.30001366"
-    electron-to-chromium "^1.4.188"
+    caniuse-lite "^1.0.30001370"
+    electron-to-chromium "^1.4.202"
     node-releases "^2.0.6"
-    update-browserslist-db "^1.0.4"
+    update-browserslist-db "^1.0.5"
 
 bser@2.1.1:
   version "2.1.1"
@@ -9758,10 +9763,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001366:
-  version "1.0.30001367"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001367.tgz#2b97fe472e8fa29c78c5970615d7cd2ee414108a"
-  integrity sha512-XDgbeOHfifWV3GEES2B8rtsrADx4Jf+juKX2SICJcaUhjYBO3bR96kvEIHa15VU6ohtOhBZuPGGYGbXMRn0NCw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001370:
+  version "1.0.30001370"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001370.tgz#0a30d4f20d38b9e108cc5ae7cc62df9fe66cd5ba"
+  integrity sha512-3PDmaP56wz/qz7G508xzjx8C+MC2qEm4SYhSEzC9IBROo+dGXFWRuaXkWti0A9tuI00g+toiriVqxtWMgl350g==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -11771,10 +11776,10 @@ electron-rebuild@^3.2.6:
     tar "^6.0.5"
     yargs "^17.0.1"
 
-electron-to-chromium@^1.4.188:
-  version "1.4.195"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.195.tgz#139b2d95a42a3f17df217589723a1deac71d1473"
-  integrity sha512-vefjEh0sk871xNmR5whJf9TEngX+KTKS3hOHpjoMpauKkwlGwtMz1H8IaIjAT/GNnX0TbGwAdmVoXCAzXf+PPg==
+electron-to-chromium@^1.4.202:
+  version "1.4.202"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.202.tgz#0c2ed733f42b02ec49a955c5badfcc65888c390b"
+  integrity sha512-JYsK2ex9lmQD27kj19fhXYxzFJ/phLAkLKHv49A5UY6kMRV2xED3qMMLg/voW/+0AR6wMiI+VxlmK9NDtdxlPA==
 
 element-resize-detector@^1.2.2:
   version "1.2.3"
@@ -14159,11 +14164,6 @@ fake-xml-http-request@^2.1.2:
   resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.1.2.tgz#f1786720cae50bbb46273035a0173414f3e85e74"
   integrity sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==
 
-faker@^5.5.3:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e"
-  integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -25912,10 +25912,10 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-browserslist-db@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz#dbfc5a789caa26b1db8990796c2c8ebbce304824"
-  integrity sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==
+update-browserslist-db@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38"
+  integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"