diff --git a/.pnp.cjs b/.pnp.cjs
index c516fac..312b1cc 100755
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -1397,6 +1397,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD",
         }]
       ]],
+      ["@faker-js/faker", [
+        ["npm:5.5.3", {
+          "packageLocation": "./.yarn/cache/@faker-js-faker-npm-5.5.3-d1b4d39808-d248a042e4.zip/node_modules/@faker-js/faker/",
+          "packageDependencies": [
+            ["@faker-js/faker", "npm:5.5.3"]
+          ],
+          "linkType": "HARD",
+        }]
+      ]],
       ["@hapi/accept", [
         ["npm:5.0.2", {
           "packageLocation": "./.yarn/cache/@hapi-accept-npm-5.0.2-cfe21ffd1e-8088cbc245.zip/node_modules/@hapi/accept/",
@@ -2560,6 +2569,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageDependencies": [
             ["@protokol/hammer", "workspace:packages/hammer"],
             ["@arkecosystem/crypto", "npm:3.0.0"],
+            ["@faker-js/faker", "npm:5.5.3"],
             ["@protokol/client", "npm:1.0.0"],
             ["@protokol/nft-base-crypto", "npm:1.0.1"],
             ["@protokol/nft-exchange-crypto", "npm:1.0.1"],
@@ -2567,7 +2577,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["bip39", "npm:3.0.4"],
             ["chalk", "npm:4.1.1"],
             ["delay", "npm:5.0.0"],
-            ["faker", "npm:5.5.3"],
             ["rimraf", "npm:3.0.2"],
             ["typescript", "patch:typescript@npm%3A4.4.2#~builtin<compat/typescript>::version=4.4.2&hash=32657b"]
           ],
@@ -7103,15 +7112,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "linkType": "HARD",
         }]
       ]],
-      ["faker", [
-        ["npm:5.5.3", {
-          "packageLocation": "./.yarn/cache/faker-npm-5.5.3-541ce97798-684fd64c8d.zip/node_modules/faker/",
-          "packageDependencies": [
-            ["faker", "npm:5.5.3"]
-          ],
-          "linkType": "HARD",
-        }]
-      ]],
       ["fast-copy", [
         ["npm:2.1.1", {
           "packageLocation": "./.yarn/cache/fast-copy-npm-2.1.1-feecd14154-fb091c7192.zip/node_modules/fast-copy/",
diff --git a/.yarn/cache/faker-npm-5.5.3-541ce97798-684fd64c8d.zip b/.yarn/cache/@faker-js-faker-npm-5.5.3-d1b4d39808-d248a042e4.zip
similarity index 80%
rename from .yarn/cache/faker-npm-5.5.3-541ce97798-684fd64c8d.zip
rename to .yarn/cache/@faker-js-faker-npm-5.5.3-d1b4d39808-d248a042e4.zip
index ba816b9..48fa390 100644
Binary files a/.yarn/cache/faker-npm-5.5.3-541ce97798-684fd64c8d.zip and b/.yarn/cache/@faker-js-faker-npm-5.5.3-d1b4d39808-d248a042e4.zip differ
diff --git a/packages/hammer/package.json b/packages/hammer/package.json
index 0877c62..a89efc9 100644
--- a/packages/hammer/package.json
+++ b/packages/hammer/package.json
@@ -43,7 +43,7 @@
 		"bip39": "^3.0.4",
 		"chalk": "^4.1.1",
 		"delay": "^5.0.0",
-		"faker": "^5.5.3"
+		"@faker-js/faker": "^5.5.3"
 	},
 	"devDependencies": {
 		"@types/faker": "^5.5.1",
diff --git a/yarn.lock b/yarn.lock
index 54da9ea..595b382 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -903,6 +903,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@faker-js/faker@npm:^5.5.3":
+  version: 5.5.3
+  resolution: "@faker-js/faker@npm:5.5.3"
+  checksum: d248a042e47ac00613d2d7cc29d4504cc5e5d843162454eede8c35f31c74b19a8fd7cecc0d5ea9e3fbbfc812abc51143c3699e51049fd64300e23e6588e76d39
+  languageName: node
+  linkType: hard
+
 "@hapi/accept@npm:^5.0.1":
   version: 5.0.2
   resolution: "@hapi/accept@npm:5.0.2"
@@ -1987,6 +1994,7 @@ __metadata:
   resolution: "@protokol/hammer@workspace:packages/hammer"
   dependencies:
     "@arkecosystem/crypto": ^3.0.0
+    "@faker-js/faker": ^5.5.3
     "@protokol/client": 1.0.0
     "@protokol/nft-base-crypto": 1.0.1
     "@protokol/nft-exchange-crypto": 1.0.1
@@ -1994,7 +2002,6 @@ __metadata:
     bip39: ^3.0.4
     chalk: ^4.1.1
     delay: ^5.0.0
-    faker: ^5.5.3
     rimraf: ^3.0.2
     typescript: ~4.4.2
   languageName: unknown
@@ -5742,13 +5749,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"faker@npm:^5.5.3":
-  version: 5.5.3
-  resolution: "faker@npm:5.5.3"
-  checksum: 684fd64c8d3897e54248f95b4f6319f75d97691b8500cd13adf4af2c28f9204f766c1d1aaa6b41338f0beaaa87256c3132f8708a1a8f189d122b92f6b98081c3
-  languageName: node
-  linkType: hard
-
 "fast-copy@npm:^2.1.0":
   version: 2.1.1
   resolution: "fast-copy@npm:2.1.1"