diff --git a/Cargo.lock b/Cargo.lock
index 77fd61a99f772..bdce2dfb70a0c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2375,7 +2375,6 @@ dependencies = [
  "bp-runtime",
  "bp-test-utils",
  "bp-xcm-bridge-hub",
- "bp-xcm-bridge-hub-router",
  "frame-support",
  "frame-system",
  "log",
@@ -2394,7 +2393,6 @@ dependencies = [
  "sp-std 14.0.0",
  "sp-trie",
  "staging-xcm",
- "staging-xcm-builder",
  "static_assertions",
  "tuplex",
 ]
diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
index c454ad9b5b1bb..b8835d55f0da2 100644
--- a/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -25,7 +25,6 @@ bp-polkadot-core = { workspace = true }
 bp-relayers = { workspace = true }
 bp-runtime = { workspace = true }
 bp-xcm-bridge-hub = { workspace = true }
-bp-xcm-bridge-hub-router = { workspace = true }
 pallet-bridge-grandpa = { workspace = true }
 pallet-bridge-messages = { workspace = true }
 pallet-bridge-parachains = { workspace = true }
@@ -43,12 +42,14 @@ sp-trie = { optional = true, workspace = true }
 
 # Polkadot dependencies
 xcm = { workspace = true }
-xcm-builder = { workspace = true }
 
 [dev-dependencies]
 bp-test-utils = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-bridge-messages = { features = ["std", "test-helpers"], workspace = true }
+pallet-bridge-messages = { features = [
+	"std",
+	"test-helpers",
+], workspace = true }
 sp-core = { workspace = true }
 
 [features]
@@ -61,7 +62,6 @@ std = [
 	"bp-relayers/std",
 	"bp-runtime/std",
 	"bp-test-utils/std",
-	"bp-xcm-bridge-hub-router/std",
 	"bp-xcm-bridge-hub/std",
 	"codec/std",
 	"frame-support/std",
@@ -75,12 +75,12 @@ std = [
 	"pallet-transaction-payment/std",
 	"pallet-utility/std",
 	"scale-info/std",
+	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"sp-trie/std",
 	"tuplex/std",
-	"xcm-builder/std",
 	"xcm/std",
 ]
 runtime-benchmarks = [
@@ -96,10 +96,6 @@ runtime-benchmarks = [
 	"pallet-utility/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"sp-trie",
-	"xcm-builder/runtime-benchmarks",
 ]
 integrity-test = ["static_assertions"]
-test-helpers = [
-	"bp-runtime/test-helpers",
-	"sp-trie",
-]
+test-helpers = ["bp-runtime/test-helpers", "sp-trie"]
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
index 33f524030d264..9df318587e389 100644
--- a/bridges/modules/messages/Cargo.toml
+++ b/bridges/modules/messages/Cargo.toml
@@ -73,7 +73,4 @@ try-runtime = [
 	"pallet-bridge-grandpa/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-test-helpers = [
-	"bp-runtime/test-helpers",
-	"sp-trie",
-]
+test-helpers = ["bp-runtime/test-helpers", "sp-trie"]
diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml
index d98edb7dca089..0bf889bcca0ef 100644
--- a/bridges/modules/relayers/Cargo.toml
+++ b/bridges/modules/relayers/Cargo.toml
@@ -49,8 +49,11 @@ default = ["std"]
 std = [
 	"bp-header-chain/std",
 	"bp-messages/std",
+	"bp-parachains/std",
+	"bp-polkadot-core/std",
 	"bp-relayers/std",
 	"bp-runtime/std",
+	"bp-test-utils/std",
 	"codec/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
@@ -60,8 +63,11 @@ std = [
 	"pallet-bridge-messages/std",
 	"pallet-bridge-parachains/std",
 	"pallet-transaction-payment/std",
+	"pallet-utility/std",
 	"scale-info/std",
 	"sp-arithmetic/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 ]
@@ -73,6 +79,7 @@ runtime-benchmarks = [
 	"pallet-bridge-grandpa/runtime-benchmarks",
 	"pallet-bridge-messages/runtime-benchmarks",
 	"pallet-bridge-parachains/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
@@ -82,6 +89,8 @@ try-runtime = [
 	"pallet-bridge-grandpa/try-runtime",
 	"pallet-bridge-messages/try-runtime",
 	"pallet-bridge-parachains/try-runtime",
+	"pallet-transaction-payment/try-runtime",
+	"pallet-utility/try-runtime",
 	"sp-runtime/try-runtime",
 ]
 integrity-test = []
diff --git a/bridges/modules/xcm-bridge-hub/Cargo.toml b/bridges/modules/xcm-bridge-hub/Cargo.toml
index a1c623cb0b387..7d00d7904713c 100644
--- a/bridges/modules/xcm-bridge-hub/Cargo.toml
+++ b/bridges/modules/xcm-bridge-hub/Cargo.toml
@@ -44,6 +44,7 @@ polkadot-parachain-primitives = { workspace = true }
 [features]
 default = ["std"]
 std = [
+	"bp-header-chain/std",
 	"bp-messages/std",
 	"bp-runtime/std",
 	"bp-xcm-bridge-hub/std",
@@ -51,10 +52,13 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"pallet-balances/std",
 	"pallet-bridge-messages/std",
 	"pallet-xcm-bridge-hub-router/std",
+	"polkadot-parachain-primitives/std",
 	"scale-info/std",
 	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"xcm-builder/std",
@@ -67,6 +71,7 @@ runtime-benchmarks = [
 	"pallet-balances/runtime-benchmarks",
 	"pallet-bridge-messages/runtime-benchmarks",
 	"pallet-xcm-bridge-hub-router/runtime-benchmarks",
+	"polkadot-parachain-primitives/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml
index 29514ecccc252..271325b473555 100644
--- a/bridges/primitives/messages/Cargo.toml
+++ b/bridges/primitives/messages/Cargo.toml
@@ -41,5 +41,5 @@ std = [
 	"serde/std",
 	"sp-core/std",
 	"sp-io/std",
-	"sp-std/std"
+	"sp-std/std",
 ]
diff --git a/bridges/primitives/polkadot-core/Cargo.toml b/bridges/primitives/polkadot-core/Cargo.toml
index acae2f431bf20..366ee7aa948e8 100644
--- a/bridges/primitives/polkadot-core/Cargo.toml
+++ b/bridges/primitives/polkadot-core/Cargo.toml
@@ -14,7 +14,9 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 parity-util-mem = { optional = true, workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
+serde = { optional = true, features = [
+	"derive",
+], workspace = true, default-features = true }
 
 # Bridge Dependencies
 
diff --git a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
index 76857c62e9258..ba0c51152bd2f 100644
--- a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
+++ b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
@@ -23,4 +23,10 @@ xcm = { workspace = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "scale-info/std", "sp-core/std", "sp-runtime/std", "xcm/std"]
+std = [
+	"codec/std",
+	"scale-info/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"xcm/std",
+]
diff --git a/bridges/relays/client-substrate/Cargo.toml b/bridges/relays/client-substrate/Cargo.toml
index 969cd73d6194f..6065c23773e3f 100644
--- a/bridges/relays/client-substrate/Cargo.toml
+++ b/bridges/relays/client-substrate/Cargo.toml
@@ -20,8 +20,12 @@ log = { workspace = true }
 num-traits = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 serde_json = { workspace = true }
-scale-info = { features = ["derive"], workspace = true, default-features = true }
-tokio = { features = ["rt-multi-thread"], workspace = true, default-features = true }
+scale-info = { features = [
+	"derive",
+], workspace = true, default-features = true }
+tokio = { features = [
+	"rt-multi-thread",
+], workspace = true, default-features = true }
 thiserror = { workspace = true }
 quick_cache = { workspace = true }
 
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
index 7584c5c640038..51ce5b1800568 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
@@ -28,4 +28,4 @@ testnet-parachains-constants = { features = ["rococo"], workspace = true, defaul
 xcm = { workspace = true }
 
 # Bridges
-bp-bridge-hub-rococo = { workspace = true }
\ No newline at end of file
+bp-bridge-hub-rococo = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
index 0d5b06ed47005..d32f983217069 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
@@ -28,4 +28,4 @@ testnet-parachains-constants = { features = ["westend"], workspace = true, defau
 xcm = { workspace = true }
 
 # Bridges
-bp-bridge-hub-westend = { workspace = true }
\ No newline at end of file
+bp-bridge-hub-westend = { workspace = true }