diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e7fcc33be..5c120faac 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -121,4 +121,4 @@ jobs:
       crates: soroban-spec-tools soroban-spec-json soroban-spec-typescript soroban-test soroban-cli
       runs-on: ${{ matrix.os }}
       target: ${{ matrix.target }}
-      cargo-hack-feature-options: ${{ matrix.cargo-hack-feature-options }}
\ No newline at end of file
+      cargo-hack-feature-options: ${{ matrix.cargo-hack-feature-options }}
diff --git a/Cargo.lock b/Cargo.lock
index 28f8aaf13..639960c49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3549,7 +3549,7 @@ dependencies = [
  "soroban-spec",
  "soroban-spec-json",
  "soroban-spec-rust",
- "soroban-spec-tools 20.3.0",
+ "soroban-spec-tools",
  "soroban-spec-typescript",
  "stellar-strkey 0.0.7",
  "stellar-xdr",
@@ -3663,7 +3663,6 @@ dependencies = [
 [[package]]
 name = "soroban-rpc"
 version = "20.3.0"
-source = "git+https://github.com/stellar/soroban-rpc?rev=b4c2dec162b14b560ed86b9d76a936b7bafb0922#b4c2dec162b14b560ed86b9d76a936b7bafb0922"
 dependencies = [
  "base64 0.21.5",
  "clap",
@@ -3681,7 +3680,7 @@ dependencies = [
  "soroban-env-host",
  "soroban-sdk",
  "soroban-spec",
- "soroban-spec-tools 20.3.0 (git+https://github.com/stellar/soroban-tools?rev=a1e51d263df80682a3dab2b00738700c7326f872)",
+ "soroban-spec-tools",
  "stellar-strkey 0.0.7",
  "stellar-xdr",
  "termcolor",
@@ -3690,6 +3689,7 @@ dependencies = [
  "tokio",
  "tracing",
  "wasmparser 0.90.0",
+ "which",
 ]
 
 [[package]]
@@ -3793,24 +3793,6 @@ dependencies = [
  "which",
 ]
 
-[[package]]
-name = "soroban-spec-tools"
-version = "20.3.0"
-source = "git+https://github.com/stellar/soroban-tools?rev=a1e51d263df80682a3dab2b00738700c7326f872#a1e51d263df80682a3dab2b00738700c7326f872"
-dependencies = [
- "base64 0.21.5",
- "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.0"
@@ -3848,7 +3830,7 @@ dependencies = [
  "soroban-ledger-snapshot",
  "soroban-sdk",
  "soroban-spec",
- "soroban-spec-tools 20.3.0",
+ "soroban-spec-tools",
  "stellar-strkey 0.0.7",
  "thiserror",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index d74173b85..36d1b8fc5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -70,7 +70,7 @@ path = "cmd/soroban-cli"
 
 [workspace.dependencies.soroban-rpc]
 version = "20.3.0"
-path = "cmd/soroban-rpc"
+path = "cmd/crates/soroban-rpc"
 
 [workspace.dependencies.stellar-xdr]
 version = "=20.1.0"