diff --git a/package-lock.json b/package-lock.json
index a09354be..38a4e4b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,6 @@
         "fs-extra": "^11.3.0",
         "genlayer-js": "github:genlayerlabs/genlayer-js#v2-dev",
         "inquirer": "^12.0.0",
-        "keytar": "^7.9.0",
         "node-fetch": "^3.0.0",
         "open": "^10.1.0",
         "ora": "^8.2.0",
@@ -42,7 +41,6 @@
         "@typescript-eslint/eslint-plugin": "^8.0.0",
         "@typescript-eslint/parser": "^8.0.0",
         "@vitest/coverage-v8": "^3.0.0",
-        "cross-env": "^7.0.3",
         "esbuild": ">=0.25.0",
         "eslint": "^9.0.0",
         "eslint-config-prettier": "^10.0.0",
@@ -53,6 +51,9 @@
         "release-it": "^19.0.0",
         "ts-node": "^10.9.2",
         "typescript": "^5.4.5"
+      },
+      "optionalDependencies": {
+        "keytar": "^7.9.0"
       }
     },
     "node_modules/@adraffy/ens-normalize": {
@@ -4066,25 +4067,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cross-env": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
-      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.1"
-      },
-      "bin": {
-        "cross-env": "src/bin/cross-env.js",
-        "cross-env-shell": "src/bin/cross-env-shell.js"
-      },
-      "engines": {
-        "node": ">=10.14",
-        "npm": ">=6",
-        "yarn": ">=1"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -4216,6 +4198,7 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -4358,6 +4341,7 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
       "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
       "license": "Apache-2.0",
+      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -5279,6 +5263,7 @@
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
       "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
       "license": "(MIT OR WTFPL)",
+      "optional": true,
       "engines": {
         "node": ">=6"
       }
@@ -5588,7 +5573,7 @@
     },
     "node_modules/genlayer-js": {
       "version": "1.1.8",
-      "resolved": "git+ssh://git@github.com/genlayerlabs/genlayer-js.git#666d1156c3c136bf79916c53b9764ff3a2a87a5c",
+      "resolved": "git+ssh://git@github.com/genlayerlabs/genlayer-js.git#57889281db1e34df49abcf6129ffe6f347e4de4d",
       "license": "MIT",
       "dependencies": {
         "eslint-plugin-import": "^2.30.0",
@@ -5799,7 +5784,8 @@
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
       "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/glob": {
       "version": "10.4.5",
@@ -6961,6 +6947,7 @@
       "integrity": "sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==",
       "hasInstallScript": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "node-addon-api": "^4.3.0",
         "prebuild-install": "^7.0.1"
@@ -7267,6 +7254,7 @@
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=10"
       },
@@ -7359,7 +7347,8 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
       "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/napi-postinstall": {
       "version": "0.3.3",
@@ -7434,6 +7423,7 @@
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz",
       "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -7445,7 +7435,8 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
       "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/node-domexception": {
       "version": "1.0.0",
@@ -8127,6 +8118,7 @@
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
       "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "detect-libc": "^2.0.0",
         "expand-template": "^2.0.3",
@@ -8809,6 +8801,7 @@
       "version": "7.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
       "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "devOptional": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -8992,7 +8985,8 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/simple-get": {
       "version": "4.0.1",
@@ -9013,6 +9007,7 @@
         }
       ],
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "decompress-response": "^6.0.0",
         "once": "^1.3.1",
@@ -9697,6 +9692,7 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "license": "Apache-2.0",
+      "optional": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
diff --git a/package.json b/package.json
index 405ab3d0..1e8b9a90 100644
--- a/package.json
+++ b/package.json
@@ -12,9 +12,10 @@
     "test:watch": "vitest --watch",
     "test:coverage": "vitest run --coverage",
     "test:smoke": "vitest run --config vitest.smoke.config.ts",
-    "dev": "cross-env NODE_ENV=development node esbuild.config.js",
-    "build": "cross-env NODE_ENV=production node esbuild.config.js",
+    "dev": "node scripts/run-esbuild.mjs development",
+    "build": "node scripts/run-esbuild.mjs production",
     "prepare": "npm run build",
+    "prepack": "npm run build",
     "release": "./scripts/release.sh",
     "postinstall": "node ./scripts/postinstall.js",
     "docs:cli": "node scripts/generate-cli-docs.mjs"
@@ -47,7 +48,6 @@
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "@vitest/coverage-v8": "^3.0.0",
-    "cross-env": "^7.0.3",
     "esbuild": ">=0.25.0",
     "eslint": "^9.0.0",
     "eslint-config-prettier": "^10.0.0",
@@ -69,7 +69,6 @@
     "fs-extra": "^11.3.0",
     "genlayer-js": "github:genlayerlabs/genlayer-js#v2-dev",
     "inquirer": "^12.0.0",
-    "keytar": "^7.9.0",
     "node-fetch": "^3.0.0",
     "open": "^10.1.0",
     "ora": "^8.2.0",
@@ -78,6 +77,9 @@
     "viem": "^2.21.54",
     "vitest": "^3.0.0"
   },
+  "optionalDependencies": {
+    "keytar": "^7.9.0"
+  },
   "overrides": {
     "vite": {
       "rollup": "npm:@rollup/wasm-node"
diff --git a/scripts/run-esbuild.mjs b/scripts/run-esbuild.mjs
new file mode 100644
index 00000000..0289619f
--- /dev/null
+++ b/scripts/run-esbuild.mjs
@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+
+const mode = process.argv[2] ?? 'development';
+
+if (!['development', 'production'].includes(mode)) {
+  console.error(`Unsupported build mode: ${mode}`);
+  process.exit(1);
+}
+
+process.env.NODE_ENV = mode;
+
+await import('../esbuild.config.js');