diff --git a/packages/snaps-execution-environments/lavamoat/build-system/policy.json b/packages/snaps-execution-environments/lavamoat/build-system/policy.json
index 335b7d6492..2f894eb768 100644
--- a/packages/snaps-execution-environments/lavamoat/build-system/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/build-system/policy.json
@@ -102,7 +102,7 @@
         "vitest>magic-string>@jridgewell/sourcemap-codec": true
       }
     },
-    "lavamoat>@lavamoat/aa": {
+    "@lavamoat/webpack>@lavamoat/aa": {
       "builtin": {
         "node:fs.lstatSync": true,
         "node:fs.readFileSync": true,
@@ -114,7 +114,7 @@
         "node:path.sep": true
       },
       "packages": {
-        "lavamoat>@lavamoat/aa>resolve": true
+        "depcheck>resolve": true
       }
     },
     "@lavamoat/webpack": {
@@ -133,9 +133,9 @@
       },
       "packages": {
         "depcheck>@babel/parser": true,
-        "lavamoat>@lavamoat/aa": true,
+        "@lavamoat/webpack>@lavamoat/aa": true,
         "@lavamoat/webpack>browser-resolve": true,
-        "lavamoat>lavamoat-core": true,
+        "@lavamoat/webpack>lavamoat-core": true,
         "webpack": true
       }
     },
@@ -740,7 +740,7 @@
         "lavamoat>lavamoat-core>merge-deep>kind-of>is-buffer": true
       }
     },
-    "lavamoat>lavamoat-core": {
+    "@lavamoat/webpack>lavamoat-core": {
       "builtin": {
         "node:events": true,
         "node:fs.readFileSync": true,
@@ -755,16 +755,16 @@
       },
       "packages": {
         "@lavamoat/webpack>json-stable-stringify": true,
-        "lavamoat>lavamoat-tofu": true,
+        "@lavamoat/webpack>lavamoat-core>lavamoat-tofu": true,
         "lavamoat>lavamoat-core>merge-deep": true
       }
     },
-    "lavamoat>lavamoat-tofu": {
+    "@lavamoat/webpack>lavamoat-core>lavamoat-tofu": {
       "globals": {
         "console.log": true
       },
       "packages": {
-        "lavamoat>lavamoat-tofu>@babel/parser": true,
+        "@lavamoat/webpack>lavamoat-core>lavamoat-tofu>@babel/parser": true,
         "depcheck>@babel/traverse": true
       }
     },
@@ -910,36 +910,6 @@
         "jest>@jest/core>strip-ansi": true
       }
     },
-    "lavamoat>@lavamoat/aa>resolve": {
-      "builtin": {
-        "fs.readFileSync": true,
-        "fs.realpathSync": true,
-        "fs.statSync": true,
-        "os.homedir": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.parse": true,
-        "path.relative": true,
-        "path.resolve": true
-      },
-      "globals": {
-        "process.env.HOME": true,
-        "process.env.HOMEDRIVE": true,
-        "process.env.HOMEPATH": true,
-        "process.env.LNAME": true,
-        "process.env.LOGNAME": true,
-        "process.env.USER": true,
-        "process.env.USERNAME": true,
-        "process.env.USERPROFILE": true,
-        "process.getuid": true,
-        "process.platform": true,
-        "process.versions.pnp": true
-      },
-      "packages": {
-        "depcheck>is-core-module": true,
-        "depcheck>resolve>path-parse": true
-      }
-    },
     "depcheck>resolve": {
       "builtin": {
         "fs.readFile": true,
diff --git a/packages/snaps-execution-environments/package.json b/packages/snaps-execution-environments/package.json
index 6375ed5b09..220dfd9b2f 100644
--- a/packages/snaps-execution-environments/package.json
+++ b/packages/snaps-execution-environments/package.json
@@ -82,7 +82,7 @@
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "@lavamoat/allow-scripts": "^4.0.0",
     "@lavamoat/lavatube": "^1.0.0",
-    "@lavamoat/webpack": "^1.5.8",
+    "@lavamoat/webpack": "^2.0.0",
     "@metamask/auto-changelog": "^5.3.2",
     "@swc/core": "1.11.31",
     "@swc/jest": "^0.2.38",
diff --git a/yarn.lock b/yarn.lock
index dcb3f2d05f..7f505a949c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2803,20 +2803,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lavamoat/webpack@npm:^1.5.8":
-  version: 1.5.8
-  resolution: "@lavamoat/webpack@npm:1.5.8"
+"@lavamoat/types@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@lavamoat/types@npm:1.0.0"
+  dependencies:
+    "@babel/types": "npm:7.27.3"
+  checksum: 10/43b293409870176ed82161b11c606228acb8933c922f1798d20c6397ce3989368570aa6e00e465c906c8fb9e80701014a62f9449fcfc470f3200bf9b82bc5d4e
+  languageName: node
+  linkType: hard
+
+"@lavamoat/webpack@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@lavamoat/webpack@npm:2.0.0"
   dependencies:
     "@babel/parser": "npm:7.28.3"
-    "@lavamoat/aa": "npm:^4.3.6"
-    "@lavamoat/types": "npm:^0.1.0"
+    "@lavamoat/aa": "npm:^5.0.0"
+    "@lavamoat/types": "npm:^1.0.0"
     browser-resolve: "npm:2.0.0"
     json-stable-stringify: "npm:1.3.0"
-    lavamoat-core: "npm:^17.1.3"
-    ses: "npm:1.14.0"
+    lavamoat-core: "npm:^18.0.0"
+    ses: "npm:1.15.0"
   peerDependencies:
     webpack: ^5.80.2
-  checksum: 10/c19a6b8a0a5fb15bec74880c108ce6962d5d2615c6549ea28709a41069c6ab6073ef7bf6dd7fdbd103e931a4c215e6dffa84f080c8f521a1ffba4ddcb4474e67
+  checksum: 10/551be412b0de2df78d3c1095fd8ef643ab7111f7bc44bb53de673f923e17940d8cc0a4e5ce6ebea1dd16b5722db34d7c487416d7fd3351a65c22b92cbd9e48e8
   languageName: node
   linkType: hard
 
@@ -4305,7 +4314,7 @@ __metadata:
     "@esbuild-plugins/node-modules-polyfill": "npm:^0.2.2"
     "@lavamoat/allow-scripts": "npm:^4.0.0"
     "@lavamoat/lavatube": "npm:^1.0.0"
-    "@lavamoat/webpack": "npm:^1.5.8"
+    "@lavamoat/webpack": "npm:^2.0.0"
     "@metamask/auto-changelog": "npm:^5.3.2"
     "@metamask/json-rpc-engine": "npm:^10.2.3"
     "@metamask/object-multiplex": "npm:^2.1.0"
@@ -13836,6 +13845,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lavamoat-core@npm:^18.0.0":
+  version: 18.0.0
+  resolution: "lavamoat-core@npm:18.0.0"
+  dependencies:
+    "@babel/types": "npm:7.27.3"
+    "@lavamoat/types": "npm:^1.0.0"
+    json-stable-stringify: "npm:1.3.0"
+    lavamoat-tofu: "npm:^9.0.0"
+    merge-deep: "npm:3.0.3"
+    ses: "npm:1.15.0"
+  bin:
+    lavamoat-sort-policy: src/policy-sort-cli.js
+  checksum: 10/428f83e985d39e4dc6f08de46e19f1ec4f98430f77551fc468a7e0cb15e2b4e9544401656cd26056e8af66684fcef52b6d7f00e665b146b8ca74a2869491a6eb
+  languageName: node
+  linkType: hard
+
 "lavamoat-tofu@npm:^8.1.1":
   version: 8.1.1
   resolution: "lavamoat-tofu@npm:8.1.1"
@@ -13852,6 +13877,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lavamoat-tofu@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "lavamoat-tofu@npm:9.0.0"
+  dependencies:
+    "@babel/parser": "npm:7.27.3"
+    "@babel/traverse": "npm:7.27.3"
+    "@babel/types": "npm:7.27.3"
+    "@lavamoat/types": "npm:^1.0.0"
+    "@types/babel__traverse": "npm:7.28.0"
+    type-fest: "npm:4.41.0"
+  peerDependencies:
+    lavamoat-core: ">15.4.0"
+  checksum: 10/8359abd166f358fae93152cb00bdadffd608564ca7c9034c8bef737abc2c63327323ff78ae70942f836ede44aba324c90134538f61f5c9c96ce9e914787c4ee2
+  languageName: node
+  linkType: hard
+
 "lavamoat@npm:^10.1.1":
   version: 10.1.1
   resolution: "lavamoat@npm:10.1.1"
@@ -16849,7 +16890,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ses@npm:^1.15.0":
+"ses@npm:1.15.0, ses@npm:^1.15.0":
   version: 1.15.0
   resolution: "ses@npm:1.15.0"
   dependencies: