diff --git a/src/ledger/NetworkConfig.cpp b/src/ledger/NetworkConfig.cpp
index 334d53204b..1d978bf8ba 100644
--- a/src/ledger/NetworkConfig.cpp
+++ b/src/ledger/NetworkConfig.cpp
@@ -1159,7 +1159,9 @@ SorobanNetworkConfig::initializeGenesisLedgerForTesting(
         // Protocol 20 released with somewhat incorrect costs and has been
         // re-calibrated short after the release. We catch up here to the more
         // correct costs that exist on the network.
+#ifdef BUILD_TESTS
         updateRecalibratedCostTypesForV20(ltx);
+#endif
         ltx.loadHeader().current().ledgerVersion = genesisLedgerProtocol;
     }
 
diff --git a/src/rust/soroban/p22 b/src/rust/soroban/p22
index 8911531dfb..1cd8b8dca9 160000
--- a/src/rust/soroban/p22
+++ b/src/rust/soroban/p22
@@ -1 +1 @@
-Subproject commit 8911531dfb9a4331bc308ff8934c2223bc4e81ed
+Subproject commit 1cd8b8dca9aeeca9ce45b129cd923992b32dc258
diff --git a/src/rust/src/dep-trees/p22-expect.txt b/src/rust/src/dep-trees/p22-expect.txt
index 904fcfbd75..df924c6fc8 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-rc.3 (src/rust/soroban/p22/soroban-env-host)
+soroban-env-host v22.0.0 (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-rc.3 (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-rc.3 (proc-macro) (src/rust/soroban/p22/soroban-builtin-sdk-macros)
+├── soroban-builtin-sdk-macros v22.0.0 (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-rc.3 (src/rust/soroban/p22/soroban-env-common)
+├── soroban-env-common v22.0.0 (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-rc.3 (proc-macro) (src/rust/soroban/p22/soroban-env-macros)
+│   ├── soroban-env-macros v22.0.0 (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-rc.3 (src/rust/soroban/p22/soroban-env-host)
 │   │   │   ├── itoa v1.0.6
 │   │   │   ├── ryu v1.0.13
 │   │   │   └── serde v1.0.192 (*)
-│   │   ├── stellar-xdr v22.0.0-rc.1.1
+│   │   ├── stellar-xdr v22.0.0
 │   │   │   ├── escape-bytes v0.1.1
 │   │   │   ├── hex v0.4.3
 │   │   │   └── stellar-strkey v0.0.9
@@ -275,7 +275,7 @@ soroban-env-host v22.0.0-rc.3 (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-rc.1.1
+│   ├── stellar-xdr v22.0.0
 │   │   ├── base64 v0.13.1
 │   │   ├── escape-bytes v0.1.1
 │   │   ├── hex v0.4.3