diff --git a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
index d9b02abbef..efe12950d0 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
@@ -11,6 +11,13 @@
         "browserify>string_decoder": true
       }
     },
+    "@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -100,16 +107,16 @@
         "web3": true
       },
       "packages": {
+        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>detect-browser": true,
         "@metamask/providers>extension-port-stream": true,
         "@metamask/providers>is-stream": true,
         "@metamask/providers>json-rpc-middleware-stream": true,
-        "@metamask/providers>pump": true,
-        "eslint>fast-deep-equal": true,
-        "eth-rpc-errors": true,
-        "json-rpc-engine": true
+        "@metamask/rpc-errors": true,
+        "browserify>stream-browserify": true,
+        "eslint>fast-deep-equal": true
       }
     },
     "@metamask/providers>@metamask/safe-event-emitter": {
@@ -141,8 +148,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/providers>json-rpc-middleware-stream>readable-stream": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/providers>json-rpc-middleware-stream>readable-stream": true
       }
     },
     "@metamask/providers>json-rpc-middleware-stream>readable-stream": {
@@ -170,12 +177,10 @@
         "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
       }
     },
-    "@metamask/providers>pump": {
+    "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/object-multiplex>end-of-stream": true,
-        "@metamask/object-multiplex>once": true,
-        "browserify>browser-resolve": true,
-        "browserify>process": true
+        "@metamask/rpc-errors>fast-safe-stringify": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -289,11 +294,6 @@
         "eslint>debug>ms": true
       }
     },
-    "eth-rpc-errors": {
-      "packages": {
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/utils": true
@@ -338,20 +338,6 @@
         "superstruct": true
       }
     },
-    "json-rpc-engine": {
-      "packages": {
-        "eth-rpc-errors": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "json-rpc-engine>@metamask/safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>events": true
-      }
-    },
     "superstruct": {
       "globals": {
         "console.warn": true,
diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
index 009e55468c..e94fb225fa 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
@@ -23,6 +23,13 @@
         "util": true
       }
     },
+    "@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -126,6 +133,9 @@
       }
     },
     "@metamask/providers": {
+      "builtin": {
+        "stream.pipeline": true
+      },
       "globals": {
         "Event": true,
         "addEventListener": true,
@@ -140,16 +150,16 @@
         "web3": true
       },
       "packages": {
+        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>detect-browser": true,
         "@metamask/providers>extension-port-stream": true,
         "@metamask/providers>is-stream": true,
         "@metamask/providers>json-rpc-middleware-stream": true,
-        "@metamask/providers>pump": true,
+        "@metamask/rpc-errors": true,
         "eslint>fast-deep-equal": true,
-        "eth-rpc-errors": true,
-        "json-rpc-engine": true
+        "stream": true
       }
     },
     "@metamask/providers>@metamask/safe-event-emitter": {
@@ -186,8 +196,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/providers>json-rpc-middleware-stream>readable-stream": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/providers>json-rpc-middleware-stream>readable-stream": true
       }
     },
     "@metamask/providers>json-rpc-middleware-stream>readable-stream": {
@@ -231,17 +241,10 @@
         "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
       }
     },
-    "@metamask/providers>pump": {
-      "builtin": {
-        "fs": true
-      },
-      "globals": {
-        "process.version": true
-      },
+    "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/object-multiplex>end-of-stream": true,
-        "@metamask/object-multiplex>once": true,
-        "fs": true
+        "@metamask/rpc-errors>fast-safe-stringify": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -355,11 +358,6 @@
         "util": true
       }
     },
-    "eth-rpc-errors": {
-      "packages": {
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/utils": true
@@ -409,23 +407,6 @@
         "process.argv": true
       }
     },
-    "json-rpc-engine": {
-      "packages": {
-        "eth-rpc-errors": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "json-rpc-engine>@metamask/safe-event-emitter": {
-      "builtin": {
-        "events.EventEmitter": true
-      },
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "events": true
-      }
-    },
     "superstruct": {
       "globals": {
         "console.warn": true,
diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
index 009e55468c..e94fb225fa 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
@@ -23,6 +23,13 @@
         "util": true
       }
     },
+    "@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -126,6 +133,9 @@
       }
     },
     "@metamask/providers": {
+      "builtin": {
+        "stream.pipeline": true
+      },
       "globals": {
         "Event": true,
         "addEventListener": true,
@@ -140,16 +150,16 @@
         "web3": true
       },
       "packages": {
+        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>detect-browser": true,
         "@metamask/providers>extension-port-stream": true,
         "@metamask/providers>is-stream": true,
         "@metamask/providers>json-rpc-middleware-stream": true,
-        "@metamask/providers>pump": true,
+        "@metamask/rpc-errors": true,
         "eslint>fast-deep-equal": true,
-        "eth-rpc-errors": true,
-        "json-rpc-engine": true
+        "stream": true
       }
     },
     "@metamask/providers>@metamask/safe-event-emitter": {
@@ -186,8 +196,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/providers>json-rpc-middleware-stream>readable-stream": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/providers>json-rpc-middleware-stream>readable-stream": true
       }
     },
     "@metamask/providers>json-rpc-middleware-stream>readable-stream": {
@@ -231,17 +241,10 @@
         "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
       }
     },
-    "@metamask/providers>pump": {
-      "builtin": {
-        "fs": true
-      },
-      "globals": {
-        "process.version": true
-      },
+    "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/object-multiplex>end-of-stream": true,
-        "@metamask/object-multiplex>once": true,
-        "fs": true
+        "@metamask/rpc-errors>fast-safe-stringify": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -355,11 +358,6 @@
         "util": true
       }
     },
-    "eth-rpc-errors": {
-      "packages": {
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/utils": true
@@ -409,23 +407,6 @@
         "process.argv": true
       }
     },
-    "json-rpc-engine": {
-      "packages": {
-        "eth-rpc-errors": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "json-rpc-engine>@metamask/safe-event-emitter": {
-      "builtin": {
-        "events.EventEmitter": true
-      },
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "events": true
-      }
-    },
     "superstruct": {
       "globals": {
         "console.warn": true,
diff --git a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
index d9b02abbef..efe12950d0 100644
--- a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
@@ -11,6 +11,13 @@
         "browserify>string_decoder": true
       }
     },
+    "@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -100,16 +107,16 @@
         "web3": true
       },
       "packages": {
+        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>detect-browser": true,
         "@metamask/providers>extension-port-stream": true,
         "@metamask/providers>is-stream": true,
         "@metamask/providers>json-rpc-middleware-stream": true,
-        "@metamask/providers>pump": true,
-        "eslint>fast-deep-equal": true,
-        "eth-rpc-errors": true,
-        "json-rpc-engine": true
+        "@metamask/rpc-errors": true,
+        "browserify>stream-browserify": true,
+        "eslint>fast-deep-equal": true
       }
     },
     "@metamask/providers>@metamask/safe-event-emitter": {
@@ -141,8 +148,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/providers>json-rpc-middleware-stream>readable-stream": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
+        "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/providers>json-rpc-middleware-stream>readable-stream": true
       }
     },
     "@metamask/providers>json-rpc-middleware-stream>readable-stream": {
@@ -170,12 +177,10 @@
         "@metamask/providers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
       }
     },
-    "@metamask/providers>pump": {
+    "@metamask/rpc-errors": {
       "packages": {
-        "@metamask/object-multiplex>end-of-stream": true,
-        "@metamask/object-multiplex>once": true,
-        "browserify>browser-resolve": true,
-        "browserify>process": true
+        "@metamask/rpc-errors>fast-safe-stringify": true,
+        "@metamask/utils": true
       }
     },
     "@metamask/utils": {
@@ -289,11 +294,6 @@
         "eslint>debug>ms": true
       }
     },
-    "eth-rpc-errors": {
-      "packages": {
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/utils": true
@@ -338,20 +338,6 @@
         "superstruct": true
       }
     },
-    "json-rpc-engine": {
-      "packages": {
-        "eth-rpc-errors": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "json-rpc-engine>@metamask/safe-event-emitter": {
-      "globals": {
-        "setTimeout": true
-      },
-      "packages": {
-        "browserify>events": true
-      }
-    },
     "superstruct": {
       "globals": {
         "console.warn": true,
diff --git a/packages/snaps-execution-environments/lavamoat/build-system/policy.json b/packages/snaps-execution-environments/lavamoat/build-system/policy.json
index ce4cbf2cc7..d23c4a3beb 100644
--- a/packages/snaps-execution-environments/lavamoat/build-system/policy.json
+++ b/packages/snaps-execution-environments/lavamoat/build-system/policy.json
@@ -1720,7 +1720,7 @@
         "Buffer.isBuffer": true
       },
       "packages": {
-        "eth-rpc-errors>fast-safe-stringify": true
+        "@metamask/rpc-errors>fast-safe-stringify": true
       }
     },
     "browserify>string_decoder": {