diff --git a/Cargo.lock b/Cargo.lock
index b27ff4d0e8..4fadc79140 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1846,7 +1846,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.31#fb8c5a3d0800ebdebe14bd0e708d2a348f976d9e"
+source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.31#fb8c5a3d0800ebdebe14bd0e708d2a348f976d9e"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -1855,9 +1855,9 @@ dependencies = [
  "cumulus-relay-chain-rpc-interface",
  "futures",
  "lru 0.8.1",
- "polkadot-availability-distribution 0.9.31 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.31)",
+ "polkadot-availability-distribution",
  "polkadot-core-primitives",
- "polkadot-network-bridge 0.9.31 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.31)",
+ "polkadot-network-bridge",
  "polkadot-node-core-av-store",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem-util",
@@ -1870,8 +1870,8 @@ dependencies = [
  "sc-keystore",
  "sc-network",
  "sc-network-common",
- "sc-network-light 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31)",
- "sc-network-sync 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31)",
+ "sc-network-light",
+ "sc-network-sync",
  "sc-service",
  "sc-telemetry",
  "sc-tracing",
@@ -2679,14 +2679,6 @@ dependencies = [
  "parity-scale-codec",
 ]
 
-[[package]]
-name = "fork-tree"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
-dependencies = [
- "parity-scale-codec",
-]
-
 [[package]]
 name = "form_urlencoded"
 version = "1.1.0"
@@ -6230,7 +6222,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -6320,7 +6312,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6617,7 +6609,7 @@ dependencies = [
 [[package]]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6650,7 +6642,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -6919,7 +6911,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
+source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7393,7 +7385,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "rand 0.8.5",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7407,7 +7399,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "rand 0.8.5",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7420,30 +7412,7 @@ dependencies = [
  "futures",
  "lru 0.8.1",
  "parity-scale-codec",
- "polkadot-erasure-coding 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
- "polkadot-node-network-protocol",
- "polkadot-node-primitives",
- "polkadot-node-subsystem",
- "polkadot-node-subsystem-util",
- "polkadot-primitives",
- "rand 0.8.5",
- "sp-core",
- "sp-keystore",
- "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
-]
-
-[[package]]
-name = "polkadot-availability-distribution"
-version = "0.9.31"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.31#32dd0c9cfcd1a1bda821747f6ab334f0e3577558"
-dependencies = [
- "derive_more",
- "fatality",
- "futures",
- "lru 0.8.1",
- "parity-scale-codec",
- "polkadot-erasure-coding 0.9.31 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.31)",
+ "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -7453,7 +7422,7 @@ dependencies = [
  "sp-core",
  "sp-keystore",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7465,7 +7434,7 @@ dependencies = [
  "futures",
  "lru 0.8.1",
  "parity-scale-codec",
- "polkadot-erasure-coding 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -7474,7 +7443,7 @@ dependencies = [
  "rand 0.8.5",
  "sc-network",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7563,7 +7532,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7591,7 +7560,7 @@ dependencies = [
  "indexmap",
  "lru 0.8.1",
  "parity-scale-codec",
- "polkadot-erasure-coding 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
@@ -7601,7 +7570,7 @@ dependencies = [
  "sp-application-crypto",
  "sp-keystore",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7618,20 +7587,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "polkadot-erasure-coding"
-version = "0.9.31"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.31#32dd0c9cfcd1a1bda821747f6ab334f0e3577558"
-dependencies = [
- "parity-scale-codec",
- "polkadot-node-primitives",
- "polkadot-primitives",
- "reed-solomon-novelpoly",
- "sp-core",
- "sp-trie",
- "thiserror",
-]
-
 [[package]]
 name = "polkadot-gossip-support"
 version = "0.9.31"
@@ -7649,7 +7604,7 @@ dependencies = [
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7673,31 +7628,7 @@ dependencies = [
  "sc-network-common",
  "sp-consensus",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
-]
-
-[[package]]
-name = "polkadot-network-bridge"
-version = "0.9.31"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.31#32dd0c9cfcd1a1bda821747f6ab334f0e3577558"
-dependencies = [
- "always-assert",
- "async-trait",
- "bytes",
- "fatality",
- "futures",
- "parity-scale-codec",
- "parking_lot 0.12.1",
- "polkadot-node-network-protocol",
- "polkadot-node-subsystem",
- "polkadot-node-subsystem-util",
- "polkadot-overseer",
- "polkadot-primitives",
- "sc-network",
- "sc-network-common",
- "sp-consensus",
- "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7707,7 +7638,7 @@ source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.31#32d
 dependencies = [
  "futures",
  "parity-scale-codec",
- "polkadot-erasure-coding 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -7715,7 +7646,7 @@ dependencies = [
  "sp-core",
  "sp-maybe-compressed-blob",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7731,7 +7662,7 @@ dependencies = [
  "lru 0.8.1",
  "merlin",
  "parity-scale-codec",
- "polkadot-node-jaeger 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-node-jaeger",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -7744,7 +7675,7 @@ dependencies = [
  "sp-consensus-slots",
  "sp-runtime",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7757,14 +7688,14 @@ dependencies = [
  "futures-timer",
  "kvdb",
  "parity-scale-codec",
- "polkadot-erasure-coding 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7775,7 +7706,7 @@ dependencies = [
  "bitvec",
  "fatality",
  "futures",
- "polkadot-erasure-coding 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-erasure-coding",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
@@ -7783,7 +7714,7 @@ dependencies = [
  "polkadot-statement-table",
  "sp-keystore",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7797,7 +7728,7 @@ dependencies = [
  "polkadot-primitives",
  "sp-keystore",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
  "wasm-timer",
 ]
 
@@ -7816,7 +7747,7 @@ dependencies = [
  "polkadot-parachain",
  "polkadot-primitives",
  "sp-maybe-compressed-blob",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7831,7 +7762,7 @@ dependencies = [
  "sc-client-api",
  "sc-consensus-babe",
  "sp-blockchain",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7848,7 +7779,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7867,7 +7798,7 @@ dependencies = [
  "polkadot-primitives",
  "sc-keystore",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7884,7 +7815,7 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7902,7 +7833,7 @@ dependencies = [
  "polkadot-primitives",
  "rand 0.8.5",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7934,7 +7865,7 @@ dependencies = [
  "sp-tracing",
  "sp-wasm-interface",
  "tempfile",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7950,7 +7881,7 @@ dependencies = [
  "polkadot-primitives",
  "sp-keystore",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7966,7 +7897,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-consensus-babe",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -7987,24 +7918,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "polkadot-node-jaeger"
-version = "0.9.31"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.31#32dd0c9cfcd1a1bda821747f6ab334f0e3577558"
-dependencies = [
- "async-std",
- "lazy_static",
- "log",
- "mick-jaeger",
- "parity-scale-codec",
- "parking_lot 0.12.1",
- "polkadot-node-primitives",
- "polkadot-primitives",
- "sc-network",
- "sp-core",
- "thiserror",
-]
-
 [[package]]
 name = "polkadot-node-metrics"
 version = "0.9.31"
@@ -8021,7 +7934,7 @@ dependencies = [
  "sc-service",
  "sc-tracing",
  "substrate-prometheus-endpoint",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -8035,7 +7948,7 @@ dependencies = [
  "futures",
  "hex",
  "parity-scale-codec",
- "polkadot-node-jaeger 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-node-jaeger",
  "polkadot-node-primitives",
  "polkadot-primitives",
  "rand 0.8.5",
@@ -8044,7 +7957,7 @@ dependencies = [
  "sc-network-common",
  "strum",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -8074,7 +7987,7 @@ name = "polkadot-node-subsystem"
 version = "0.9.31"
 source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.31#32dd0c9cfcd1a1bda821747f6ab334f0e3577558"
 dependencies = [
- "polkadot-node-jaeger 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
  "polkadot-overseer",
 ]
@@ -8088,7 +8001,7 @@ dependencies = [
  "derive_more",
  "futures",
  "orchestra",
- "polkadot-node-jaeger 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-node-jaeger",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-primitives",
@@ -8119,7 +8032,7 @@ dependencies = [
  "parity-util-mem",
  "parking_lot 0.11.2",
  "pin-project",
- "polkadot-node-jaeger 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-node-jaeger",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -8132,7 +8045,7 @@ dependencies = [
  "sp-core",
  "sp-keystore",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -8155,7 +8068,7 @@ dependencies = [
  "sc-client-api",
  "sp-api",
  "sp-core",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -8183,7 +8096,7 @@ dependencies = [
  "env_logger",
  "kusama-runtime",
  "log",
- "polkadot-erasure-coding 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-erasure-coding",
  "polkadot-node-core-pvf",
  "polkadot-node-primitives",
  "quote",
@@ -8480,13 +8393,13 @@ dependencies = [
  "parity-db",
  "polkadot-approval-distribution",
  "polkadot-availability-bitfield-distribution",
- "polkadot-availability-distribution 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-availability-distribution",
  "polkadot-availability-recovery",
  "polkadot-client",
  "polkadot-collator-protocol",
  "polkadot-dispute-distribution",
  "polkadot-gossip-support",
- "polkadot-network-bridge 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-network-bridge",
  "polkadot-node-collation-generation",
  "polkadot-node-core-approval-voting",
  "polkadot-node-core-av-store",
@@ -8558,7 +8471,7 @@ dependencies = [
  "sp-trie",
  "substrate-prometheus-endpoint",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
  "westend-runtime",
 ]
 
@@ -8580,7 +8493,7 @@ dependencies = [
  "sp-keystore",
  "sp-staking",
  "thiserror",
- "tracing-gum 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "tracing-gum",
 ]
 
 [[package]]
@@ -9973,7 +9886,7 @@ version = "0.10.0-dev"
 source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
 dependencies = [
  "async-trait",
- "fork-tree 3.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31)",
+ "fork-tree",
  "futures",
  "log",
  "merlin",
@@ -10036,7 +9949,7 @@ name = "sc-consensus-epochs"
 version = "0.10.0-dev"
 source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
 dependencies = [
- "fork-tree 3.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31)",
+ "fork-tree",
  "parity-scale-codec",
  "sc-client-api",
  "sc-consensus",
@@ -10190,7 +10103,7 @@ dependencies = [
  "async-trait",
  "dyn-clone",
  "finality-grandpa",
- "fork-tree 3.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31)",
+ "fork-tree",
  "futures",
  "futures-timer",
  "log",
@@ -10287,7 +10200,7 @@ dependencies = [
  "cid",
  "either",
  "fnv",
- "fork-tree 3.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31)",
+ "fork-tree",
  "futures",
  "futures-timer",
  "ip_network",
@@ -10406,64 +10319,13 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "sc-network-light"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
-dependencies = [
- "array-bytes",
- "futures",
- "libp2p",
- "log",
- "parity-scale-codec",
- "prost",
- "prost-build",
- "sc-client-api",
- "sc-network-common",
- "sc-peerset",
- "sp-blockchain",
- "sp-core",
- "sp-runtime",
- "thiserror",
-]
-
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
 source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
 dependencies = [
  "array-bytes",
- "fork-tree 3.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31)",
- "futures",
- "libp2p",
- "log",
- "lru 0.7.8",
- "mockall",
- "parity-scale-codec",
- "prost",
- "prost-build",
- "sc-client-api",
- "sc-consensus",
- "sc-network-common",
- "sc-peerset",
- "sc-utils",
- "smallvec",
- "sp-arithmetic",
- "sp-blockchain",
- "sp-consensus",
- "sp-core",
- "sp-finality-grandpa",
- "sp-runtime",
- "thiserror",
-]
-
-[[package]]
-name = "sc-network-sync"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38"
-dependencies = [
- "array-bytes",
- "fork-tree 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31)",
+ "fork-tree",
  "futures",
  "libp2p",
  "log",
@@ -10672,8 +10534,8 @@ dependencies = [
  "sc-network",
  "sc-network-bitswap",
  "sc-network-common",
- "sc-network-light 0.10.0-dev (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31)",
- "sc-network-sync 0.10.0-dev (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.31)",
+ "sc-network-light",
+ "sc-network-sync",
  "sc-network-transactions",
  "sc-offchain",
  "sc-rpc",
@@ -12903,21 +12765,10 @@ name = "tracing-gum"
 version = "0.9.31"
 source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.31#32dd0c9cfcd1a1bda821747f6ab334f0e3577558"
 dependencies = [
- "polkadot-node-jaeger 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
+ "polkadot-node-jaeger",
  "polkadot-primitives",
  "tracing",
- "tracing-gum-proc-macro 0.9.31 (git+https://github.com/paritytech//polkadot?branch=release-v0.9.31)",
-]
-
-[[package]]
-name = "tracing-gum"
-version = "0.9.31"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.31#32dd0c9cfcd1a1bda821747f6ab334f0e3577558"
-dependencies = [
- "polkadot-node-jaeger 0.9.31 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.31)",
- "polkadot-primitives",
- "tracing",
- "tracing-gum-proc-macro 0.9.31 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.31)",
+ "tracing-gum-proc-macro",
 ]
 
 [[package]]
@@ -12932,18 +12783,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "tracing-gum-proc-macro"
-version = "0.9.31"
-source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.31#32dd0c9cfcd1a1bda821747f6ab334f0e3577558"
-dependencies = [
- "expander 0.0.6",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.1.3"
diff --git a/Cargo.toml b/Cargo.toml
index 0a913f3987..f8efdd11a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -171,7 +171,15 @@ pallet-election-provider-support-benchmarking = { git = "https://github.com/pari
 pallet-nomination-pools  = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
 pallet-nomination-pools-benchmarking  = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
 pallet-nomination-pools-runtime-api  = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
-pallet-preimage  = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
+pallet-preimage = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
+pallet-conviction-voting = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
+pallet-fast-unstake = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
+pallet-ranked-collective = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
+pallet-referenda = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
+pallet-whitelist = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
+sc-network-light = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
+sc-network-sync = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
+fork-tree  = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.31" }
 
 [patch."https://github.com/paritytech/polkadot"]
 kusama-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
@@ -199,6 +207,12 @@ xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.
 xcm-builder = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
 xcm-executor = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
 xcm-simulator = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
+polkadot-availability-distribution = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
+polkadot-erasure-coding = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
+polkadot-network-bridge = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
+polkadot-node-jaeger = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
+tracing-gum = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
+tracing-gum-proc-macro = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.31" }
 
 [patch."https://github.com/paritytech/cumulus"]
 cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.31" }
@@ -222,3 +236,4 @@ parachain-info  = { git = "https://github.com/paritytech//cumulus", branch = "po
 cumulus-relay-chain-inprocess-interface  = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.31" }
 cumulus-relay-chain-rpc-interface  = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.31" }
 cumulus-client-collator  = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.31" }
+cumulus-relay-chain-minimal-node  = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.31" }
diff --git a/crates/annuity/Cargo.toml b/crates/annuity/Cargo.toml
index d59abba46d..5c732a8665 100644
--- a/crates/annuity/Cargo.toml
+++ b/crates/annuity/Cargo.toml
@@ -55,4 +55,5 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-]
\ No newline at end of file
+]
+try-runtime = [ "frame-support/try-runtime" ]
\ No newline at end of file
diff --git a/crates/btc-relay/Cargo.toml b/crates/btc-relay/Cargo.toml
index 04d17bbea4..ed33c92d54 100644
--- a/crates/btc-relay/Cargo.toml
+++ b/crates/btc-relay/Cargo.toml
@@ -55,3 +55,4 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 ]
+try-runtime = [ "frame-support/try-runtime" ]
diff --git a/crates/clients-info/Cargo.toml b/crates/clients-info/Cargo.toml
index 08f1359229..f675a38f31 100644
--- a/crates/clients-info/Cargo.toml
+++ b/crates/clients-info/Cargo.toml
@@ -42,4 +42,5 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"frame-benchmarking/std",
-]
\ No newline at end of file
+]
+try-runtime = [ "frame-support/try-runtime" ]
\ No newline at end of file
diff --git a/crates/currency/Cargo.toml b/crates/currency/Cargo.toml
index af236673e4..97dbfb4088 100644
--- a/crates/currency/Cargo.toml
+++ b/crates/currency/Cargo.toml
@@ -55,3 +55,4 @@ std = [
 testing-utils = [
   "mocktopus"
 ]
+try-runtime = [ "frame-support/try-runtime" ]
diff --git a/crates/escrow/Cargo.toml b/crates/escrow/Cargo.toml
index a595f4f94e..5215f514f1 100644
--- a/crates/escrow/Cargo.toml
+++ b/crates/escrow/Cargo.toml
@@ -57,4 +57,5 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-]
\ No newline at end of file
+]
+try-runtime = [ "frame-support/try-runtime" ]
\ No newline at end of file
diff --git a/crates/fee/Cargo.toml b/crates/fee/Cargo.toml
index 2d6b4e73fe..eb18d7cb6d 100644
--- a/crates/fee/Cargo.toml
+++ b/crates/fee/Cargo.toml
@@ -68,4 +68,5 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-]
\ No newline at end of file
+]
+try-runtime = [ "frame-support/try-runtime" ]
\ No newline at end of file
diff --git a/crates/issue/src/lib.rs b/crates/issue/src/lib.rs
index ead7e0f97b..06bfd0a9c5 100644
--- a/crates/issue/src/lib.rs
+++ b/crates/issue/src/lib.rs
@@ -125,33 +125,6 @@ pub mod pallet {
         AmountBelowDustAmount,
     }
 
-    #[pallet::hooks]
-    impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {
-        #[cfg(feature = "try-runtime")]
-        fn pre_upgrade() -> Result<(), &'static str> {
-            ensure!(Self::storage_version() == Version::V0, "Wrong storage version.");
-            let issue_count_before = crate::IssueRequests::<T>::iter().count() as u32;
-            log::info!("issue count before: {:?}", issue_count_before);
-            crate::types::v4::IssueCountBefore::<T>::put(issue_count_before);
-
-            Ok(())
-        }
-
-        fn on_runtime_upgrade() -> frame_support::weights::Weight {
-            crate::types::v4::migrate_v0_to_v4::<T>()
-        }
-
-        #[cfg(feature = "try-runtime")]
-        fn post_upgrade() -> Result<(), &'static str> {
-            ensure!(Self::storage_version() == Version::V4, "Wrong storage version.");
-            let issue_count_before = crate::types::v4::IssueCountBefore::<T>::take();
-            let issue_count_after = crate::IssueRequests::<T>::iter().count() as u32;
-            log::info!("issue count after: {:?}", issue_count_after,);
-            ensure!(issue_count_before == issue_count_after, "Not all issues were migrated.");
-            Ok(())
-        }
-    }
-
     /// Users create issue requests to issue tokens. This mapping provides access
     /// from a unique hash `IssueId` to an `IssueRequest` struct.
     #[pallet::storage]
diff --git a/crates/issue/src/types.rs b/crates/issue/src/types.rs
index fe6822a773..5b63f3383d 100644
--- a/crates/issue/src/types.rs
+++ b/crates/issue/src/types.rs
@@ -23,158 +23,6 @@ pub enum Version {
     V4,
 }
 
-pub mod v4 {
-    use super::*;
-    use crate::{BtcAddress, BtcPublicKey, H256};
-    use frame_support::pallet_prelude::*;
-
-    #[frame_support::storage_alias]
-    pub type IssueCountBefore<T: crate::Config> = StorageValue<crate::Pallet<T>, u32, ValueQuery>;
-
-    #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)]
-    pub enum IssueRequestStatusV3 {
-        Pending,
-        Completed(Option<H256>),
-        Cancelled,
-    }
-
-    impl Into<IssueRequestStatus> for IssueRequestStatusV3 {
-        fn into(self) -> IssueRequestStatus {
-            match self {
-                IssueRequestStatusV3::Pending => IssueRequestStatus::Pending,
-                IssueRequestStatusV3::Completed(_) => IssueRequestStatus::Completed,
-                IssueRequestStatusV3::Cancelled => IssueRequestStatus::Cancelled,
-            }
-        }
-    }
-
-    #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)]
-    pub struct IssueRequestV3<AccountId, BlockNumber, Balance, CurrencyId: Copy> {
-        pub vault: VaultId<AccountId, CurrencyId>,
-        pub opentime: BlockNumber,
-        pub period: BlockNumber,
-        pub griefing_collateral: Balance,
-        pub amount: Balance,
-        pub fee: Balance,
-        pub requester: AccountId,
-        pub btc_address: BtcAddress,
-        pub btc_public_key: BtcPublicKey,
-        pub btc_height: u32,
-        pub status: IssueRequestStatusV3,
-    }
-
-    pub type DefaultIssueRequestV3<T> = IssueRequestV3<
-        <T as frame_system::Config>::AccountId,
-        <T as frame_system::Config>::BlockNumber,
-        BalanceOf<T>,
-        CurrencyId<T>,
-    >;
-
-    pub fn migrate_v0_to_v4<T: Config>() -> frame_support::weights::Weight {
-        use sp_runtime::traits::Saturating;
-
-        // NOTE: kintsugi & interlay still on version 0
-        if !matches!(crate::StorageVersion::<T>::get(), Version::V0) {
-            log::info!("Not running issue storage migration");
-            return T::DbWeight::get().reads(1); // already upgraded; don't run migration
-        }
-        let mut num_migrated_issues = 0u64;
-
-        crate::IssueRequests::<T>::translate::<DefaultIssueRequestV3<T>, _>(|_key, issue_v3| {
-            num_migrated_issues.saturating_inc();
-
-            Some(IssueRequest {
-                vault: issue_v3.vault,
-                opentime: issue_v3.opentime,
-                period: issue_v3.period,
-                griefing_collateral: issue_v3.griefing_collateral,
-                amount: issue_v3.amount,
-                fee: issue_v3.fee,
-                requester: issue_v3.requester,
-                btc_address: issue_v3.btc_address,
-                btc_public_key: issue_v3.btc_public_key,
-                btc_height: issue_v3.btc_height,
-                status: issue_v3.status.into(),
-            })
-        });
-        crate::StorageVersion::<T>::put(Version::V4);
-
-        log::info!("Migrated {num_migrated_issues} issues");
-
-        T::DbWeight::get().reads_writes(num_migrated_issues, num_migrated_issues)
-    }
-
-    #[cfg(test)]
-    #[test]
-    fn test_migration() {
-        use crate::mock::Test;
-        use frame_support::{storage::migration, Blake2_128Concat, StorageHasher};
-        use primitives::{CurrencyId::Token, VaultCurrencyPair, KBTC, KSM};
-        use sp_runtime::traits::TrailingZeroInput;
-
-        crate::mock::run_test(|| {
-            crate::StorageVersion::<Test>::put(Version::V0);
-
-            let issue_v3: DefaultIssueRequestV3<Test> = IssueRequestV3 {
-                vault: VaultId {
-                    account_id: <Test as frame_system::Config>::AccountId::decode(&mut TrailingZeroInput::zeroes())
-                        .unwrap(),
-                    currencies: VaultCurrencyPair {
-                        collateral: Token(KSM),
-                        wrapped: Token(KBTC),
-                    },
-                },
-                opentime: 1_501_896,
-                period: 14_400,
-                griefing_collateral: 20,
-                amount: 100,
-                fee: 10,
-                requester: <Test as frame_system::Config>::AccountId::decode(&mut TrailingZeroInput::zeroes()).unwrap(),
-                btc_address: BtcAddress::P2PKH(sp_core::H160::from([1; 20])),
-                btc_public_key: BtcPublicKey::from([1; 33]),
-                btc_height: 754_190,
-                status: IssueRequestStatusV3::Completed(None),
-            };
-
-            let issue_id = crate::ext::security::get_secure_id::<Test>(
-                &<Test as frame_system::Config>::AccountId::decode(&mut TrailingZeroInput::zeroes()).unwrap(),
-            );
-
-            migration::put_storage_value(
-                b"Issue",
-                b"IssueRequests",
-                &Blake2_128Concat::hash(&issue_id.encode()),
-                &issue_v3,
-            );
-
-            migrate_v0_to_v4::<Test>();
-
-            let issue_v4 = IssueRequest {
-                vault: issue_v3.vault,
-                opentime: issue_v3.opentime,
-                period: issue_v3.period,
-                griefing_collateral: issue_v3.griefing_collateral,
-                amount: issue_v3.amount,
-                fee: issue_v3.fee,
-                requester: issue_v3.requester,
-                btc_address: issue_v3.btc_address,
-                btc_public_key: issue_v3.btc_public_key,
-                btc_height: issue_v3.btc_height,
-                status: issue_v3.status.into(),
-            };
-
-            // check that migration was applied correctly
-            assert_eq!(
-                crate::IssueRequests::<Test>::iter().collect::<Vec<_>>(),
-                vec![(issue_id.clone(), issue_v4)]
-            );
-
-            // check that storage version is bumped
-            assert!(crate::StorageVersion::<Test>::get() == Version::V4);
-        });
-    }
-}
-
 pub(crate) type BalanceOf<T> = <T as vault_registry::Config>::Balance;
 
 pub(crate) type DefaultVaultId<T> = VaultId<<T as frame_system::Config>::AccountId, CurrencyId<T>>;
diff --git a/crates/nomination/Cargo.toml b/crates/nomination/Cargo.toml
index a4c9b475b5..61ef9b44d7 100644
--- a/crates/nomination/Cargo.toml
+++ b/crates/nomination/Cargo.toml
@@ -83,3 +83,4 @@ runtime-benchmarks = [
 	"orml-tokens",
 	"orml-traits",
 ]
+try-runtime = [ "frame-support/try-runtime" ]
diff --git a/crates/oracle/Cargo.toml b/crates/oracle/Cargo.toml
index f211018ad7..78dcf2cf2c 100644
--- a/crates/oracle/Cargo.toml
+++ b/crates/oracle/Cargo.toml
@@ -63,3 +63,4 @@ runtime-benchmarks = [
 
 	"pallet-timestamp/runtime-benchmarks",
 ]
+try-runtime = [ "frame-support/try-runtime" ]
diff --git a/crates/redeem/Cargo.toml b/crates/redeem/Cargo.toml
index a80c963bec..c312e4bf89 100644
--- a/crates/redeem/Cargo.toml
+++ b/crates/redeem/Cargo.toml
@@ -90,3 +90,4 @@ runtime-benchmarks = [
 	"orml-tokens",
 	"orml-traits",
 ]
+try-runtime = [ "frame-support/try-runtime" ]
diff --git a/crates/replace/Cargo.toml b/crates/replace/Cargo.toml
index ff92e54bb8..e69fdb9131 100644
--- a/crates/replace/Cargo.toml
+++ b/crates/replace/Cargo.toml
@@ -89,4 +89,5 @@ runtime-benchmarks = [
 
 	"orml-tokens",
 	"orml-traits",
-]
\ No newline at end of file
+]
+try-runtime = [ "frame-support/try-runtime" ]
\ No newline at end of file
diff --git a/crates/reward/Cargo.toml b/crates/reward/Cargo.toml
index cd12128654..a4d23c6560 100644
--- a/crates/reward/Cargo.toml
+++ b/crates/reward/Cargo.toml
@@ -54,4 +54,5 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-]
\ No newline at end of file
+]
+try-runtime = [ "frame-support/try-runtime" ]
\ No newline at end of file
diff --git a/crates/security/Cargo.toml b/crates/security/Cargo.toml
index ad00604612..9deb029a84 100644
--- a/crates/security/Cargo.toml
+++ b/crates/security/Cargo.toml
@@ -33,4 +33,5 @@ std = [
   "sp-runtime/std",
   "frame-support/std",
   "frame-system/std",
-]
\ No newline at end of file
+]
+try-runtime = [ "frame-support/try-runtime" ]
\ No newline at end of file
diff --git a/crates/staking/Cargo.toml b/crates/staking/Cargo.toml
index 7285a51d59..91f0a42432 100644
--- a/crates/staking/Cargo.toml
+++ b/crates/staking/Cargo.toml
@@ -60,4 +60,5 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-]
\ No newline at end of file
+]
+try-runtime = [ "frame-support/try-runtime" ]
\ No newline at end of file
diff --git a/crates/supply/Cargo.toml b/crates/supply/Cargo.toml
index 3a9de77921..da04038438 100644
--- a/crates/supply/Cargo.toml
+++ b/crates/supply/Cargo.toml
@@ -54,4 +54,5 @@ runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-]
\ No newline at end of file
+]
+try-runtime = [ "frame-support/try-runtime" ]
\ No newline at end of file
diff --git a/crates/vault-registry/Cargo.toml b/crates/vault-registry/Cargo.toml
index 2df51edab3..8156029403 100644
--- a/crates/vault-registry/Cargo.toml
+++ b/crates/vault-registry/Cargo.toml
@@ -88,3 +88,4 @@ integration-tests = [
   "visibility"
 ]
 skip-slow-tests = []
+try-runtime = [ "frame-support/try-runtime" ]
diff --git a/parachain/runtime/interlay/Cargo.toml b/parachain/runtime/interlay/Cargo.toml
index d6ef3ac61d..d5a0136897 100644
--- a/parachain/runtime/interlay/Cargo.toml
+++ b/parachain/runtime/interlay/Cargo.toml
@@ -147,6 +147,7 @@ std = [
   "sp-inherents/std",
   "sp-arithmetic/std",
 
+  "frame-try-runtime?/std",
   "frame-support/std",
   "frame-executive/std",
   "frame-system/std",
@@ -258,10 +259,51 @@ try-runtime = [
 	"frame-executive/try-runtime",
 	"frame-system/try-runtime",
 	"frame-support/try-runtime",
-	"pallet-aura/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-timestamp/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"issue/try-runtime",
-]
+
+  "frame-system/try-runtime",
+  "pallet-timestamp/try-runtime",
+  "pallet-utility/try-runtime",
+  "pallet-transaction-payment/try-runtime",
+  "pallet-scheduler/try-runtime",
+  "pallet-preimage/try-runtime",
+  "pallet-multisig/try-runtime",
+  "pallet-identity/try-runtime",
+  "currency/try-runtime",
+  "orml-tokens/try-runtime",
+  "supply/try-runtime",
+  "orml-vesting/try-runtime",
+  "orml-asset-registry/try-runtime",
+  "escrow/try-runtime",
+  "annuity/try-runtime",
+  "reward/try-runtime",
+  "annuity/try-runtime",
+  "reward/try-runtime",
+  "staking/try-runtime",
+  "btc-relay/try-runtime",
+  "security/try-runtime",
+  "vault-registry/try-runtime",
+  "oracle/try-runtime",
+  "issue/try-runtime",
+  "redeem/try-runtime",
+  "replace/try-runtime",
+  "fee/try-runtime",
+  "nomination/try-runtime",
+  "clients-info/try-runtime",
+  "democracy/try-runtime",
+  "pallet-collective/try-runtime",
+  "pallet-membership/try-runtime",
+  "pallet-treasury/try-runtime",
+  "pallet-authorship/try-runtime",
+  "collator-selection/try-runtime",
+  "pallet-session/try-runtime",
+  "pallet-aura/try-runtime",
+  "cumulus-pallet-aura-ext/try-runtime",
+  "cumulus-pallet-parachain-system/try-runtime",
+  "parachain-info/try-runtime",
+  "cumulus-pallet-xcmp-queue/try-runtime",
+  "pallet-xcm/try-runtime",
+  "cumulus-pallet-xcm/try-runtime",
+  "cumulus-pallet-dmp-queue/try-runtime",
+  "orml-xtokens/try-runtime",
+  "orml-unknown-tokens/try-runtime"
+]
\ No newline at end of file
diff --git a/parachain/runtime/interlay/src/lib.rs b/parachain/runtime/interlay/src/lib.rs
index c1f9b56f99..d8a28344ef 100644
--- a/parachain/runtime/interlay/src/lib.rs
+++ b/parachain/runtime/interlay/src/lib.rs
@@ -1520,8 +1520,14 @@ impl_runtime_apis! {
             (weight, RuntimeBlockWeights::get().max_block)
         }
 
-        fn execute_block_no_check(block: Block) -> Weight {
-            Executive::execute_block_no_check(block)
+        fn execute_block(
+            block: Block,
+            state_root_check: bool,
+            select: frame_try_runtime::TryStateSelect
+        ) -> Weight {
+            // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
+            // have a backtrace here.
+            Executive::try_execute_block(block, state_root_check, select).expect("execute-block failed")
         }
     }
 }
diff --git a/parachain/runtime/kintsugi/Cargo.toml b/parachain/runtime/kintsugi/Cargo.toml
index 357e8a44c6..9fae67059e 100644
--- a/parachain/runtime/kintsugi/Cargo.toml
+++ b/parachain/runtime/kintsugi/Cargo.toml
@@ -152,6 +152,7 @@ std = [
   "sp-inherents/std",
   "sp-arithmetic/std",
 
+  "frame-try-runtime?/std",
   "frame-support/std",
   "frame-executive/std",
   "frame-system/std",
@@ -262,9 +263,51 @@ try-runtime = [
 	"frame-executive/try-runtime",
 	"frame-system/try-runtime",
 	"frame-support/try-runtime",
-	"pallet-aura/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-timestamp/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"issue/try-runtime",
-]
+
+  "frame-system/try-runtime",
+  "pallet-timestamp/try-runtime",
+  "pallet-utility/try-runtime",
+  "pallet-transaction-payment/try-runtime",
+  "pallet-scheduler/try-runtime",
+  "pallet-preimage/try-runtime",
+  "pallet-multisig/try-runtime",
+  "pallet-identity/try-runtime",
+  "currency/try-runtime",
+  "orml-tokens/try-runtime",
+  "supply/try-runtime",
+  "orml-vesting/try-runtime",
+  "orml-asset-registry/try-runtime",
+  "escrow/try-runtime",
+  "annuity/try-runtime",
+  "reward/try-runtime",
+  "annuity/try-runtime",
+  "reward/try-runtime",
+  "staking/try-runtime",
+  "btc-relay/try-runtime",
+  "security/try-runtime",
+  "vault-registry/try-runtime",
+  "oracle/try-runtime",
+  "issue/try-runtime",
+  "redeem/try-runtime",
+  "replace/try-runtime",
+  "fee/try-runtime",
+  "nomination/try-runtime",
+  "clients-info/try-runtime",
+  "democracy/try-runtime",
+  "pallet-collective/try-runtime",
+  "pallet-membership/try-runtime",
+  "pallet-treasury/try-runtime",
+  "pallet-authorship/try-runtime",
+  "collator-selection/try-runtime",
+  "pallet-session/try-runtime",
+  "pallet-aura/try-runtime",
+  "cumulus-pallet-aura-ext/try-runtime",
+  "cumulus-pallet-parachain-system/try-runtime",
+  "parachain-info/try-runtime",
+  "cumulus-pallet-xcmp-queue/try-runtime",
+  "pallet-xcm/try-runtime",
+  "cumulus-pallet-xcm/try-runtime",
+  "cumulus-pallet-dmp-queue/try-runtime",
+  "orml-xtokens/try-runtime",
+  "orml-unknown-tokens/try-runtime"
+]
\ No newline at end of file
diff --git a/parachain/runtime/kintsugi/src/lib.rs b/parachain/runtime/kintsugi/src/lib.rs
index b3523c19bf..d857bf7b73 100644
--- a/parachain/runtime/kintsugi/src/lib.rs
+++ b/parachain/runtime/kintsugi/src/lib.rs
@@ -1519,8 +1519,14 @@ impl_runtime_apis! {
             (weight, RuntimeBlockWeights::get().max_block)
         }
 
-        fn execute_block_no_check(block: Block) -> Weight {
-            Executive::execute_block_no_check(block)
+        fn execute_block(
+            block: Block,
+            state_root_check: bool,
+            select: frame_try_runtime::TryStateSelect
+        ) -> Weight {
+            // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
+            // have a backtrace here.
+            Executive::try_execute_block(block, state_root_check, select).expect("execute-block failed")
         }
     }
 }
diff --git a/parachain/runtime/runtime-tests/Cargo.toml b/parachain/runtime/runtime-tests/Cargo.toml
index 7c1a0a3369..68ef59fa20 100644
--- a/parachain/runtime/runtime-tests/Cargo.toml
+++ b/parachain/runtime/runtime-tests/Cargo.toml
@@ -256,3 +256,4 @@ runtime-benchmarks = [
   "fee/runtime-benchmarks",
 ]
 disable-runtime-api = []
+try-runtime = [ "frame-support/try-runtime" ]
diff --git a/parachain/runtime/testnet-interlay/Cargo.toml b/parachain/runtime/testnet-interlay/Cargo.toml
index e2660ac863..ca7f7c3dd6 100644
--- a/parachain/runtime/testnet-interlay/Cargo.toml
+++ b/parachain/runtime/testnet-interlay/Cargo.toml
@@ -153,6 +153,7 @@ std = [
   "sp-inherents/std",
   "sp-arithmetic/std",
 
+  "frame-try-runtime?/std",
   "frame-support/std",
   "frame-executive/std",
   "frame-system/std",
@@ -267,11 +268,53 @@ try-runtime = [
 	"frame-executive/try-runtime",
 	"frame-system/try-runtime",
 	"frame-support/try-runtime",
-	"pallet-aura/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-sudo/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-timestamp/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"issue/try-runtime",
-]
+
+  "frame-system/try-runtime",
+  "pallet-timestamp/try-runtime",
+  "pallet-sudo/try-runtime",
+  "pallet-utility/try-runtime",
+  "pallet-transaction-payment/try-runtime",
+  "pallet-scheduler/try-runtime",
+  "pallet-preimage/try-runtime",
+  "pallet-multisig/try-runtime",
+  "pallet-identity/try-runtime",
+  "currency/try-runtime",
+  "orml-tokens/try-runtime",
+  "supply/try-runtime",
+  "orml-vesting/try-runtime",
+  "orml-asset-registry/try-runtime",
+  "escrow/try-runtime",
+  "annuity/try-runtime",
+  "reward/try-runtime",
+  "annuity/try-runtime",
+  "reward/try-runtime",
+  "staking/try-runtime",
+  "btc-relay/try-runtime",
+  "security/try-runtime",
+  "vault-registry/try-runtime",
+  "oracle/try-runtime",
+  "issue/try-runtime",
+  "redeem/try-runtime",
+  "replace/try-runtime",
+  "fee/try-runtime",
+  "nomination/try-runtime",
+  "clients-info/try-runtime",
+  "loans/try-runtime",
+  "democracy/try-runtime",
+  "pallet-collective/try-runtime",
+  "pallet-membership/try-runtime",
+  "pallet-treasury/try-runtime",
+  "pallet-authorship/try-runtime",
+  "collator-selection/try-runtime",
+  "pallet-session/try-runtime",
+  "pallet-aura/try-runtime",
+  "cumulus-pallet-aura-ext/try-runtime",
+  "cumulus-pallet-parachain-system/try-runtime",
+  "parachain-info/try-runtime",
+  "cumulus-pallet-xcmp-queue/try-runtime",
+  "pallet-xcm/try-runtime",
+  "cumulus-pallet-xcm/try-runtime",
+  "cumulus-pallet-dmp-queue/try-runtime",
+  "orml-xtokens/try-runtime",
+  "orml-unknown-tokens/try-runtime"
+]
\ No newline at end of file
diff --git a/parachain/runtime/testnet-interlay/src/lib.rs b/parachain/runtime/testnet-interlay/src/lib.rs
index 954ddfe860..0098fc8320 100644
--- a/parachain/runtime/testnet-interlay/src/lib.rs
+++ b/parachain/runtime/testnet-interlay/src/lib.rs
@@ -1503,8 +1503,14 @@ impl_runtime_apis! {
             (weight, RuntimeBlockWeights::get().max_block)
         }
 
-        fn execute_block_no_check(block: Block) -> Weight {
-            Executive::execute_block_no_check(block)
+        fn execute_block(
+            block: Block,
+            state_root_check: bool,
+            select: frame_try_runtime::TryStateSelect
+        ) -> Weight {
+            // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
+            // have a backtrace here.
+            Executive::try_execute_block(block, state_root_check, select).expect("execute-block failed")
         }
     }
 }
diff --git a/parachain/runtime/testnet-kintsugi/Cargo.toml b/parachain/runtime/testnet-kintsugi/Cargo.toml
index 7844515959..98cd490a66 100644
--- a/parachain/runtime/testnet-kintsugi/Cargo.toml
+++ b/parachain/runtime/testnet-kintsugi/Cargo.toml
@@ -153,6 +153,7 @@ std = [
   "sp-inherents/std",
   "sp-arithmetic/std",
 
+  "frame-try-runtime?/std",
   "frame-support/std",
   "frame-executive/std",
   "frame-system/std",
@@ -267,11 +268,53 @@ try-runtime = [
 	"frame-executive/try-runtime",
 	"frame-system/try-runtime",
 	"frame-support/try-runtime",
-	"pallet-aura/try-runtime",
-	"pallet-balances/try-runtime",
-	"pallet-sudo/try-runtime",
-	"pallet-timestamp/try-runtime",
-	"pallet-scheduler/try-runtime",
-	"pallet-transaction-payment/try-runtime",
-	"issue/try-runtime",
+
+  "frame-system/try-runtime",
+  "pallet-timestamp/try-runtime",
+  "pallet-sudo/try-runtime",
+  "pallet-utility/try-runtime",
+  "pallet-transaction-payment/try-runtime",
+  "pallet-scheduler/try-runtime",
+  "pallet-preimage/try-runtime",
+  "pallet-multisig/try-runtime",
+  "pallet-identity/try-runtime",
+  "currency/try-runtime",
+  "orml-tokens/try-runtime",
+  "supply/try-runtime",
+  "orml-vesting/try-runtime",
+  "orml-asset-registry/try-runtime",
+  "escrow/try-runtime",
+  "annuity/try-runtime",
+  "reward/try-runtime",
+  "annuity/try-runtime",
+  "reward/try-runtime",
+  "staking/try-runtime",
+  "btc-relay/try-runtime",
+  "security/try-runtime",
+  "vault-registry/try-runtime",
+  "oracle/try-runtime",
+  "issue/try-runtime",
+  "redeem/try-runtime",
+  "replace/try-runtime",
+  "fee/try-runtime",
+  "nomination/try-runtime",
+  "clients-info/try-runtime",
+  "loans/try-runtime",
+  "democracy/try-runtime",
+  "pallet-collective/try-runtime",
+  "pallet-membership/try-runtime",
+  "pallet-treasury/try-runtime",
+  "pallet-authorship/try-runtime",
+  "collator-selection/try-runtime",
+  "pallet-session/try-runtime",
+  "pallet-aura/try-runtime",
+  "cumulus-pallet-aura-ext/try-runtime",
+  "cumulus-pallet-parachain-system/try-runtime",
+  "parachain-info/try-runtime",
+  "cumulus-pallet-xcmp-queue/try-runtime",
+  "pallet-xcm/try-runtime",
+  "cumulus-pallet-xcm/try-runtime",
+  "cumulus-pallet-dmp-queue/try-runtime",
+  "orml-xtokens/try-runtime",
+  "orml-unknown-tokens/try-runtime"
 ]
diff --git a/parachain/runtime/testnet-kintsugi/src/lib.rs b/parachain/runtime/testnet-kintsugi/src/lib.rs
index 8aef778e1d..91e161ef14 100644
--- a/parachain/runtime/testnet-kintsugi/src/lib.rs
+++ b/parachain/runtime/testnet-kintsugi/src/lib.rs
@@ -1502,8 +1502,14 @@ impl_runtime_apis! {
             (weight, RuntimeBlockWeights::get().max_block)
         }
 
-        fn execute_block_no_check(block: Block) -> Weight {
-            Executive::execute_block_no_check(block)
+        fn execute_block(
+            block: Block,
+            state_root_check: bool,
+            select: frame_try_runtime::TryStateSelect
+        ) -> Weight {
+            // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
+            // have a backtrace here.
+            Executive::try_execute_block(block, state_root_check, select).expect("execute-block failed")
         }
     }
 }