diff --git a/Cargo.lock b/Cargo.lock
index f78197cf6..a5660dd8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3584,9 +3584,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-builtin-sdk-macros"
-version = "20.2.1"
+version = "20.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "319fbfbf8a7fcaf9c69425d79d59819eedded4b3e56633fee10a4de1af833d51"
+checksum = "7cc32c6e817f3ca269764ec0d7d14da6210b74a5bf14d4e745aa3ee860558900"
 dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
@@ -3641,14 +3641,14 @@ dependencies = [
  "shlex",
  "soroban-env-host",
  "soroban-ledger-snapshot",
- "soroban-rpc",
  "soroban-sdk",
  "soroban-spec",
  "soroban-spec-json",
  "soroban-spec-rust",
- "soroban-spec-tools 20.3.1",
+ "soroban-spec-tools",
  "soroban-spec-typescript",
- "stellar-strkey 0.0.7",
+ "stellar-rpc-client",
+ "stellar-strkey 0.0.8",
  "stellar-xdr",
  "strsim 0.10.0",
  "strum 0.17.1",
@@ -3671,9 +3671,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-common"
-version = "20.2.1"
+version = "20.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d609330abbcc2d7fe185304de0c10ef1a95e64eb8effb6ee4faeea97668e0a"
+checksum = "c14e18d879c520ff82612eaae0590acaf6a7f3b977407e1abb1c9e31f94c7814"
 dependencies = [
  "arbitrary",
  "crate-git-revision 0.0.6",
@@ -3689,9 +3689,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-guest"
-version = "20.2.1"
+version = "20.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280d73550935d482534abf3f897e89b40461b3401c3209163b3d0038f0b8b201"
+checksum = "5122ca2abd5ebcc1e876a96b9b44f87ce0a0e06df8f7c09772ddb58b159b7454"
 dependencies = [
  "soroban-env-common",
  "static_assertions",
@@ -3699,9 +3699,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-host"
-version = "20.2.1"
+version = "20.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd99f4e075f62e0faec118c568fbc70373793fb921148115d5f3f2563945c02d"
+checksum = "114a0fa0d0cc39d0be16b1ee35b6e5f4ee0592ddcf459bde69391c02b03cf520"
 dependencies = [
  "backtrace",
  "curve25519-dalek 4.1.1",
@@ -3726,9 +3726,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-env-macros"
-version = "20.2.1"
+version = "20.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c277d3828c200fef887ecd16bd24b2f16b7fc87207a23a94571ab909f2113d8"
+checksum = "b13e3f8c86f812e0669e78fcb3eae40c385c6a9dd1a4886a1de733230b4fcf27"
 dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
@@ -3745,9 +3745,9 @@ version = "20.3.1"
 
 [[package]]
 name = "soroban-ledger-snapshot"
-version = "20.3.1"
+version = "20.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9cfeb46db19d0fb2e2c97d4e8aa102d660e0c80dc5412409a22dfd14241ca7"
+checksum = "61a54708f44890e0546180db6b4f530e2a88d83b05a9b38a131caa21d005e25a"
 dependencies = [
  "serde",
  "serde_json",
@@ -3757,44 +3757,11 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "soroban-rpc"
-version = "20.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06a502143406eb8ca6d9e98b6ea50928a5eb47a216a94769bfa13d19c03d41c4"
-dependencies = [
- "base64 0.21.7",
- "clap",
- "ed25519-dalek 2.0.0",
- "ethnum",
- "hex",
- "http 1.0.0",
- "itertools 0.10.5",
- "jsonrpsee-core",
- "jsonrpsee-http-client",
- "serde",
- "serde-aux",
- "serde_json",
- "sha2 0.10.8",
- "soroban-env-host",
- "soroban-sdk",
- "soroban-spec",
- "soroban-spec-tools 20.3.3",
- "stellar-strkey 0.0.7",
- "stellar-xdr",
- "termcolor",
- "termcolor_output",
- "thiserror",
- "tokio",
- "tracing",
- "wasmparser 0.90.0",
-]
-
 [[package]]
 name = "soroban-sdk"
-version = "20.3.1"
+version = "20.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "842c20c8503b137f8a8a5981009eb1f5841b96516f1485d7e1bf9c02afb227d1"
+checksum = "84fc8be9068dd4e0212d8b13ad61089ea87e69ac212c262914503a961c8dc3a3"
 dependencies = [
  "arbitrary",
  "bytes-lit",
@@ -3812,9 +3779,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-sdk-macros"
-version = "20.3.1"
+version = "20.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0afc8337fadde3047fb774fa2abc3877a4a260b8e531868b65d5a1debc60b3b9"
+checksum = "db20def4ead836663633f58d817d0ed8e1af052c9650a04adf730525af85b964"
 dependencies = [
  "crate-git-revision 0.0.6",
  "darling",
@@ -3832,9 +3799,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec"
-version = "20.3.1"
+version = "20.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01f31b81de71543d314ef9252e11f2194606d6a4c8c350fbc701eeaa45a8e2d9"
+checksum = "3eefeb5d373b43f6828145d00f0c5cc35e96db56a6671ae9614f84beb2711cab"
 dependencies = [
  "base64 0.13.1",
  "stellar-xdr",
@@ -3858,9 +3825,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-spec-rust"
-version = "20.3.1"
+version = "20.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1468c9f0025166fc5e8853ba47cbd97d93c877757a5a600fcf71529e5b3b398c"
+checksum = "3152bca4737ef734ac37fe47b225ee58765c9095970c481a18516a2b287c7a33"
 dependencies = [
  "prettyplease",
  "proc-macro2",
@@ -3883,7 +3850,7 @@ dependencies = [
  "serde_json",
  "soroban-env-host",
  "soroban-spec",
- "stellar-strkey 0.0.7",
+ "stellar-strkey 0.0.8",
  "stellar-xdr",
  "thiserror",
  "tokio",
@@ -3891,25 +3858,6 @@ dependencies = [
  "which",
 ]
 
-[[package]]
-name = "soroban-spec-tools"
-version = "20.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5caac0698a57c2e1c5faaec5dfaa2ce511b822e863500ef225cc34203d0b6a4"
-dependencies = [
- "base64 0.21.7",
- "ethnum",
- "hex",
- "itertools 0.10.5",
- "serde_json",
- "soroban-env-host",
- "soroban-spec",
- "stellar-strkey 0.0.7",
- "stellar-xdr",
- "thiserror",
- "wasmparser 0.90.0",
-]
-
 [[package]]
 name = "soroban-spec-typescript"
 version = "20.3.1"
@@ -3945,11 +3893,11 @@ dependencies = [
  "soroban-cli",
  "soroban-env-host",
  "soroban-ledger-snapshot",
- "soroban-rpc",
  "soroban-sdk",
  "soroban-spec",
- "soroban-spec-tools 20.3.1",
- "stellar-strkey 0.0.7",
+ "soroban-spec-tools",
+ "stellar-rpc-client",
+ "stellar-strkey 0.0.8",
  "thiserror",
  "tokio",
  "toml 0.8.10",
@@ -3959,9 +3907,9 @@ dependencies = [
 
 [[package]]
 name = "soroban-token-sdk"
-version = "20.3.1"
+version = "20.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "867bd2927e092f2bbf65d1e3cda9f89fa1d1eea935776416bf3ead47fccc82ef"
+checksum = "ee8ed0ae2e5d5e67b7939200bba3712b4c81dcf87b2ccd68bba049bec64c780f"
 dependencies = [
  "soroban-sdk",
 ]
@@ -4001,6 +3949,38 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "stellar-rpc-client"
+version = "20.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01c98cb5068faa68bb4eae0ddd492752042be3c85df145483669936fd794388e"
+dependencies = [
+ "base64 0.21.7",
+ "clap",
+ "ed25519-dalek 2.0.0",
+ "ethnum",
+ "hex",
+ "http 1.0.0",
+ "itertools 0.10.5",
+ "jsonrpsee-core",
+ "jsonrpsee-http-client",
+ "serde",
+ "serde-aux",
+ "serde_json",
+ "sha2 0.10.8",
+ "soroban-env-host",
+ "soroban-sdk",
+ "soroban-spec",
+ "stellar-strkey 0.0.7",
+ "stellar-xdr",
+ "termcolor",
+ "termcolor_output",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "wasmparser 0.90.0",
+]
+
 [[package]]
 name = "stellar-strkey"
 version = "0.0.7"
diff --git a/Cargo.toml b/Cargo.toml
index aad28aceb..b2ab9213c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,31 +14,19 @@ version = "20.3.1"
 rust-version = "1.74.0"
 
 [workspace.dependencies.soroban-env-host]
-version = "=20.2.1"
-# git = "https://github.com/stellar/rs-soroban-env"
-# rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e"
-# path = "../rs-soroban-env/soroban-env-host"
+version = "=20.3.0"
 
 [workspace.dependencies.soroban-simulation]
-version = "=20.2.1"
-# git = "https://github.com/stellar/rs-soroban-env"
-# rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e"
-# path = "../rs-soroban-env/soroban-simulation"
+version = "=20.3.0"
 
 [workspace.dependencies.soroban-spec]
-version = "=20.3.1"
-# git = "https://github.com/stellar/rs-soroban-sdk"
-# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
-# path = "../rs-soroban-sdk/soroban-spec"
+version = "=20.5.0"
 
 [workspace.dependencies.soroban-spec-rust]
-version = "=20.3.1"
-# git = "https://github.com/stellar/rs-soroban-sdk"
-# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
-# path = "../rs-soroban-sdk/soroban-spec-rust"
+version = "=20.5.0"
 
 [workspace.dependencies.soroban-spec-json]
-version = "20.3.1"
+version = "=20.3.1"
 path = "./cmd/crates/soroban-spec-json"
 
 [workspace.dependencies.soroban-spec-typescript]
@@ -50,34 +38,28 @@ version = "20.3.1"
 path = "./cmd/crates/soroban-spec-tools"
 
 [workspace.dependencies.soroban-sdk]
-version = "=20.3.1"
-# git = "https://github.com/stellar/rs-soroban-sdk"
-# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
+version = "=20.5.0"
 
 [workspace.dependencies.soroban-token-sdk]
-version = "=20.3.1"
-# git = "https://github.com/stellar/rs-soroban-sdk"
-# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
+version = "=20.5.0"
 
 [workspace.dependencies.soroban-ledger-snapshot]
-version = "=20.3.1"
-# git = "https://github.com/stellar/rs-soroban-sdk"
-# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
+version = "=20.5.0"
 
 [workspace.dependencies.soroban-cli]
-version = "20.3.1"
+version = "=20.3.1"
 path = "cmd/soroban-cli"
 
 [workspace.dependencies.soroban-rpc]
-version = "=20.3.3"
-# git = "https://github.com/stellar/soroban-rpc"
+package = "stellar-rpc-client"
+version = "=20.3.5"
 
 [workspace.dependencies.stellar-xdr]
 version = "=20.1.0"
 default-features = true
 
 [workspace.dependencies]
-stellar-strkey = "0.0.7"
+stellar-strkey = "0.0.8"
 sep5 = "0.0.2"
 base64 = "0.21.2"
 thiserror = "1.0.46"
diff --git a/cmd/soroban-cli/src/commands/config/secret.rs b/cmd/soroban-cli/src/commands/config/secret.rs
index 52a443d87..17a921c78 100644
--- a/cmd/soroban-cli/src/commands/config/secret.rs
+++ b/cmd/soroban-cli/src/commands/config/secret.rs
@@ -104,9 +104,12 @@ impl Secret {
     pub fn private_key(&self, index: Option<usize>) -> Result<PrivateKey, Error> {
         Ok(match self {
             Secret::SecretKey { secret_key } => PrivateKey::from_string(secret_key)?,
-            Secret::SeedPhrase { seed_phrase } => sep5::SeedPhrase::from_str(seed_phrase)?
-                .from_path_index(index.unwrap_or_default(), None)?
-                .private(),
+            Secret::SeedPhrase { seed_phrase } => PrivateKey::from_payload(
+                &sep5::SeedPhrase::from_str(seed_phrase)?
+                    .from_path_index(index.unwrap_or_default(), None)?
+                    .private()
+                    .0,
+            )?,
         })
     }