diff --git a/Cargo.lock b/Cargo.lock
index 503e7a6..f7fe07e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -519,8 +519,7 @@ dependencies = [
 [[package]]
 name = "bp-wallet"
 version = "0.11.0-beta.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08b287e3c8fc890c9b9d8b41e822314d6209b96fcb319ee951b1fb66db7f1a3d"
+source = "git+https://github.com/BP-WG/bp-wallet?branch=runtime#9f319d0684a7e2b54c4c7cf6a0143007dae8ec55"
 dependencies = [
  "amplify",
  "base64 0.21.7",
diff --git a/Cargo.toml b/Cargo.toml
index 35909d7..1d117f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -91,3 +91,6 @@ serde = ["serde_crate", "serde_yaml", "bp-std/serde", "descriptors/serde", "rgb-
 
 [package.metadata.docs.rs]
 features = ["all"]
+
+[patch.crates-io]
+bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "runtime" }
diff --git a/cli/src/args.rs b/cli/src/args.rs
index 63124b6..246528d 100644
--- a/cli/src/args.rs
+++ b/cli/src/args.rs
@@ -121,7 +121,7 @@ impl RgbArgs {
         stock: Stock,
     ) -> Result<StoredWallet<Wallet<XpubDerivable, RgbDescr>>, WalletError> {
         let stock_path = self.general.base_dir();
-        let wallet = self.inner.bp_runtime::<RgbDescr>(config)?;
+        let wallet = self.inner.bp_wallet::<RgbDescr>(config)?;
         let wallet_path = wallet.path().clone();
         let wallet = StoredWallet::attach(stock_path, wallet_path, stock, wallet.detach());
 
diff --git a/src/errors.rs b/src/errors.rs
index 0632e29..3411bab 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -85,7 +85,7 @@ pub enum WalletError {
     #[cfg(feature = "fs")]
     #[from]
     #[from(bpwallet::LoadError)]
-    Bp(bpwallet::RuntimeError),
+    Bp(bpwallet::WalletError),
 
     /// resolver error: {0}
     #[display(doc_comments)]