diff --git a/package-lock.json b/package-lock.json
index 84db88b4de..f4c2be6c3e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "10.0.0",
       "license": "ISC",
       "dependencies": {
-        "@aeternity/aepp-calldata": "github:aeternity/aepp-calldata-js#a623a44a259cc53e99b1e358ecc7b3f88edcb45c",
+        "@aeternity/aepp-calldata": "github:aeternity/aepp-calldata-js#a2afc153ae03c28e2fd0706eefb3055c24459683",
         "@aeternity/argon2-browser": "^0.1.2",
         "@aeternity/json-bigint": "^0.3.1",
         "@aeternity/uuid": "^0.0.1",
@@ -19,7 +19,7 @@
         "aes-js": "^3.1.2",
         "bignumber.js": "^9.0.2",
         "bip32-path": "^0.4.2",
-        "blakejs": "^1.1.1",
+        "blakejs": "github:aeternity/blakejs",
         "bs58": "^4.0.1",
         "buffer": "^6.0.3",
         "cross-fetch": "^3.1.5",
@@ -72,25 +72,17 @@
     },
     "node_modules/@aeternity/aepp-calldata": {
       "version": "1.1.0",
-      "resolved": "git+ssh://git@github.com/aeternity/aepp-calldata-js.git#a623a44a259cc53e99b1e358ecc7b3f88edcb45c",
-      "integrity": "sha512-PWlIVrbKSFbMQ7e7LlvK+MxL97S6kzVp1BMwao2FJKs7em81ozx0VigmmEzPKwHl1YOu/R2JM+fcWgiAHzwEhw==",
+      "resolved": "git+ssh://git@github.com/aeternity/aepp-calldata-js.git#a2afc153ae03c28e2fd0706eefb3055c24459683",
+      "integrity": "sha512-flH1pRUQHmOE5mrQ5rrDR7zxzDneU0lbtKz+psKPpHqLdZSEvn8+3nwVy28KV2gGp/MPH5K17sXD/i9+ixbMxQ==",
       "license": "ISC",
       "dependencies": {
-        "blakejs": "^1.1.1",
+        "blakejs": "github:aeternity/blakejs",
         "bs58": "^4.0.1",
         "rlp": "^3.0.0",
         "safe-buffer": "^5.2.1",
         "sha.js": "^2.4.11"
       }
     },
-    "node_modules/@aeternity/aepp-calldata/node_modules/rlp": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/rlp/-/rlp-3.0.0.tgz",
-      "integrity": "sha512-PD6U2PGk6Vq2spfgiWZdomLvRGDreBLxi5jv5M8EpRo3pU6VEm31KO+HFxE18Q3vgqfDrQ9pZA3FP95rkijNKw==",
-      "bin": {
-        "rlp": "bin/rlp"
-      }
-    },
     "node_modules/@aeternity/argon2-browser": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@aeternity/argon2-browser/-/argon2-browser-0.1.2.tgz",
@@ -3774,8 +3766,8 @@
     },
     "node_modules/blakejs": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz",
-      "integrity": "sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg=="
+      "resolved": "git+ssh://git@github.com/aeternity/blakejs.git#d0ea3f9ac37d246e9b7debaa188c4f501533c938",
+      "license": "CC0-1.0"
     },
     "node_modules/bluebird": {
       "version": "3.7.2",
@@ -11959,22 +11951,15 @@
   },
   "dependencies": {
     "@aeternity/aepp-calldata": {
-      "version": "git+ssh://git@github.com/aeternity/aepp-calldata-js.git#a623a44a259cc53e99b1e358ecc7b3f88edcb45c",
-      "integrity": "sha512-PWlIVrbKSFbMQ7e7LlvK+MxL97S6kzVp1BMwao2FJKs7em81ozx0VigmmEzPKwHl1YOu/R2JM+fcWgiAHzwEhw==",
-      "from": "@aeternity/aepp-calldata@github:aeternity/aepp-calldata-js#a623a44a259cc53e99b1e358ecc7b3f88edcb45c",
+      "version": "git+ssh://git@github.com/aeternity/aepp-calldata-js.git#a2afc153ae03c28e2fd0706eefb3055c24459683",
+      "integrity": "sha512-flH1pRUQHmOE5mrQ5rrDR7zxzDneU0lbtKz+psKPpHqLdZSEvn8+3nwVy28KV2gGp/MPH5K17sXD/i9+ixbMxQ==",
+      "from": "@aeternity/aepp-calldata@github:aeternity/aepp-calldata-js#a2afc153ae03c28e2fd0706eefb3055c24459683",
       "requires": {
-        "blakejs": "^1.1.1",
+        "blakejs": "github:aeternity/blakejs",
         "bs58": "^4.0.1",
         "rlp": "^3.0.0",
         "safe-buffer": "^5.2.1",
         "sha.js": "^2.4.11"
-      },
-      "dependencies": {
-        "rlp": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/rlp/-/rlp-3.0.0.tgz",
-          "integrity": "sha512-PD6U2PGk6Vq2spfgiWZdomLvRGDreBLxi5jv5M8EpRo3pU6VEm31KO+HFxE18Q3vgqfDrQ9pZA3FP95rkijNKw=="
-        }
       }
     },
     "@aeternity/argon2-browser": {
@@ -14687,9 +14672,8 @@
       "integrity": "sha1-XbBBataCJxLwd4NuJVe4aXwMfJk="
     },
     "blakejs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz",
-      "integrity": "sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg=="
+      "version": "git+ssh://git@github.com/aeternity/blakejs.git#d0ea3f9ac37d246e9b7debaa188c4f501533c938",
+      "from": "blakejs@github:aeternity/blakejs"
     },
     "bluebird": {
       "version": "3.7.2",
diff --git a/package.json b/package.json
index 33fb062364..61a27151c3 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "SDK"
   ],
   "dependencies": {
-    "@aeternity/aepp-calldata": "github:aeternity/aepp-calldata-js#a623a44a259cc53e99b1e358ecc7b3f88edcb45c",
+    "@aeternity/aepp-calldata": "github:aeternity/aepp-calldata-js#a2afc153ae03c28e2fd0706eefb3055c24459683",
     "@aeternity/argon2-browser": "^0.1.2",
     "@aeternity/json-bigint": "^0.3.1",
     "@aeternity/uuid": "^0.0.1",
@@ -44,7 +44,7 @@
     "aes-js": "^3.1.2",
     "bignumber.js": "^9.0.2",
     "bip32-path": "^0.4.2",
-    "blakejs": "^1.1.1",
+    "blakejs": "github:aeternity/blakejs",
     "bs58": "^4.0.1",
     "buffer": "^6.0.3",
     "cross-fetch": "^3.1.5",