diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 47227aeef932..cd08c24e0dae 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1086,9 +1086,10 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-api": true,
         "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client": true,
         "@metamask/utils>@metamask/superstruct": true,
         "webpack>events": true
       }
@@ -1104,6 +1105,17 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/eth-snap-keyring>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "@metamask/eth-snap-keyring>uuid": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
     "@metamask/eth-snap-keyring>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -1469,13 +1481,18 @@
       }
     },
     "@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
         "URL": true
       },
       "packages": {
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -1494,11 +1511,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api>uuid": {
-      "globals": {
-        "crypto": true
-      }
-    },
     "@metamask/keyring-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
@@ -1629,6 +1641,85 @@
         "ethereumjs-util>rlp": true
       }
     },
+    "@metamask/keyring-internal-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-internal-api>@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-internal-api>@metamask/utils": true,
+        "@metamask/keyring-internal-api>@metamask/utils>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/utils>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "@metamask/keyring-snap-client": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/logging-controller": {
       "packages": {
         "@metamask/base-controller": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 47227aeef932..cd08c24e0dae 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1086,9 +1086,10 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-api": true,
         "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client": true,
         "@metamask/utils>@metamask/superstruct": true,
         "webpack>events": true
       }
@@ -1104,6 +1105,17 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/eth-snap-keyring>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "@metamask/eth-snap-keyring>uuid": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
     "@metamask/eth-snap-keyring>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -1469,13 +1481,18 @@
       }
     },
     "@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
         "URL": true
       },
       "packages": {
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -1494,11 +1511,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api>uuid": {
-      "globals": {
-        "crypto": true
-      }
-    },
     "@metamask/keyring-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
@@ -1629,6 +1641,85 @@
         "ethereumjs-util>rlp": true
       }
     },
+    "@metamask/keyring-internal-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-internal-api>@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-internal-api>@metamask/utils": true,
+        "@metamask/keyring-internal-api>@metamask/utils>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/utils>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "@metamask/keyring-snap-client": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/logging-controller": {
       "packages": {
         "@metamask/base-controller": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 47227aeef932..cd08c24e0dae 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1086,9 +1086,10 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-api": true,
         "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client": true,
         "@metamask/utils>@metamask/superstruct": true,
         "webpack>events": true
       }
@@ -1104,6 +1105,17 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/eth-snap-keyring>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "@metamask/eth-snap-keyring>uuid": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
     "@metamask/eth-snap-keyring>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -1469,13 +1481,18 @@
       }
     },
     "@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
         "URL": true
       },
       "packages": {
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -1494,11 +1511,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api>uuid": {
-      "globals": {
-        "crypto": true
-      }
-    },
     "@metamask/keyring-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
@@ -1629,6 +1641,85 @@
         "ethereumjs-util>rlp": true
       }
     },
+    "@metamask/keyring-internal-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-internal-api>@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-internal-api>@metamask/utils": true,
+        "@metamask/keyring-internal-api>@metamask/utils>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/utils>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "@metamask/keyring-snap-client": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/logging-controller": {
       "packages": {
         "@metamask/base-controller": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 89eedc822794..acab8dfffe47 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -1178,9 +1178,10 @@
       "packages": {
         "@ethereumjs/tx": true,
         "@metamask/eth-snap-keyring>@metamask/eth-sig-util": true,
+        "@metamask/eth-snap-keyring>@metamask/keyring-api": true,
         "@metamask/eth-snap-keyring>@metamask/utils": true,
         "@metamask/eth-snap-keyring>uuid": true,
-        "@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client": true,
         "@metamask/utils>@metamask/superstruct": true,
         "webpack>events": true
       }
@@ -1196,6 +1197,17 @@
         "browserify>buffer": true
       }
     },
+    "@metamask/eth-snap-keyring>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/eth-snap-keyring>@metamask/utils": true,
+        "@metamask/eth-snap-keyring>uuid": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
     "@metamask/eth-snap-keyring>@metamask/utils": {
       "globals": {
         "TextDecoder": true,
@@ -1561,13 +1573,18 @@
       }
     },
     "@metamask/keyring-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-api>@metamask/keyring-utils": {
       "globals": {
         "URL": true
       },
       "packages": {
-        "@metamask/keyring-api>@metamask/utils": true,
-        "@metamask/keyring-api>bech32": true,
-        "@metamask/keyring-api>uuid": true,
         "@metamask/utils>@metamask/superstruct": true
       }
     },
@@ -1586,11 +1603,6 @@
         "semver": true
       }
     },
-    "@metamask/keyring-api>uuid": {
-      "globals": {
-        "crypto": true
-      }
-    },
     "@metamask/keyring-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
@@ -1721,6 +1733,85 @@
         "ethereumjs-util>rlp": true
       }
     },
+    "@metamask/keyring-internal-api": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-internal-api>@metamask/keyring-api": true,
+        "@metamask/keyring-internal-api>@metamask/utils": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-internal-api>@metamask/utils": true,
+        "@metamask/keyring-internal-api>@metamask/utils>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-internal-api>@metamask/utils>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
+    "@metamask/keyring-snap-client": {
+      "packages": {
+        "@metamask/keyring-api>@metamask/keyring-utils": true,
+        "@metamask/keyring-internal-api": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api": {
+      "globals": {
+        "URL": true
+      },
+      "packages": {
+        "@metamask/keyring-api>bech32": true,
+        "@metamask/keyring-snap-client>@metamask/keyring-api>@metamask/utils": true,
+        "@metamask/keyring-snap-client>uuid": true,
+        "@metamask/utils>@metamask/superstruct": true
+      }
+    },
+    "@metamask/keyring-snap-client>@metamask/keyring-api>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "@metamask/utils>@metamask/superstruct": true,
+        "@metamask/utils>@scure/base": true,
+        "@metamask/utils>pony-cause": true,
+        "@noble/hashes": true,
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true
+      }
+    },
+    "@metamask/keyring-snap-client>uuid": {
+      "globals": {
+        "crypto": true
+      }
+    },
     "@metamask/logging-controller": {
       "packages": {
         "@metamask/base-controller": true,