diff --git a/package-lock.json b/package-lock.json
index 950fb7687..806d1c1e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,7 +44,7 @@
                 "yamljs": "^0.3.0"
             },
             "devDependencies": {
-                "@faker-js/faker": "^7.6.0",
+                "@faker-js/faker": "^10.5.0",
                 "chai": "^4.2.0",
                 "chai-arrays": "^2.0.0",
                 "chai-http": "^4.3.0",
@@ -496,14 +496,20 @@
             }
         },
         "node_modules/@faker-js/faker": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-7.6.0.tgz",
-            "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==",
+            "version": "10.5.0",
+            "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-10.5.0.tgz",
+            "integrity": "sha512-bsxD8WLS5lIj7aaoCx1YJkktqYj5vlBUE6HWzu2Q51ksrGJ0H737ECCKlFU7Yf8Br45z9t99frBp/J7kzbMPAg==",
             "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fakerjs"
+                }
+            ],
             "license": "MIT",
             "engines": {
-                "node": ">=14.0.0",
-                "npm": ">=6.0.0"
+                "node": "^20.19.0 || ^22.13.0 || ^23.5.0 || >=24.0.0",
+                "npm": ">=10"
             }
         },
         "node_modules/@humanwhocodes/config-array": {
diff --git a/package.json b/package.json
index b63447db2..4381afffb 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "version": "2.8.5",
     "license": "(CC0)",
     "devDependencies": {
-        "@faker-js/faker": "^7.6.0",
+        "@faker-js/faker": "^10.5.0",
         "chai": "^4.2.0",
         "chai-arrays": "^2.0.0",
         "chai-http": "^4.3.0",
diff --git a/test/integration-tests/org/postOrgUsersTest.js b/test/integration-tests/org/postOrgUsersTest.js
index bc2f1fda7..41ca3e21b 100644
--- a/test/integration-tests/org/postOrgUsersTest.js
+++ b/test/integration-tests/org/postOrgUsersTest.js
@@ -337,13 +337,13 @@ describe('Testing user post endpoint', () => {
       this.timeout(70000)
       let counter = await User.where({ org_UUID: orgUuid }).countDocuments().exec()
       do {
-        const firstName = faker.name.firstName()
-        const lastName = faker.name.lastName()
+        const firstName = faker.person.firstName()
+        const lastName = faker.person.lastName()
         await chai.request(app)
           .post('/api/org/win_5/user')
           .set({ ...constants.headers, ...shortName })
           .send({
-            username: faker.internet.userName({ firstName: firstName, lastName: lastName }) + ' ' + counter,
+            username: faker.internet.username({ firstName: firstName, lastName: lastName }) + ' ' + counter,
             name: {
               first: firstName,
               last: lastName
diff --git a/test/integration-tests/org/regularUsersTestRegistry.js b/test/integration-tests/org/regularUsersTestRegistry.js
index 252122f48..c794bfc9c 100644
--- a/test/integration-tests/org/regularUsersTestRegistry.js
+++ b/test/integration-tests/org/regularUsersTestRegistry.js
@@ -64,7 +64,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
     /* Negative Tests */
     context('Negative Test', () => {
       it('regular user cannot update their username', async () => {
-        const newUsername = faker.datatype.uuid()
+        const newUsername = faker.string.uuid()
         const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
         const user = constants.nonSecretariatUserHeaders['CVE-API-USER']
 
@@ -87,7 +87,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
           })
       })
       it('regular user cannot update information of another user of the same organization', async () => {
-        const newUsername = faker.datatype.uuid()
+        const newUsername = faker.string.uuid()
         const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
         const user2 = constants.nonSecretariatUserHeaders2['CVE-API-USER']
 
@@ -132,7 +132,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
       it('regular users cannot update organization', async () => {
         const org1 = constants.nonSecretariatUserHeaders['CVE-API-ORG']
         const user = constants.nonSecretariatUserHeaders['CVE-API-USER']
-        const org2 = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
+        const org2 = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
 
         let previousBody
         await chai.request(app).get(`/api/registry/org/${org1}/user/${user}`)
@@ -188,7 +188,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
       })
       it('regular users cannot use grant-role missing users to enumerate another organization', async () => {
         const org = constants.nonSecretariatUserHeaders3['CVE-API-ORG']
-        const user = faker.datatype.uuid()
+        const user = faker.string.uuid()
         await chai.request(app)
           .post(`/api/registry/org/${org}/user/${user}/grant-role`)
           .set(constants.nonSecretariatUserHeaders)
@@ -216,7 +216,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
       })
       it('regular users cannot use revoke-role missing users to enumerate another organization', async () => {
         const org = constants.nonSecretariatUserHeaders3['CVE-API-ORG']
-        const user = faker.datatype.uuid()
+        const user = faker.string.uuid()
         await chai.request(app)
           .post(`/api/registry/org/${org}/user/${user}/revoke-role`)
           .set(constants.nonSecretariatUserHeaders)
@@ -229,7 +229,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
           })
       })
       it("regular user cannot update a user from an org that doesn't exist", async () => {
-        const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
+        const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
         const user = constants.nonSecretariatUserHeaders['CVE-API-USER']
         await chai.request(app)
           .put(`/api/registry/org/${org}/user/${user}`)
@@ -243,7 +243,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
       })
       it("regular user cannot update a user that doesn't exist ", async () => {
         const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
-        const user = faker.datatype.uuid()
+        const user = faker.string.uuid()
         await chai.request(app)
           .put(`/api/registry/org/${org}/user/${user}`)
           .set(constants.nonSecretariatUserHeaders)
@@ -268,7 +268,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
           })
       })
       it("regular user cannot reset the secret of a user from an org that doesn't exist", async () => {
-        const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
+        const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
         const user = constants.nonSecretariatUserHeaders['CVE-API-USER']
         await chai.request(app)
           .put(`/api/registry/org/${org}/user/${user}/reset_secret`)
@@ -282,7 +282,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
       })
       it("regular user cannot reset the secret of a user that doesn't exist", async () => {
         const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
-        const user = faker.datatype.uuid()
+        const user = faker.string.uuid()
         await chai.request(app)
           .put(`/api/registry/org/${org}/user/${user}/reset_secret`)
           .set(constants.nonSecretariatUserHeaders)
@@ -295,7 +295,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
       })
       it('regular users cannot use reset-secret missing users to enumerate another organization', async () => {
         const org = constants.nonSecretariatUserHeaders3['CVE-API-ORG']
-        const user = faker.datatype.uuid()
+        const user = faker.string.uuid()
         await chai.request(app)
           .put(`/api/registry/org/${org}/user/${user}/reset_secret`)
           .set(constants.nonSecretariatUserHeaders)
@@ -326,7 +326,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
     /* Negative Tests */
     context('Negative Test', () => {
       it('regular user cannot create another user', async () => {
-        const newUsername = faker.datatype.uuid()
+        const newUsername = faker.string.uuid()
         const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
         await chai.request(app)
           .post(`/api/registry/org/${org}/user`)
@@ -374,7 +374,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
     /* Negative Tests */
     context('Negative Test', () => {
       it("regular users cannot view users of an organization that doesn't exist", async () => {
-        const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
+        const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
         await chai.request(app)
           .get(`/api/registry/org/${org}/users`)
           .set(constants.nonSecretariatUserHeaders)
@@ -412,7 +412,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
       })
       it('regular users cannot use missing users to enumerate another organization', async () => {
         const org = constants.nonSecretariatUserHeaders3['CVE-API-ORG']
-        const user = faker.datatype.uuid()
+        const user = faker.string.uuid()
         await chai.request(app)
           .get(`/api/registry/org/${org}/user/${user}`)
           .set(constants.nonSecretariatUserHeaders)
@@ -425,7 +425,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
       })
       it("regular user cannot view user that doesn't exist", async () => {
         const org = constants.nonSecretariatUserHeaders['CVE-API-ORG']
-        const user = faker.datatype.uuid()
+        const user = faker.string.uuid()
         await chai.request(app)
           .get(`/api/registry/org/${org}/user/${user}`)
           .set(constants.nonSecretariatUserHeaders)
@@ -456,7 +456,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
           })
       })
       it('regular user cannot update an organization', async () => {
-        const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
+        const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
         await chai.request(app)
           .put(`/api/registry/org/${org}`)
           .set(constants.nonSecretariatUserHeaders)
@@ -519,7 +519,7 @@ describe('Testing regular user permissions for /api/registry/org/ endpoints with
     /* Negative Tests */
     context('Negative Test', () => {
       it("regular users cannot view an organization they don't belong to", async () => {
-        const org = faker.datatype.uuid().slice(0, MAX_SHORTNAME_LENGTH)
+        const org = faker.string.uuid().slice(0, MAX_SHORTNAME_LENGTH)
         await chai.request(app)
           .get(`/api/registry/org/${org}`)
           .set(constants.nonSecretariatUserHeaders)
diff --git a/test/unit-tests/cve-id/cveIdGetAllTest.js b/test/unit-tests/cve-id/cveIdGetAllTest.js
index bd7228bbf..ec08e28bf 100644
--- a/test/unit-tests/cve-id/cveIdGetAllTest.js
+++ b/test/unit-tests/cve-id/cveIdGetAllTest.js
@@ -9,9 +9,9 @@ const OrgRepository = require('../../../src/repositories/orgRepository.js')
 const CveIdRepository = require('../../../src/repositories/cveIdRepository.js')
 const UserRepository = require('../../../src/repositories/userRepository.js')
 
-const orgUUID = faker.datatype.uuid()
-const orgUUID2 = faker.datatype.uuid()
-const userUUID = faker.datatype.uuid()
+const orgUUID = faker.string.uuid()
+const orgUUID2 = faker.string.uuid()
+const userUUID = faker.string.uuid()
 
 const stubOrg = {
   short_name: 'testOrg',
diff --git a/test/unit-tests/cve/insertAdpTest.js b/test/unit-tests/cve/insertAdpTest.js
index fd654a247..53818cc4d 100644
--- a/test/unit-tests/cve/insertAdpTest.js
+++ b/test/unit-tests/cve/insertAdpTest.js
@@ -16,7 +16,7 @@ const CveIdRepository = require('../../../src/repositories/cveIdRepository.js')
 const CveRepository = require('../../../src/repositories/cveRepository.js')
 const UserRepository = require('../../../src/repositories/userRepository.js')
 
-const adpUUID = faker.datatype.uuid()
+const adpUUID = faker.string.uuid()
 
 const stubAdpOrg = {
   short_name: 'adpOrg',
@@ -32,7 +32,7 @@ const stubAdpOrg = {
 const stubAdpUser = {
   username: 'testAdpUser',
   org_UUID: adpUUID,
-  UUID: faker.datatype.uuid()
+  UUID: faker.string.uuid()
 }
 
 const stubCveId = {
diff --git a/test/unit-tests/cve/updateCnaTest.js b/test/unit-tests/cve/updateCnaTest.js
index b72cb009e..3a09be6e8 100644
--- a/test/unit-tests/cve/updateCnaTest.js
+++ b/test/unit-tests/cve/updateCnaTest.js
@@ -12,7 +12,7 @@ const error = new errors.CveControllerError()
 const constants = require('../../../src/constants').getConstants()
 const Cve = require('../../../src/model/cve.js')
 
-const cnaUUID = faker.datatype.uuid()
+const cnaUUID = faker.string.uuid()
 
 const stubCnaOrg = {
   short_name: 'CnaOrg',
@@ -28,7 +28,7 @@ const stubCnaOrg = {
 const stubCnaUser = {
   username: 'testCnaUser',
   org_UUID: cnaUUID,
-  UUID: faker.datatype.uuid()
+  UUID: faker.string.uuid()
 }
 
 const stubCveId = {
diff --git a/test/unit-tests/middleware/onlyAdpsTest.js b/test/unit-tests/middleware/onlyAdpsTest.js
index 8b2cd30d4..6f3d585b6 100644
--- a/test/unit-tests/middleware/onlyAdpsTest.js
+++ b/test/unit-tests/middleware/onlyAdpsTest.js
@@ -13,7 +13,7 @@ const error = new errors.MiddlewareError()
 const stubAdpOrg = {
   short_name: 'adpOrg',
   name: 'test_adp',
-  UUID: faker.datatype.uuid(),
+  UUID: faker.string.uuid(),
   authority: {
     active_roles: [
       'ADP'
@@ -24,7 +24,7 @@ const stubAdpOrg = {
 const stubCnaOrg = {
   short_name: 'cnaOrg',
   name: 'test_cna',
-  UUID: faker.datatype.uuid(),
+  UUID: faker.string.uuid(),
   authority: {
     active_roles: [
       'CNA'
@@ -35,7 +35,7 @@ const stubCnaOrg = {
 const stubSecretariat = {
   short_name: 'secOrg',
   name: 'test_sec',
-  UUID: faker.datatype.uuid(),
+  UUID: faker.string.uuid(),
   authority: {
     active_roles: [
       'SECRETARIAT'
diff --git a/test/unit-tests/middleware/onlyOrgWithPartnerRoleTest.js b/test/unit-tests/middleware/onlyOrgWithPartnerRoleTest.js
index 34013b54c..5428a48b0 100644
--- a/test/unit-tests/middleware/onlyOrgWithPartnerRoleTest.js
+++ b/test/unit-tests/middleware/onlyOrgWithPartnerRoleTest.js
@@ -15,7 +15,7 @@ const error = new errors.MiddlewareError()
 const stubAdpOrg = {
   short_name: 'adpOrg',
   name: 'test_adp',
-  UUID: faker.datatype.uuid(),
+  UUID: faker.string.uuid(),
   authority: {
     active_roles: [
       'ADP'
@@ -26,7 +26,7 @@ const stubAdpOrg = {
 const stubCnaOrg = {
   short_name: 'cnaOrg',
   name: 'test_cna',
-  UUID: faker.datatype.uuid(),
+  UUID: faker.string.uuid(),
   authority: {
     active_roles: [
       'CNA'
@@ -37,7 +37,7 @@ const stubCnaOrg = {
 const stubBulkDownloadOrg = {
   short_name: 'bdOrg',
   name: 'test_bd',
-  UUID: faker.datatype.uuid(),
+  UUID: faker.string.uuid(),
   authority: {
     active_roles: [
       'BULK_DOWNLOAD'
@@ -48,7 +48,7 @@ const stubBulkDownloadOrg = {
 const stubOrgNoRole = {
   short_name: 'NoRole',
   name: 'test_org',
-  UUID: faker.datatype.uuid(),
+  UUID: faker.string.uuid(),
   authority: {
     active_roles: []
   }
@@ -57,7 +57,7 @@ const stubOrgNoRole = {
 const stubSecretariat = {
   short_name: 'secOrg',
   name: 'test_sec',
-  UUID: faker.datatype.uuid(),
+  UUID: faker.string.uuid(),
   authority: {
     active_roles: [
       'SECRETARIAT'
diff --git a/test/unit-tests/org/orgCreateADPTest.js b/test/unit-tests/org/orgCreateADPTest.js
index e982cd20d..61c6f6d7f 100644
--- a/test/unit-tests/org/orgCreateADPTest.js
+++ b/test/unit-tests/org/orgCreateADPTest.js
@@ -87,7 +87,7 @@ describe('Testing creating orgs with the ADP role', () => {
   it('Should return newly created org with id_quota of 0 and ADP role', async () => {
     const req = {
       ctx: {
-        uuid: faker.datatype.uuid(),
+        uuid: faker.string.uuid(),
         repositories: {
           getBaseOrgRepository,
           getBaseUserRepository
diff --git a/test/unit-tests/org/orgCreateTest.js b/test/unit-tests/org/orgCreateTest.js
index a2d28ff7a..e8ec547f3 100644
--- a/test/unit-tests/org/orgCreateTest.js
+++ b/test/unit-tests/org/orgCreateTest.js
@@ -149,7 +149,7 @@ describe('Testing the ORG_CREATE_SINGLE controller', () => {
     it('Should fail if a UUID is provided in the request body', async () => {
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           repositories: { getOrgRepository, getBaseOrgRepository, getUserRepository, getBaseUserRepository },
           body: orgFixtures.existentOrg // This fixture includes a UUID
         }
@@ -175,7 +175,7 @@ describe('Testing the ORG_CREATE_SINGLE controller', () => {
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           repositories: { getOrgRepository, getBaseOrgRepository, getUserRepository, getBaseUserRepository },
           body: testOrgPayload
         }
@@ -218,7 +218,7 @@ describe('Testing the ORG_CREATE_SINGLE controller', () => {
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: 'test_secretariat_org',
           user: 'test_secretariat_user',
           repositories: { getOrgRepository, getUserRepository, getBaseOrgRepository, getBaseUserRepository },
@@ -245,7 +245,7 @@ describe('Testing the ORG_CREATE_SINGLE controller', () => {
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: 'test_secretariat_org',
           user: 'test_secretariat_user',
           repositories: { getOrgRepository, getUserRepository, getBaseOrgRepository, getBaseUserRepository },
@@ -274,7 +274,7 @@ describe('Testing the ORG_CREATE_SINGLE controller', () => {
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: 'test_secretariat_org',
           user: 'test_secretariat_user',
           repositories: { getOrgRepository, getUserRepository, getBaseOrgRepository, getBaseUserRepository },
@@ -306,7 +306,7 @@ describe('Testing the ORG_CREATE_SINGLE controller', () => {
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: 'test_secretariat_org',
           user: 'test_secretariat_user',
           repositories: { getOrgRepository, getUserRepository, getBaseOrgRepository, getBaseUserRepository },
@@ -335,7 +335,7 @@ describe('Testing the ORG_CREATE_SINGLE controller', () => {
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: 'test_secretariat_org',
           user: 'test_secretariat_user',
           repositories: { getOrgRepository, getUserRepository, getBaseOrgRepository, getBaseUserRepository },
@@ -360,7 +360,7 @@ describe('Testing the ORG_CREATE_SINGLE controller', () => {
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: 'test_secretariat_org',
           user: 'test_secretariat_user',
           repositories: { getOrgRepository, getUserRepository, getBaseOrgRepository, getBaseUserRepository },
diff --git a/test/unit-tests/org/orgGetSingleTest.js b/test/unit-tests/org/orgGetSingleTest.js
index e3e8ead08..8aa7296f5 100644
--- a/test/unit-tests/org/orgGetSingleTest.js
+++ b/test/unit-tests/org/orgGetSingleTest.js
@@ -66,7 +66,7 @@ describe('Testing the GET /org/:identifier endpoint in Org Controller', () => {
     req = {
       ctx: {
         org: orgFixtures.secretariatOrg.short_name,
-        uuid: faker.datatype.uuid(),
+        uuid: faker.string.uuid(),
         params: {
           identifier: orgFixtures.targetOrg.short_name
         },
diff --git a/test/unit-tests/user/userCreateTest.js b/test/unit-tests/user/userCreateTest.js
index 281539f94..b51052c0f 100644
--- a/test/unit-tests/user/userCreateTest.js
+++ b/test/unit-tests/user/userCreateTest.js
@@ -14,8 +14,8 @@ const BaseUserRepository = require('../../../src/repositories/baseUserRepository
 const BaseUser = require('../../../src/model/baseuser.js')
 const UserRepository = require('../../../src/repositories/userRepository.js')
 
-const stubOrgUUID = faker.datatype.uuid()
-const stubUserUUID = faker.datatype.uuid()
+const stubOrgUUID = faker.string.uuid()
+const stubUserUUID = faker.string.uuid()
 
 const stubOrg = {
   short_name: 'stubOrg',
diff --git a/test/unit-tests/user/userGetSingleTest.js b/test/unit-tests/user/userGetSingleTest.js
index 88a289dc8..de63ef496 100644
--- a/test/unit-tests/user/userGetSingleTest.js
+++ b/test/unit-tests/user/userGetSingleTest.js
@@ -50,7 +50,7 @@ describe('Testing the GET /org/:shortname/user/:username endpoint in Org Control
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: userFixtures.secretariatHeader['CVE-API-ORG'],
           params: {
             shortname: userFixtures.nonExistentOrg.short_name,
@@ -78,7 +78,7 @@ describe('Testing the GET /org/:shortname/user/:username endpoint in Org Control
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: userFixtures.secretariatHeader['CVE-API-ORG'],
           params: {
             shortname: userFixtures.existentOrg.short_name,
@@ -105,7 +105,7 @@ describe('Testing the GET /org/:shortname/user/:username endpoint in Org Control
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: userFixtures.orgHeader.short_name,
           params: {
             shortname: userFixtures.owningOrg.short_name,
@@ -146,7 +146,7 @@ describe('Testing the GET /org/:shortname/user/:username endpoint in Org Control
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: userFixtures.secretariatHeader['CVE-API-ORG'],
           params: {
             shortname: userFixtures.existentOrg.short_name,
@@ -189,7 +189,7 @@ describe('Testing the GET /org/:shortname/user/:username endpoint in Org Control
       const req = {
         ctx: {
           authenticated: true,
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: userFixtures.owningOrg.short_name,
           orgUUID: userFixtures.owningOrg.UUID,
           userUUID: userFixtures.existentUserDummy.UUID,
diff --git a/test/unit-tests/user/userResetSecretTest.js b/test/unit-tests/user/userResetSecretTest.js
index a0e500bb8..e3952cf86 100644
--- a/test/unit-tests/user/userResetSecretTest.js
+++ b/test/unit-tests/user/userResetSecretTest.js
@@ -81,7 +81,7 @@ describe('Testing the PUT /org/:shortname/user/:username/reset_secret endpoint',
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: 'secretariat_org',
           user: 'secretariat_user',
           repositories: { getOrgRepository, getUserRepository, getBaseUserRepository, getBaseOrgRepository },
@@ -111,7 +111,7 @@ describe('Testing the PUT /org/:shortname/user/:username/reset_secret endpoint',
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: 'secretariat_org',
           user: 'secretariat_user',
           repositories: { getOrgRepository, getUserRepository, getBaseUserRepository, getBaseOrgRepository },
@@ -143,7 +143,7 @@ describe('Testing the PUT /org/:shortname/user/:username/reset_secret endpoint',
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: userFixtures.owningOrg.short_name,
           user: 'some_user',
           repositories: { getOrgRepository, getUserRepository, getBaseUserRepository, getBaseOrgRepository },
@@ -179,7 +179,7 @@ describe('Testing the PUT /org/:shortname/user/:username/reset_secret endpoint',
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: userFixtures.existentOrgDummy.short_name,
           orgUUID: userFixtures.existentOrgDummy.UUID,
           user: userFixtures.userA.username,
@@ -220,7 +220,7 @@ describe('Testing the PUT /org/:shortname/user/:username/reset_secret endpoint',
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: userFixtures.existentOrgDummy.short_name,
           orgUUID: userFixtures.existentOrgDummy.UUID,
           user: userFixtures.userA.username,
@@ -254,7 +254,7 @@ describe('Testing the PUT /org/:shortname/user/:username/reset_secret endpoint',
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: 'secretariat_org',
           user: 'secretariat_user',
           repositories: { getBaseOrgRepository, getBaseUserRepository },
@@ -284,7 +284,7 @@ describe('Testing the PUT /org/:shortname/user/:username/reset_secret endpoint',
 
       const req = {
         ctx: {
-          uuid: faker.datatype.uuid(),
+          uuid: faker.string.uuid(),
           org: userFixtures.existentOrgDummy.short_name,
           orgUUID: userFixtures.existentOrgDummy.UUID,
           user: userFixtures.userD.username,