diff --git a/package-lock.json b/package-lock.json
index f4652d39e..67d8d94af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,7 +48,6 @@
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -415,7 +414,6 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.23.5",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -423,7 +421,6 @@
     },
     "node_modules/@babel/core": {
       "version": "7.23.9",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
@@ -486,7 +483,6 @@
     },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.23.6",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.23.5",
@@ -501,7 +497,6 @@
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
       "version": "5.1.1",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
@@ -509,7 +504,6 @@
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
       "version": "3.1.1",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
@@ -616,7 +610,6 @@
     },
     "node_modules/@babel/helper-module-transforms": {
       "version": "7.23.3",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -684,7 +677,6 @@
     },
     "node_modules/@babel/helper-simple-access": {
       "version": "7.22.5",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -730,7 +722,6 @@
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.23.5",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -751,7 +742,6 @@
     },
     "node_modules/@babel/helpers": {
       "version": "7.23.9",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.23.9",
@@ -3884,6 +3874,23 @@
         "node": ">=12"
       }
     },
+    "node_modules/@n8n/vm2": {
+      "version": "3.9.23",
+      "resolved": "https://registry.npmjs.org/@n8n/vm2/-/vm2-3.9.23.tgz",
+      "integrity": "sha512-yu+It+L89uljQsCJ2e9cQaXzoXJe9bU69QQIoWUOcUw0u5Zon37DuB7bdNNsjKS1ZdFD+fBWCQpq/FkqHsSjXQ==",
+      "peer": true,
+      "dependencies": {
+        "acorn": "^8.7.0",
+        "acorn-walk": "^8.2.0"
+      },
+      "bin": {
+        "vm2": "bin/vm2"
+      },
+      "engines": {
+        "node": ">=18.10",
+        "pnpm": ">=8.6.12"
+      }
+    },
     "node_modules/@next/env": {
       "version": "12.3.3",
       "license": "MIT"
@@ -5106,6 +5113,15 @@
       "resolved": "packages/bruno-lang",
       "link": true
     },
+    "node_modules/@usebruno/node-machine-id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@usebruno/node-machine-id/-/node-machine-id-2.0.0.tgz",
+      "integrity": "sha512-jFqK6nkoGkRhXy9QRxFeI6Yx1ZvvrnOMu4+bEOko/+XgU7kfD/eB72lJXhzKow84GXuehSOP/xojTJjZRD3r4A==",
+      "dependencies": {
+        "native-reg": "^1.1.1",
+        "node-machine-id": "^1.1.12"
+      }
+    },
     "node_modules/@usebruno/query": {
       "resolved": "packages/bruno-query",
       "link": true
@@ -6377,7 +6393,6 @@
     },
     "node_modules/browserslist": {
       "version": "4.22.3",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -7316,7 +7331,6 @@
     },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/cookie": {
@@ -8474,7 +8488,6 @@
     },
     "node_modules/electron-to-chromium": {
       "version": "1.4.667",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/electron-util": {
@@ -9478,7 +9491,6 @@
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -12944,6 +12956,15 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/native-reg": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/native-reg/-/native-reg-1.1.1.tgz",
+      "integrity": "sha512-DmqwT6XC8MLwo8HaZey3bASf0aa/gHC7FAuKMjuf7fXa7FLXwz/khXGouKcmD1rXAfJME1XveKSM4+86wLkb1w==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-gyp-build": "4"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "dev": true,
@@ -13074,6 +13095,16 @@
         }
       }
     },
+    "node_modules/node-gyp-build": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
+      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "dev": true,
@@ -13085,7 +13116,6 @@
     },
     "node_modules/node-releases": {
       "version": "2.0.14",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/node-vault": {
@@ -16086,7 +16116,6 @@
     },
     "node_modules/semver": {
       "version": "6.3.1",
-      "devOptional": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -17802,7 +17831,6 @@
     },
     "node_modules/update-browserslist-db": {
       "version": "1.0.13",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -19689,12 +19717,13 @@
     },
     "packages/bruno-electron": {
       "name": "bruno",
-      "version": "v1.18.0",
+      "version": "v1.21.0",
       "dependencies": {
         "@aws-sdk/credential-providers": "3.525.0",
         "@usebruno/common": "0.1.0",
         "@usebruno/js": "0.12.0",
         "@usebruno/lang": "0.12.0",
+        "@usebruno/node-machine-id": "^2.0.0",
         "@usebruno/schema": "0.7.0",
         "about-window": "^1.15.2",
         "aws4-axios": "^3.3.0",
@@ -20877,7 +20906,6 @@
     },
     "@ampproject/remapping": {
       "version": "2.2.1",
-      "dev": true,
       "requires": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -21158,12 +21186,10 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.23.5",
-      "dev": true
+      "version": "7.23.5"
     },
     "@babel/core": {
       "version": "7.23.9",
-      "dev": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
@@ -21206,7 +21232,6 @@
     },
     "@babel/helper-compilation-targets": {
       "version": "7.23.6",
-      "dev": true,
       "requires": {
         "@babel/compat-data": "^7.23.5",
         "@babel/helper-validator-option": "^7.23.5",
@@ -21217,14 +21242,12 @@
       "dependencies": {
         "lru-cache": {
           "version": "5.1.1",
-          "dev": true,
           "requires": {
             "yallist": "^3.0.2"
           }
         },
         "yallist": {
-          "version": "3.1.1",
-          "dev": true
+          "version": "3.1.1"
         }
       }
     },
@@ -21294,7 +21317,6 @@
     },
     "@babel/helper-module-transforms": {
       "version": "7.23.3",
-      "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
@@ -21333,7 +21355,6 @@
     },
     "@babel/helper-simple-access": {
       "version": "7.22.5",
-      "dev": true,
       "requires": {
         "@babel/types": "^7.22.5"
       }
@@ -21358,8 +21379,7 @@
       "version": "7.22.20"
     },
     "@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "dev": true
+      "version": "7.23.5"
     },
     "@babel/helper-wrap-function": {
       "version": "7.22.20",
@@ -21372,7 +21392,6 @@
     },
     "@babel/helpers": {
       "version": "7.23.9",
-      "dev": true,
       "requires": {
         "@babel/template": "^7.23.9",
         "@babel/traverse": "^7.23.9",
@@ -21450,7 +21469,8 @@
     },
     "@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.0-placeholder-for-preset-env.2",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
@@ -22463,7 +22483,8 @@
           "version": "3.0.4"
         },
         "ws": {
-          "version": "8.13.0"
+          "version": "8.13.0",
+          "requires": {}
         }
       }
     },
@@ -22491,7 +22512,8 @@
       },
       "dependencies": {
         "ws": {
-          "version": "8.13.0"
+          "version": "8.13.0",
+          "requires": {}
         }
       }
     },
@@ -22615,7 +22637,8 @@
       }
     },
     "@graphql-typed-document-node/core": {
-      "version": "3.2.0"
+      "version": "3.2.0",
+      "requires": {}
     },
     "@iarna/toml": {
       "version": "2.2.5"
@@ -23374,6 +23397,16 @@
     "@n1ru4l/push-pull-async-iterable-iterator": {
       "version": "3.2.0"
     },
+    "@n8n/vm2": {
+      "version": "3.9.23",
+      "resolved": "https://registry.npmjs.org/@n8n/vm2/-/vm2-3.9.23.tgz",
+      "integrity": "sha512-yu+It+L89uljQsCJ2e9cQaXzoXJe9bU69QQIoWUOcUw0u5Zon37DuB7bdNNsjKS1ZdFD+fBWCQpq/FkqHsSjXQ==",
+      "peer": true,
+      "requires": {
+        "acorn": "^8.7.0",
+        "acorn-walk": "^8.2.0"
+      }
+    },
     "@next/env": {
       "version": "12.3.3"
     },
@@ -23945,7 +23978,8 @@
       }
     },
     "@tabler/icons": {
-      "version": "1.119.0"
+      "version": "1.119.0",
+      "requires": {}
     },
     "@tippyjs/react": {
       "version": "4.2.6",
@@ -25210,6 +25244,15 @@
         "ohm-js": "^16.6.0"
       }
     },
+    "@usebruno/node-machine-id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@usebruno/node-machine-id/-/node-machine-id-2.0.0.tgz",
+      "integrity": "sha512-jFqK6nkoGkRhXy9QRxFeI6Yx1ZvvrnOMu4+bEOko/+XgU7kfD/eB72lJXhzKow84GXuehSOP/xojTJjZRD3r4A==",
+      "requires": {
+        "native-reg": "^1.1.1",
+        "node-machine-id": "^1.1.12"
+      }
+    },
     "@usebruno/query": {
       "version": "file:packages/bruno-query",
       "requires": {
@@ -25224,7 +25267,8 @@
       }
     },
     "@usebruno/schema": {
-      "version": "file:packages/bruno-schema"
+      "version": "file:packages/bruno-schema",
+      "requires": {}
     },
     "@usebruno/tests": {
       "version": "file:packages/bruno-tests",
@@ -25368,7 +25412,8 @@
     },
     "@webpack-cli/configtest": {
       "version": "1.2.0",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/info": {
       "version": "1.5.0",
@@ -25379,7 +25424,8 @@
     },
     "@webpack-cli/serve": {
       "version": "1.7.0",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@whatwg-node/events": {
       "version": "0.0.3"
@@ -25439,7 +25485,8 @@
     },
     "acorn-import-assertions": {
       "version": "1.9.0",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "8.3.2"
@@ -25481,7 +25528,8 @@
     },
     "ajv-keywords": {
       "version": "3.5.2",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "amdefine": {
       "version": "0.0.8"
@@ -26086,7 +26134,6 @@
     },
     "browserslist": {
       "version": "4.22.3",
-      "dev": true,
       "requires": {
         "caniuse-lite": "^1.0.30001580",
         "electron-to-chromium": "^1.4.648",
@@ -26101,6 +26148,7 @@
         "@usebruno/common": "0.1.0",
         "@usebruno/js": "0.12.0",
         "@usebruno/lang": "0.12.0",
+        "@usebruno/node-machine-id": "^2.0.0",
         "@usebruno/schema": "0.7.0",
         "about-window": "^1.15.2",
         "aws4-axios": "^3.3.0",
@@ -27196,7 +27244,8 @@
       }
     },
     "chai-string": {
-      "version": "1.5.0"
+      "version": "1.5.0",
+      "requires": {}
     },
     "chalk": {
       "version": "3.0.0",
@@ -27539,8 +27588,7 @@
       "version": "1.0.5"
     },
     "convert-source-map": {
-      "version": "2.0.0",
-      "dev": true
+      "version": "2.0.0"
     },
     "cookie": {
       "version": "0.6.0"
@@ -27658,7 +27706,8 @@
     },
     "css-declaration-sorter": {
       "version": "6.4.1",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "css-loader": {
       "version": "6.10.0",
@@ -27795,7 +27844,8 @@
     },
     "cssnano-utils": {
       "version": "3.1.0",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "csso": {
       "version": "4.2.0",
@@ -27853,7 +27903,8 @@
     },
     "dedent": {
       "version": "1.5.1",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "deep-eql": {
       "version": "4.1.3",
@@ -28286,8 +28337,7 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.667",
-      "dev": true
+      "version": "1.4.667"
     },
     "electron-util": {
       "version": "0.17.2",
@@ -28918,8 +28968,7 @@
       }
     },
     "gensync": {
-      "version": "1.0.0-beta.2",
-      "dev": true
+      "version": "1.0.0-beta.2"
     },
     "get-caller-file": {
       "version": "2.0.5"
@@ -29076,7 +29125,8 @@
       }
     },
     "goober": {
-      "version": "2.1.14"
+      "version": "2.1.14",
+      "requires": {}
     },
     "gopd": {
       "version": "1.0.1",
@@ -29244,7 +29294,8 @@
       }
     },
     "graphql-ws": {
-      "version": "5.12.1"
+      "version": "5.12.1",
+      "requires": {}
     },
     "har-schema": {
       "version": "2.0.0"
@@ -29500,7 +29551,8 @@
     },
     "icss-utils": {
       "version": "5.1.0",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "idb": {
       "version": "7.1.1"
@@ -29803,7 +29855,8 @@
       "version": "3.0.1"
     },
     "isomorphic-ws": {
-      "version": "5.0.0"
+      "version": "5.0.0",
+      "requires": {}
     },
     "isstream": {
       "version": "0.1.2"
@@ -30176,7 +30229,8 @@
     },
     "jest-pnp-resolver": {
       "version": "1.2.3",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "jest-regex-util": {
       "version": "29.6.3",
@@ -30925,7 +30979,8 @@
       "version": "1.0.1"
     },
     "merge-refs": {
-      "version": "1.2.2"
+      "version": "1.2.2",
+      "requires": {}
     },
     "merge-stream": {
       "version": "2.0.0",
@@ -30935,7 +30990,8 @@
       "version": "1.4.1"
     },
     "meros": {
-      "version": "1.3.0"
+      "version": "1.3.0",
+      "requires": {}
     },
     "methods": {
       "version": "1.1.2"
@@ -31107,6 +31163,14 @@
     "nanoid": {
       "version": "3.3.4"
     },
+    "native-reg": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/native-reg/-/native-reg-1.1.1.tgz",
+      "integrity": "sha512-DmqwT6XC8MLwo8HaZey3bASf0aa/gHC7FAuKMjuf7fXa7FLXwz/khXGouKcmD1rXAfJME1XveKSM4+86wLkb1w==",
+      "requires": {
+        "node-gyp-build": "4"
+      }
+    },
     "natural-compare": {
       "version": "1.4.0",
       "dev": true
@@ -31175,6 +31239,11 @@
         "whatwg-url": "^5.0.0"
       }
     },
+    "node-gyp-build": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
+      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw=="
+    },
     "node-int64": {
       "version": "0.4.0",
       "dev": true
@@ -31183,8 +31252,7 @@
       "version": "1.1.12"
     },
     "node-releases": {
-      "version": "2.0.14",
-      "dev": true
+      "version": "2.0.14"
     },
     "node-vault": {
       "version": "0.10.2",
@@ -31803,19 +31871,23 @@
     },
     "postcss-discard-comments": {
       "version": "5.1.2",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-discard-duplicates": {
       "version": "5.1.0",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-discard-empty": {
       "version": "5.1.1",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-discard-overridden": {
       "version": "5.1.0",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-import": {
       "version": "15.1.0",
@@ -31909,7 +31981,8 @@
     },
     "postcss-modules-extract-imports": {
       "version": "3.0.0",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.4",
@@ -31945,7 +32018,8 @@
     },
     "postcss-normalize-charset": {
       "version": "5.1.0",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-normalize-display-values": {
       "version": "5.1.0",
@@ -32384,7 +32458,8 @@
       }
     },
     "react-inspector": {
-      "version": "6.0.2"
+      "version": "6.0.2",
+      "requires": {}
     },
     "react-is": {
       "version": "16.13.1"
@@ -32534,7 +32609,8 @@
       }
     },
     "redux-thunk": {
-      "version": "2.4.2"
+      "version": "2.4.2",
+      "requires": {}
     },
     "regenerate": {
       "version": "1.4.2",
@@ -32853,7 +32929,8 @@
     },
     "rollup-plugin-peer-deps-external": {
       "version": "2.2.4",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "rollup-plugin-postcss": {
       "version": "4.0.2",
@@ -32995,8 +33072,7 @@
       }
     },
     "semver": {
-      "version": "6.3.1",
-      "devOptional": true
+      "version": "6.3.1"
     },
     "semver-compare": {
       "version": "1.0.0",
@@ -33413,7 +33489,8 @@
     },
     "style-loader": {
       "version": "3.3.4",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "style-mod": {
       "version": "4.1.0"
@@ -33445,7 +33522,8 @@
       }
     },
     "styled-jsx": {
-      "version": "5.0.7"
+      "version": "5.0.7",
+      "requires": {}
     },
     "stylehacks": {
       "version": "5.1.1",
@@ -34063,7 +34141,6 @@
     },
     "update-browserslist-db": {
       "version": "1.0.13",
-      "dev": true,
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -34153,7 +34230,8 @@
       "version": "8.0.2"
     },
     "use-sync-external-store": {
-      "version": "1.2.0"
+      "version": "1.2.0",
+      "requires": {}
     },
     "utf8-byte-length": {
       "version": "1.0.4",
@@ -34431,7 +34509,8 @@
       }
     },
     "ws": {
-      "version": "8.16.0"
+      "version": "8.16.0",
+      "requires": {}
     },
     "xdg-basedir": {
       "version": "4.0.0",
diff --git a/packages/bruno-electron/package.json b/packages/bruno-electron/package.json
index 5c5171d42..83b98f574 100644
--- a/packages/bruno-electron/package.json
+++ b/packages/bruno-electron/package.json
@@ -23,6 +23,7 @@
     "@usebruno/common": "0.1.0",
     "@usebruno/js": "0.12.0",
     "@usebruno/lang": "0.12.0",
+    "@usebruno/node-machine-id": "^2.0.0",
     "@usebruno/schema": "0.7.0",
     "about-window": "^1.15.2",
     "aws4-axios": "^3.3.0",
@@ -49,7 +50,6 @@
     "mime-types": "^2.1.35",
     "mustache": "^4.2.0",
     "nanoid": "3.3.4",
-    "node-machine-id": "^1.1.12",
     "qs": "^6.11.0",
     "socks-proxy-agent": "^8.0.2",
     "tough-cookie": "^4.1.3",
diff --git a/packages/bruno-electron/src/utils/encryption.js b/packages/bruno-electron/src/utils/encryption.js
index b73e437e6..cbdd1eeef 100644
--- a/packages/bruno-electron/src/utils/encryption.js
+++ b/packages/bruno-electron/src/utils/encryption.js
@@ -1,5 +1,5 @@
 const crypto = require('crypto');
-const { machineIdSync } = require('node-machine-id');
+const { machineIdSync } = require('@usebruno/node-machine-id');
 const { safeStorage } = require('electron');
 
 // Constants for algorithm identification