diff --git a/README.md b/README.md
index c66c0afce8a..cf0a319af6c 100644
--- a/README.md
+++ b/README.md
@@ -201,6 +201,7 @@ linkStyle default opacity:0.5
   assets_controller --> account_tree_controller;
   assets_controller --> assets_controllers;
   assets_controller --> base_controller;
+  assets_controller --> client_controller;
   assets_controller --> controller_utils;
   assets_controller --> core_backend;
   assets_controller --> keyring_controller;
@@ -216,6 +217,7 @@ linkStyle default opacity:0.5
   assets_controllers --> approval_controller;
   assets_controllers --> base_controller;
   assets_controllers --> controller_utils;
+  assets_controllers --> core_backend;
   assets_controllers --> keyring_controller;
   assets_controllers --> messenger;
   assets_controllers --> multichain_account_service;
@@ -239,6 +241,7 @@ linkStyle default opacity:0.5
   bridge_controller --> multichain_network_controller;
   bridge_controller --> network_controller;
   bridge_controller --> polling_controller;
+  bridge_controller --> profile_sync_controller;
   bridge_controller --> remote_feature_flag_controller;
   bridge_controller --> transaction_controller;
   bridge_controller --> eth_json_rpc_provider;
@@ -249,6 +252,7 @@ linkStyle default opacity:0.5
   bridge_status_controller --> gas_fee_controller;
   bridge_status_controller --> network_controller;
   bridge_status_controller --> polling_controller;
+  bridge_status_controller --> profile_sync_controller;
   bridge_status_controller --> transaction_controller;
   chain_agnostic_permission --> controller_utils;
   chain_agnostic_permission --> permission_controller;
@@ -442,6 +446,7 @@ linkStyle default opacity:0.5
   transaction_controller --> approval_controller;
   transaction_controller --> base_controller;
   transaction_controller --> controller_utils;
+  transaction_controller --> core_backend;
   transaction_controller --> gas_fee_controller;
   transaction_controller --> messenger;
   transaction_controller --> network_controller;
diff --git a/scripts/prepare-preview-builds.sh b/scripts/prepare-preview-builds.sh
index 886fabafece..212283b58d0 100755
--- a/scripts/prepare-preview-builds.sh
+++ b/scripts/prepare-preview-builds.sh
@@ -29,6 +29,19 @@ prepare-preview-manifest() {
   mv temp.json "$manifest_file"
 }
 
+# Add resolutions to the root manifest so that @metamask/* imports continue
+# to resolve from the local workspace after packages are renamed to the
+# preview scope. Without this, yarn resolves @metamask/* from the npm
+# registry, which causes build failures when workspace packages contain
+# type changes not yet published.
+echo "Adding workspace resolutions to root manifest..."
+resolutions="{}"
+while IFS=$'\t' read -r location name; do
+  resolutions=$(echo "$resolutions" | jq --arg orig "$name" --arg loc "$location" '. + {($orig): ("portal:./" + $loc)}')
+done < <(yarn workspaces list --no-private --json | jq --slurp --raw-output 'map(select(.location != ".")) | map([.location, .name]) | map(@tsv) | .[]')
+jq --argjson resolutions "$resolutions" '.resolutions = ((.resolutions // {}) + $resolutions)' package.json > temp.json
+mv temp.json package.json
+
 echo "Preparing manifests..."
 while IFS=$'\t' read -r location name; do
   echo "- $name"