diff --git a/src/protocol-next/xdr b/src/protocol-next/xdr
index 8c88608d0a..9a174be684 160000
--- a/src/protocol-next/xdr
+++ b/src/protocol-next/xdr
@@ -1 +1 @@
-Subproject commit 8c88608d0a20b01873056a5ec13be245e1f2aa27
+Subproject commit 9a174be684d999db0de3ba9cb29c4c3a7e1cb169
diff --git a/src/rust/soroban/p22 b/src/rust/soroban/p22
index 1647571232..cf469d2d4b 160000
--- a/src/rust/soroban/p22
+++ b/src/rust/soroban/p22
@@ -1 +1 @@
-Subproject commit 164757123268943d9c16059c0124ef113a74f2aa
+Subproject commit cf469d2d4be82f83c24b75aeb8a133cfb82a23cd
diff --git a/src/rust/src/dep-trees/p22-expect.txt b/src/rust/src/dep-trees/p22-expect.txt
index b82a9eff87..89a7f548c8 100644
--- a/src/rust/src/dep-trees/p22-expect.txt
+++ b/src/rust/src/dep-trees/p22-expect.txt
@@ -1,4 +1,4 @@
-soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
+soroban-env-host v22.0.0-rc.2 (src/rust/soroban/p22/soroban-env-host)
 ├── ark-bls12-381 v0.4.0
 │   ├── ark-ec v0.4.2
 │   │   ├── ark-ff v0.4.2
@@ -222,17 +222,17 @@ soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
 │   ├── digest v0.10.7 (*)
 │   └── keccak v0.1.4
 │       └── cpufeatures v0.2.8 (*)
-├── soroban-builtin-sdk-macros v22.0.0 (proc-macro) (src/rust/soroban/p22/soroban-builtin-sdk-macros)
+├── soroban-builtin-sdk-macros v22.0.0-rc.2 (proc-macro) (src/rust/soroban/p22/soroban-builtin-sdk-macros)
 │   ├── itertools v0.10.5
 │   │   └── either v1.8.1
 │   ├── proc-macro2 v1.0.69 (*)
 │   ├── quote v1.0.33 (*)
 │   └── syn v2.0.39 (*)
-├── soroban-env-common v22.0.0 (src/rust/soroban/p22/soroban-env-common)
+├── soroban-env-common v22.0.0-rc.2 (src/rust/soroban/p22/soroban-env-common)
 │   ├── ethnum v1.5.0
 │   ├── num-derive v0.4.1 (proc-macro) (*)
 │   ├── num-traits v0.2.17 (*)
-│   ├── soroban-env-macros v22.0.0 (proc-macro) (src/rust/soroban/p22/soroban-env-macros)
+│   ├── soroban-env-macros v22.0.0-rc.2 (proc-macro) (src/rust/soroban/p22/soroban-env-macros)
 │   │   ├── itertools v0.10.5 (*)
 │   │   ├── proc-macro2 v1.0.69 (*)
 │   │   ├── quote v1.0.33 (*)
@@ -245,7 +245,7 @@ soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
 │   │   │   ├── itoa v1.0.6
 │   │   │   ├── ryu v1.0.13
 │   │   │   └── serde v1.0.192 (*)
-│   │   ├── stellar-xdr v22.0.0 (https://github.com/stellar/rs-stellar-xdr?rev=b5516843b6379e4e29520bf2ba156484f62edc46#b5516843)
+│   │   ├── stellar-xdr v22.0.0-rc.1.1
 │   │   │   ├── escape-bytes v0.1.1
 │   │   │   ├── hex v0.4.3
 │   │   │   └── stellar-strkey v0.0.9
@@ -263,23 +263,11 @@ soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
 │   │   │   [build-dependencies]
 │   │   │   └── crate-git-revision v0.0.6 (*)
 │   │   └── syn v2.0.39 (*)
-│   ├── soroban-wasmi v0.36.1-soroban.22.0.0
-│   │   ├── arrayvec v0.7.4
-│   │   ├── multi-stash v0.2.0
-│   │   ├── num-derive v0.4.1 (proc-macro) (*)
-│   │   ├── num-traits v0.2.17 (*)
+│   ├── soroban-wasmi v0.31.1-soroban.20.0.1 (https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3de)
 │   │   ├── smallvec v1.13.2
 │   │   ├── spin v0.9.8
-│   │   ├── wasmi_collections v0.36.1
-│   │   │   ├── ahash v0.8.11 (*)
-│   │   │   ├── hashbrown v0.14.1
-│   │   │   │   └── ahash v0.8.11 (*)
-│   │   │   └── string-interner v0.17.0
-│   │   │       ├── cfg-if v1.0.0
-│   │   │       ├── hashbrown v0.14.1 (*)
-│   │   │       └── serde v1.0.192
-│   │   │           └── serde_derive v1.0.192 (proc-macro) (*)
-│   │   ├── wasmi_core v0.36.1
+│   │   ├── wasmi_arena v0.4.0 (https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3de)
+│   │   ├── wasmi_core v0.13.0 (https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3de)
 │   │   │   ├── downcast-rs v1.2.0
 │   │   │   ├── libm v0.2.8
 │   │   │   ├── num-traits v0.2.17 (*)
@@ -287,7 +275,7 @@ soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
 │   │   └── wasmparser-nostd v0.100.2
 │   │       └── indexmap-nostd v0.4.0
 │   ├── static_assertions v1.1.0
-│   ├── stellar-xdr v22.0.0 (https://github.com/stellar/rs-stellar-xdr?rev=b5516843b6379e4e29520bf2ba156484f62edc46#b5516843)
+│   ├── stellar-xdr v22.0.0-rc.1.1
 │   │   ├── base64 v0.13.1
 │   │   ├── escape-bytes v0.1.1
 │   │   ├── hex v0.4.3
@@ -297,11 +285,11 @@ soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
 │   └── wasmparser v0.116.1
 │       ├── indexmap v2.0.2
 │       │   ├── equivalent v1.0.1
-│       │   └── hashbrown v0.14.1 (*)
+│       │   └── hashbrown v0.14.1
 │       └── semver v1.0.17
 │   [build-dependencies]
 │   └── crate-git-revision v0.0.6 (*)
-├── soroban-wasmi v0.36.1-soroban.22.0.0 (*)
+├── soroban-wasmi v0.31.1-soroban.20.0.1 (https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3de) (*)
 ├── static_assertions v1.1.0
 ├── stellar-strkey v0.0.9 (*)
 └── wasmparser v0.116.1 (*)