diff --git a/Cargo.lock b/Cargo.lock
index 4f12c94f3602d..3d2bb55c6770f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -881,7 +881,7 @@ dependencies = [
  "anstyle",
  "bstr",
  "doc-comment",
- "predicates 3.0.3",
+ "predicates",
  "predicates-core",
  "predicates-tree",
  "wait-timeout",
@@ -1567,17 +1567,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "auto_impl"
 version = "1.1.0"
@@ -3108,38 +3097,6 @@ dependencies = [
  "libloading",
 ]
 
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim 0.8.0",
- "textwrap 0.11.0",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "clap"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_derive 3.2.25",
- "clap_lex 0.2.4",
- "indexmap 1.9.3",
- "once_cell",
- "strsim 0.10.0",
- "termcolor",
- "textwrap 0.16.0",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.13"
@@ -3147,7 +3104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
 dependencies = [
  "clap_builder",
- "clap_derive 4.5.13",
+ "clap_derive",
 ]
 
 [[package]]
@@ -3167,8 +3124,8 @@ checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.7.0",
- "strsim 0.11.1",
+ "clap_lex",
+ "strsim",
  "terminal_size",
 ]
 
@@ -3178,20 +3135,7 @@ version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa3c596da3cf0983427b0df0dba359df9182c13bd5b519b585a482b0c351f4e8"
 dependencies = [
- "clap 4.5.13",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 1.0.109",
+ "clap",
 ]
 
 [[package]]
@@ -3206,15 +3150,6 @@ dependencies = [
  "syn 2.0.98",
 ]
 
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
 [[package]]
 name = "clap_lex"
 version = "0.7.0"
@@ -3266,7 +3201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
 dependencies = [
  "termcolor",
- "unicode-width",
+ "unicode-width 0.1.10",
 ]
 
 [[package]]
@@ -3454,13 +3389,12 @@ dependencies = [
 
 [[package]]
 name = "comfy-table"
-version = "7.1.0"
+version = "7.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686"
+checksum = "4a65ebfec4fb190b6f90e944a817d60499ee0744e582530e2c9900a22e591d9a"
 dependencies = [
- "strum 0.25.0",
- "strum_macros 0.25.3",
- "unicode-width",
+ "unicode-segmentation",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -3537,7 +3471,7 @@ dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "unicode-width",
+ "unicode-width 0.1.10",
  "windows-sys 0.52.0",
 ]
 
@@ -4046,7 +3980,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.5.13",
+ "clap",
  "criterion-plot",
  "futures",
  "is-terminal",
@@ -4201,7 +4135,7 @@ dependencies = [
 name = "cumulus-client-cli"
 version = "0.7.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-cli",
@@ -4690,7 +4624,7 @@ name = "cumulus-pov-validator"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.13",
+ "clap",
  "parity-scale-codec",
  "polkadot-node-primitives",
  "polkadot-parachain-primitives",
@@ -5011,7 +4945,7 @@ name = "cumulus-test-service"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "clap 4.5.13",
+ "clap",
  "criterion",
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -5265,7 +5199,7 @@ dependencies = [
  "ident_case",
  "proc-macro2 1.0.93",
  "quote 1.0.38",
- "strsim 0.11.1",
+ "strsim",
  "syn 2.0.98",
 ]
 
@@ -6354,15 +6288,6 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "float-cmp"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "float-ord"
 version = "0.3.2"
@@ -6485,7 +6410,7 @@ dependencies = [
  "Inflector",
  "array-bytes",
  "chrono",
- "clap 4.5.13",
+ "clap",
  "comfy-table",
  "cumulus-client-parachain-inherent",
  "cumulus-primitives-proof-size-hostfunction",
@@ -6622,7 +6547,7 @@ dependencies = [
 name = "frame-election-solution-type-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "frame-election-provider-solution-type",
  "frame-election-provider-support",
  "frame-support",
@@ -6732,7 +6657,7 @@ name = "frame-omni-bencher"
 version = "0.1.0"
 dependencies = [
  "assert_cmd",
- "clap 4.5.13",
+ "clap",
  "cumulus-primitives-proof-size-hostfunction",
  "cumulus-test-runtime",
  "frame-benchmarking-cli",
@@ -7581,15 +7506,6 @@ dependencies = [
  "hashbrown 0.14.5",
 ]
 
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -7602,15 +7518,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -8339,7 +8246,7 @@ dependencies = [
  "instant",
  "number_prefix",
  "portable-atomic",
- "unicode-width",
+ "unicode-width 0.1.10",
 ]
 
 [[package]]
@@ -8375,7 +8282,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -8433,7 +8340,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "rustix 0.38.42",
  "windows-sys 0.48.0",
 ]
@@ -8571,12 +8478,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
-
 [[package]]
 name = "json-patch"
 version = "1.4.0"
@@ -9741,7 +9642,7 @@ dependencies = [
  "hickory-resolver",
  "indexmap 2.7.1",
  "libc",
- "mockall 0.13.1",
+ "mockall",
  "multiaddr 0.17.1",
  "multihash 0.17.0",
  "network-interface",
@@ -10094,7 +9995,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 name = "minimal-template-node"
 version = "0.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "docify",
  "futures",
  "futures-timer",
@@ -10130,7 +10031,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
@@ -10199,21 +10100,6 @@ dependencies = [
  "sp-runtime 31.0.1",
 ]
 
-[[package]]
-name = "mockall"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
-dependencies = [
- "cfg-if",
- "downcast",
- "fragile",
- "lazy_static",
- "mockall_derive 0.11.4",
- "predicates 2.1.5",
- "predicates-tree",
-]
-
 [[package]]
 name = "mockall"
 version = "0.13.1"
@@ -10223,23 +10109,11 @@ dependencies = [
  "cfg-if",
  "downcast",
  "fragile",
- "mockall_derive 0.13.1",
- "predicates 3.0.3",
+ "mockall_derive",
+ "predicates",
  "predicates-tree",
 ]
 
-[[package]]
-name = "mockall_derive"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
-dependencies = [
- "cfg-if",
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "mockall_derive"
 version = "0.13.1"
@@ -10444,7 +10318,6 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc"
 dependencies = [
- "clap 3.2.25",
  "rand 0.8.5",
 ]
 
@@ -10562,11 +10435,11 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.26.4"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "cfg-if",
  "libc",
 ]
@@ -10601,7 +10474,7 @@ version = "0.9.0-dev"
 dependencies = [
  "array-bytes",
  "async-trait",
- "clap 4.5.13",
+ "clap",
  "derive_more 0.99.17",
  "fs_extra",
  "futures",
@@ -10678,7 +10551,7 @@ dependencies = [
 name = "node-runtime-generate-bags"
 version = "3.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "generate-bags",
  "kitchensink-runtime",
 ]
@@ -10687,7 +10560,7 @@ dependencies = [
 name = "node-template-release"
 version = "3.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "flate2",
  "fs_extra",
  "glob",
@@ -10771,12 +10644,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
 
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
 [[package]]
 name = "ntapi"
 version = "0.4.1"
@@ -10922,7 +10789,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
 ]
 
@@ -10991,9 +10858,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
 
 [[package]]
 name = "oorandom"
@@ -11115,12 +10982,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "6.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -12917,7 +12778,7 @@ name = "pallet-revive-eth-rpc"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.13",
+ "clap",
  "env_logger 0.11.3",
  "futures",
  "git2",
@@ -13691,7 +13552,7 @@ dependencies = [
 name = "parachain-template-node"
 version = "0.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "color-print",
  "docify",
  "futures",
@@ -14582,7 +14443,7 @@ name = "polkadot-cli"
 version = "7.0.0"
 dependencies = [
  "cfg-if",
- "clap 4.5.13",
+ "clap",
  "frame-benchmarking-cli",
  "futures",
  "log",
@@ -15439,7 +15300,7 @@ version = "0.1.0"
 dependencies = [
  "assert_cmd",
  "async-trait",
- "clap 4.5.13",
+ "clap",
  "color-print",
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -16526,7 +16387,7 @@ dependencies = [
  "async-trait",
  "bincode",
  "bitvec",
- "clap 4.5.13",
+ "clap",
  "clap-num",
  "color-eyre",
  "colored",
@@ -16628,7 +16489,7 @@ version = "1.0.0"
 dependencies = [
  "assert_matches",
  "async-trait",
- "clap 4.5.13",
+ "clap",
  "color-eyre",
  "futures",
  "futures-timer",
@@ -16768,7 +16629,7 @@ dependencies = [
 name = "polkadot-voter-bags"
 version = "7.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "generate-bags",
  "sp-io 30.0.0",
  "westend-runtime",
@@ -17109,23 +16970,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
-name = "pprof"
-version = "0.12.1"
+name = "pprof2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a"
+checksum = "8961ed0a916b512e565f8070eb0dfa05773dd140160b45ac9a5ad339b557adeb"
 dependencies = [
  "backtrace",
  "cfg-if",
  "findshlibs",
  "libc",
  "log",
- "nix 0.26.4",
+ "nix 0.27.1",
  "once_cell",
  "parking_lot 0.12.3",
  "smallvec",
  "symbolic-demangle",
  "tempfile",
- "thiserror 1.0.65",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -17147,20 +17008,6 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
-[[package]]
-name = "predicates"
-version = "2.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
-dependencies = [
- "difflib",
- "float-cmp",
- "itertools 0.10.5",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
 [[package]]
 name = "predicates"
 version = "3.0.3"
@@ -17559,17 +17406,17 @@ dependencies = [
 
 [[package]]
 name = "pyroscope"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac8a53ce01af1087eaeee6ce7c4fbf50ea4040ab1825c0115c4bafa039644ba9"
+checksum = "d3a5f63b0d2727095db59045e6a0ef3259b28b90d481ae88f0e3d866d0234ce8"
 dependencies = [
- "json",
  "libc",
  "libflate",
  "log",
  "names",
  "prost 0.11.9",
- "reqwest 0.11.27",
+ "reqwest",
+ "serde_json",
  "thiserror 1.0.65",
  "url",
  "winapi",
@@ -17577,12 +17424,12 @@ dependencies = [
 
 [[package]]
 name = "pyroscope_pprofrs"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f010b2a981a7f8449a650f25f309e520b5206ea2d89512dcb146aaa5518ff4"
+checksum = "614a25777053da6bdca9d84a67892490b5a57590248dbdee3d7bf0716252af70"
 dependencies = [
  "log",
- "pprof",
+ "pprof2",
  "pyroscope",
  "thiserror 1.0.65",
 ]
@@ -18130,7 +17977,7 @@ dependencies = [
 name = "remote-ext-tests-bags-list"
 version = "1.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "frame-system",
  "log",
  "pallet-bags-list-remote-tests",
@@ -18141,47 +17988,6 @@ dependencies = [
  "westend-runtime-constants",
 ]
 
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.29",
- "hyper-rustls 0.24.2",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.7",
- "rustls-pemfile 1.0.3",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration 0.5.1",
- "tokio",
- "tokio-rustls 0.24.1",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots 0.25.2",
- "winreg",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.12.9"
@@ -18217,7 +18023,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.1",
+ "sync_wrapper",
  "system-configuration 0.6.1",
  "tokio",
  "tokio-native-tls",
@@ -19132,7 +18938,7 @@ name = "sc-chain-spec"
 version = "28.0.0"
 dependencies = [
  "array-bytes",
- "clap 4.5.13",
+ "clap",
  "docify",
  "log",
  "memmap2 0.9.3",
@@ -19175,7 +18981,7 @@ version = "0.36.0"
 dependencies = [
  "array-bytes",
  "chrono",
- "clap 4.5.13",
+ "clap",
  "fdlimit",
  "futures",
  "futures-timer",
@@ -19280,7 +19086,7 @@ dependencies = [
  "async-trait",
  "futures",
  "log",
- "mockall 0.11.4",
+ "mockall",
  "parking_lot 0.12.3",
  "sc-client-api",
  "sc-network-types",
@@ -19875,7 +19681,7 @@ dependencies = [
  "linked_hash_set",
  "litep2p",
  "log",
- "mockall 0.11.4",
+ "mockall",
  "multistream-select",
  "once_cell",
  "parity-scale-codec",
@@ -20005,7 +19811,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "log",
- "mockall 0.11.4",
+ "mockall",
  "parity-scale-codec",
  "prost 0.12.6",
  "prost-build",
@@ -20447,7 +20253,7 @@ dependencies = [
 name = "sc-storage-monitor"
 version = "0.16.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "fs4",
  "log",
  "sp-core 28.0.0",
@@ -22114,7 +21920,7 @@ dependencies = [
 name = "solochain-template-node"
 version = "0.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "frame-benchmarking-cli",
  "frame-metadata-hash-extension",
  "frame-system",
@@ -23171,7 +22977,7 @@ dependencies = [
 name = "sp-npos-elections-fuzzer"
 version = "2.0.0-alpha.5"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "honggfuzz",
  "rand 0.8.5",
  "sp-npos-elections",
@@ -24202,7 +24008,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 name = "staging-chain-spec-builder"
 version = "1.6.1"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "cmd_lib",
  "docify",
  "log",
@@ -24219,7 +24025,7 @@ version = "3.0.0-dev"
 dependencies = [
  "array-bytes",
  "assert_cmd",
- "clap 4.5.13",
+ "clap",
  "clap_complete",
  "criterion",
  "futures",
@@ -24255,7 +24061,7 @@ dependencies = [
 name = "staging-node-inspect"
 version = "0.12.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "parity-scale-codec",
  "sc-cli",
  "sc-client-api",
@@ -24413,48 +24219,12 @@ dependencies = [
  "unicode-properties",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "structopt"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
-dependencies = [
- "clap 2.34.0",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck 0.3.3",
- "proc-macro-error",
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "strum"
 version = "0.24.1"
@@ -24464,12 +24234,6 @@ dependencies = [
  "strum_macros 0.24.3",
 ]
 
-[[package]]
-name = "strum"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
-
 [[package]]
 name = "strum"
 version = "0.26.3"
@@ -24492,19 +24256,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "strum_macros"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.93",
- "quote 1.0.38",
- "rustversion",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "strum_macros"
 version = "0.26.4"
@@ -24522,7 +24273,7 @@ dependencies = [
 name = "subkey"
 version = "9.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "sc-cli",
 ]
 
@@ -24681,6 +24432,7 @@ dependencies = [
  "bp-polkadot-core",
  "bp-relayers",
  "bp-runtime",
+ "clap",
  "equivocation-detector",
  "finality-relay",
  "frame-support",
@@ -24706,7 +24458,6 @@ dependencies = [
  "sp-core 28.0.0",
  "sp-runtime 31.0.1",
  "sp-trie 29.0.0",
- "structopt",
  "strum 0.26.3",
  "thiserror 1.0.65",
 ]
@@ -24881,8 +24632,8 @@ dependencies = [
  "async-trait",
  "average",
  "chrono",
- "clap 4.5.13",
- "clap_derive 4.5.13",
+ "clap",
+ "clap_derive",
  "ctrlc",
  "futures",
  "futures-util",
@@ -24964,7 +24715,7 @@ dependencies = [
  "log",
  "num-format",
  "rand 0.8.5",
- "reqwest 0.12.9",
+ "reqwest",
  "scale-info",
  "semver 1.0.18",
  "serde",
@@ -25392,21 +25143,21 @@ dependencies = [
 
 [[package]]
 name = "symbolic-common"
-version = "12.3.0"
+version = "12.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167a4ffd7c35c143fd1030aa3c2caf76ba42220bd5a6b5f4781896434723b8c3"
+checksum = "66135c8273581acaab470356f808a1c74a707fe7ec24728af019d7247e089e71"
 dependencies = [
  "debugid",
- "memmap2 0.5.10",
+ "memmap2 0.9.3",
  "stable_deref_trait",
  "uuid",
 ]
 
 [[package]]
 name = "symbolic-demangle"
-version = "12.3.0"
+version = "12.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e378c50e80686c1c5c205674e1f86a2858bec3d2a7dfdd690331a8a19330f293"
+checksum = "42bcacd080282a72e795864660b148392af7babd75691d5ae9a3b77e29c98c77"
 dependencies = [
  "cpp_demangle 0.4.3",
  "rustc-demangle",
@@ -25458,12 +25209,6 @@ dependencies = [
  "syn 2.0.98",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.1"
@@ -25678,7 +25423,7 @@ dependencies = [
 name = "test-parachain-adder-collator"
 version = "1.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "futures",
  "futures-timer",
  "log",
@@ -25725,7 +25470,7 @@ dependencies = [
 name = "test-parachain-undying-collator"
 version = "1.0.0"
 dependencies = [
- "clap 4.5.13",
+ "clap",
  "futures",
  "futures-timer",
  "log",
@@ -25783,21 +25528,6 @@ dependencies = [
  "westend-runtime-constants",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
 [[package]]
 name = "thiserror"
 version = "1.0.65"
@@ -26658,6 +26388,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
@@ -26849,12 +26585,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -27423,7 +27153,7 @@ checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a"
 dependencies = [
  "leb128",
  "memchr",
- "unicode-width",
+ "unicode-width 0.1.10",
  "wasm-encoder",
 ]
 
@@ -28511,12 +28241,12 @@ version = "1.0.0"
 dependencies = [
  "futures-util",
  "parity-scale-codec",
- "reqwest 0.12.9",
+ "reqwest",
  "serde",
  "serde_json",
  "thiserror 1.0.65",
  "tokio",
- "tokio-tungstenite 0.20.1",
+ "tokio-tungstenite 0.26.2",
  "tracing-gum",
  "url",
 ]
@@ -28531,7 +28261,7 @@ dependencies = [
  "lazy_static",
  "multiaddr 0.18.1",
  "regex",
- "reqwest 0.12.9",
+ "reqwest",
  "serde",
  "serde_json",
  "thiserror 1.0.65",
@@ -28558,7 +28288,7 @@ dependencies = [
  "multiaddr 0.18.1",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.9",
+ "reqwest",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -28601,7 +28331,7 @@ dependencies = [
  "kube",
  "nix 0.29.0",
  "regex",
- "reqwest 0.12.9",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -28647,7 +28377,7 @@ dependencies = [
  "nix 0.29.0",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.9",
+ "reqwest",
  "thiserror 1.0.65",
  "tokio",
  "tracing",
diff --git a/Cargo.toml b/Cargo.toml
index 5a38f782bd817..457f0e814dcba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -701,7 +701,7 @@ collectives-westend-runtime = { path = "cumulus/parachains/runtimes/collectives/
 color-eyre = { version = "0.6.3", default-features = false }
 color-print = { version = "0.3.4" }
 colored = { version = "2.0.4" }
-comfy-table = { version = "7.1.0", default-features = false }
+comfy-table = { version = "7.1.4", default-features = false }
 console = { version = "0.15.8" }
 const-hex = { version = "1.10.0", default-features = false }
 coretime-rococo-emulated-chain = { path = "cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-rococo" }
@@ -876,7 +876,7 @@ mixnet = { version = "0.7.0" }
 mmr-gadget = { path = "substrate/client/merkle-mountain-range", default-features = false }
 mmr-lib = { version = "0.5.2", package = "ckb-merkle-mountain-range" }
 mmr-rpc = { path = "substrate/client/merkle-mountain-range/rpc", default-features = false }
-mockall = { version = "0.11.3" }
+mockall = { version = "0.13.1" }
 multiaddr = { version = "0.18.1" }
 multihash = { version = "0.19.1", default-features = false }
 multihash-codetable = { version = "0.1.1" }
@@ -1123,8 +1123,8 @@ prometheus-endpoint = { path = "substrate/utils/prometheus", default-features =
 prometheus-parse = { version = "0.2.2" }
 prost = { version = "0.12.4" }
 prost-build = { version = "0.13.2" }
-pyroscope = { version = "0.5.7" }
-pyroscope_pprofrs = { version = "0.2.7" }
+pyroscope = { version = "0.5.8" }
+pyroscope_pprofrs = { version = "0.2.8" }
 quick_cache = { version = "0.3" }
 quickcheck = { version = "1.0.3", default-features = false }
 quote = { version = "1.0.37" }
@@ -1318,7 +1318,6 @@ ssz_rs = { version = "0.9.0", default-features = false }
 ssz_rs_derive = { version = "0.9.0", default-features = false }
 static_assertions = { version = "1.1.0", default-features = false }
 static_init = { version = "1.0.3" }
-structopt = { version = "0.3" }
 strum = { version = "0.26.3", default-features = false }
 subkey = { path = "substrate/bin/utils/subkey", default-features = false }
 substrate-bip39 = { path = "substrate/utils/substrate-bip39", default-features = false }
@@ -1359,7 +1358,7 @@ tokio = { version = "1.40.0", default-features = false }
 tokio-retry = { version = "0.3.0" }
 tokio-stream = { version = "0.1.14" }
 tokio-test = { version = "0.4.4" }
-tokio-tungstenite = { version = "0.20.1" }
+tokio-tungstenite = { version = "0.26.2" }
 tokio-util = { version = "0.7.8" }
 toml = { version = "0.8.12" }
 toml_edit = { version = "0.19" }
diff --git a/bridges/relays/lib-substrate-relay/Cargo.toml b/bridges/relays/lib-substrate-relay/Cargo.toml
index b418a2a3abb8a..f18c41c3af546 100644
--- a/bridges/relays/lib-substrate-relay/Cargo.toml
+++ b/bridges/relays/lib-substrate-relay/Cargo.toml
@@ -14,13 +14,13 @@ workspace = true
 anyhow = { workspace = true }
 async-std = { workspace = true }
 async-trait = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
 codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 hex = { workspace = true, default-features = true }
 log = { workspace = true }
 num-traits = { workspace = true, default-features = true }
 rbtag = { workspace = true }
-structopt = { workspace = true }
 strum = { features = ["derive"], workspace = true, default-features = true }
 thiserror = { workspace = true }
 
diff --git a/bridges/relays/lib-substrate-relay/src/cli/chain_schema.rs b/bridges/relays/lib-substrate-relay/src/cli/chain_schema.rs
index ae00b243c0c43..f6b9ad04b01e6 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/chain_schema.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/chain_schema.rs
@@ -16,8 +16,8 @@
 
 //! Primitives related to chain CLI options.
 
+use clap::Parser;
 use relay_substrate_client::{AccountKeyPairOf, ChainWithTransactions};
-use structopt::StructOpt;
 use strum::{EnumString, VariantNames};
 
 use relay_substrate_client::{ChainRuntimeVersion, ChainWithRuntimeVersion, SimpleRuntimeVersion};
@@ -25,7 +25,7 @@ use relay_substrate_client::{ChainRuntimeVersion, ChainWithRuntimeVersion, Simpl
 use crate::TransactionParams;
 
 #[doc = "Runtime version params."]
-#[derive(StructOpt, Debug, PartialEq, Eq, Clone, Copy, EnumString, VariantNames)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Parser, EnumString, VariantNames)]
 pub enum RuntimeVersionType {
 	/// Auto query version from chain
 	Auto,
@@ -41,16 +41,16 @@ macro_rules! declare_chain_runtime_version_params_cli_schema {
 	($chain:ident, $chain_prefix:ident) => {
 		bp_runtime::paste::item! {
 			#[doc = $chain " runtime version params."]
-			#[derive(StructOpt, Debug, PartialEq, Eq, Clone, Copy)]
+			#[derive(Debug, PartialEq, Eq, Clone, Copy, Parser)]
 			pub struct [<$chain RuntimeVersionParams>] {
 				#[doc = "The type of runtime version for chain " $chain]
-				#[structopt(long, default_value = "Bundle")]
+				#[arg(long, default_value = "Bundle")]
 				pub [<$chain_prefix _version_mode>]: RuntimeVersionType,
 				#[doc = "The custom sepc_version for chain " $chain]
-				#[structopt(long)]
+				#[arg(long)]
 				pub [<$chain_prefix _spec_version>]: Option<u32>,
 				#[doc = "The custom transaction_version for chain " $chain]
-				#[structopt(long)]
+				#[arg(long)]
 				pub [<$chain_prefix _transaction_version>]: Option<u32>,
 			}
 
@@ -96,13 +96,13 @@ macro_rules! declare_chain_connection_params_cli_schema {
 			// remove all obsolete arguments (separate URI components)
 
 			#[doc = $chain " connection params."]
-			#[derive(StructOpt, Debug, PartialEq, Eq, Clone)]
+			#[derive(Debug, PartialEq, Eq, Clone, Parser)]
 			pub struct [<$chain ConnectionParams>] {
 				#[doc = "WS endpoint of " $chain ": full URI."]
-				#[structopt(long)]
+				#[arg(long)]
 				pub [<$chain_prefix _uri>]: String,
 				#[doc = "Custom runtime version"]
-				#[structopt(flatten)]
+				#[command(flatten)]
 				pub [<$chain_prefix _runtime_version>]: [<$chain RuntimeVersionParams>],
 			}
 
@@ -133,24 +133,24 @@ macro_rules! declare_chain_signing_params_cli_schema {
 	($chain:ident, $chain_prefix:ident) => {
 		bp_runtime::paste::item! {
 			#[doc = $chain " signing params."]
-			#[derive(StructOpt, Debug, PartialEq, Eq, Clone)]
+			#[derive(Debug, PartialEq, Eq, Clone, Parser)]
 			pub struct [<$chain SigningParams>] {
 				#[doc = "The SURI of secret key to use when transactions are submitted to the " $chain " node."]
-				#[structopt(long)]
+				#[arg(long)]
 				pub [<$chain_prefix _signer>]: Option<String>,
 				#[doc = "The password for the SURI of secret key to use when transactions are submitted to the " $chain " node."]
-				#[structopt(long)]
+				#[arg(long)]
 				pub [<$chain_prefix _signer_password>]: Option<String>,
 
 				#[doc = "Path to the file, that contains SURI of secret key to use when transactions are submitted to the " $chain " node. Can be overridden with " $chain_prefix "_signer option."]
-				#[structopt(long)]
+				#[arg(long)]
 				pub [<$chain_prefix _signer_file>]: Option<std::path::PathBuf>,
 				#[doc = "Path to the file, that password for the SURI of secret key to use when transactions are submitted to the " $chain " node. Can be overridden with " $chain_prefix "_signer_password option."]
-				#[structopt(long)]
+				#[arg(long)]
 				pub [<$chain_prefix _signer_password_file>]: Option<std::path::PathBuf>,
 
 				#[doc = "Transactions mortality period, in blocks. MUST be a power of two in [4; 65536] range. MAY NOT be larger than `BlockHashCount` parameter of the chain system module."]
-				#[structopt(long)]
+				#[arg(long)]
 				pub [<$chain_prefix _transactions_mortality>]: Option<u32>,
 			}
 
diff --git a/bridges/relays/lib-substrate-relay/src/cli/detect_equivocations.rs b/bridges/relays/lib-substrate-relay/src/cli/detect_equivocations.rs
index 3921685d9e8ad..6f2796f998c72 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/detect_equivocations.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/detect_equivocations.rs
@@ -23,19 +23,19 @@ use crate::{
 };
 
 use async_trait::async_trait;
+use clap::Parser;
 use relay_substrate_client::{ChainWithTransactions, Client};
-use structopt::StructOpt;
 
 /// Start equivocation detection loop.
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct DetectEquivocationsParams {
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source: SourceConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source_sign: SourceSigningParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target: TargetConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	prometheus_params: PrometheusParams,
 }
 
diff --git a/bridges/relays/lib-substrate-relay/src/cli/init_bridge.rs b/bridges/relays/lib-substrate-relay/src/cli/init_bridge.rs
index bf7c86437ba77..b5ac05afe5668 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/init_bridge.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/init_bridge.rs
@@ -24,21 +24,21 @@ use crate::{
 	finality_base::engine::Engine,
 };
 use bp_runtime::Chain as ChainBase;
+use clap::Parser;
 use relay_substrate_client::{AccountKeyPairOf, Chain, UnsignedTransaction};
 use sp_core::Pair;
-use structopt::StructOpt;
 
 /// Bridge initialization params.
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct InitBridgeParams {
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source: SourceConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target: TargetConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target_sign: TargetSigningParams,
 	/// Generates all required data, but does not submit extrinsic
-	#[structopt(long)]
+	#[arg(long)]
 	dry_run: bool,
 }
 
diff --git a/bridges/relays/lib-substrate-relay/src/cli/mod.rs b/bridges/relays/lib-substrate-relay/src/cli/mod.rs
index d7aa38f1f2baf..283d3c70e87ac 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/mod.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/mod.rs
@@ -16,10 +16,10 @@
 
 //! Deal with CLI args of substrate-to-substrate relay.
 
+use clap::Parser;
 use rbtag::BuildInfo;
 use sp_runtime::traits::TryConvert;
 use std::str::FromStr;
-use structopt::StructOpt;
 
 pub mod bridge;
 pub mod chain_schema;
@@ -57,16 +57,16 @@ impl FromStr for HexLaneId {
 }
 
 /// Prometheus metrics params.
-#[derive(Clone, Debug, PartialEq, StructOpt)]
+#[derive(Clone, Debug, PartialEq, Parser)]
 pub struct PrometheusParams {
 	/// Do not expose a Prometheus metric endpoint.
-	#[structopt(long)]
+	#[arg(long)]
 	pub no_prometheus: bool,
 	/// Expose Prometheus endpoint at given interface.
-	#[structopt(long, default_value = "127.0.0.1")]
+	#[arg(long, default_value = "127.0.0.1")]
 	pub prometheus_host: String,
 	/// Expose Prometheus endpoint at given port.
-	#[structopt(long, default_value = "9616")]
+	#[arg(long, default_value = "9616")]
 	pub prometheus_port: u16,
 }
 
diff --git a/bridges/relays/lib-substrate-relay/src/cli/relay_headers.rs b/bridges/relays/lib-substrate-relay/src/cli/relay_headers.rs
index 308b041c46f79..305c522d5530f 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/relay_headers.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/relay_headers.rs
@@ -17,7 +17,7 @@
 //! Primitives for exposing the headers relaying functionality in the CLI.
 
 use async_trait::async_trait;
-use structopt::StructOpt;
+use clap::Parser;
 
 use relay_utils::{
 	metrics::{GlobalMetrics, StandaloneMetric},
@@ -32,38 +32,38 @@ use crate::{
 use relay_substrate_client::Client;
 
 /// Chain headers relaying params.
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct RelayHeadersParams {
 	/// If passed, only mandatory headers (headers that are changing the GRANDPA authorities set)
 	/// are relayed.
-	#[structopt(long)]
+	#[arg(long)]
 	only_mandatory_headers: bool,
 	/// If passed, only free headers (mandatory and every Nth header, if configured in runtime)
 	/// are relayed. Overrides `only_mandatory_headers`.
-	#[structopt(long)]
+	#[arg(long)]
 	only_free_headers: bool,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source: SourceConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target: TargetConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target_sign: TargetSigningParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	prometheus_params: PrometheusParams,
 }
 
 /// Single header relaying params.
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct RelayHeaderParams {
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source: SourceConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target: TargetConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target_sign: TargetSigningParams,
 	/// Number of the source chain header that we want to relay. It must have a persistent
 	/// storage proof at the [`Self::source`] node, otherwise the command will fail.
-	#[structopt(long)]
+	#[arg(long)]
 	number: u128,
 }
 
diff --git a/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/mod.rs b/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/mod.rs
index 227c9dc44919b..38f3e848f5786 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/mod.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/mod.rs
@@ -31,8 +31,8 @@ pub mod relay_to_relay;
 pub mod relay_to_parachain;
 
 use async_trait::async_trait;
+use clap::Parser;
 use std::{fmt::Debug, marker::PhantomData, sync::Arc};
-use structopt::StructOpt;
 
 use futures::{FutureExt, TryFutureExt};
 
@@ -55,20 +55,20 @@ use sp_core::Pair;
 use sp_runtime::traits::TryConvert;
 
 /// Parameters that have the same names across all bridges.
-#[derive(Debug, PartialEq, StructOpt)]
+#[derive(Debug, PartialEq, Parser)]
 pub struct HeadersAndMessagesSharedParams {
 	/// Hex-encoded lane identifiers that should be served by the complex relay.
-	#[structopt(long)]
+	#[arg(long)]
 	pub lane: Vec<HexLaneId>,
 	/// If passed, only mandatory headers (headers that are changing the GRANDPA authorities set)
 	/// are relayed.
-	#[structopt(long)]
+	#[arg(long)]
 	pub only_mandatory_headers: bool,
 	/// If passed, only free headers (mandatory and every Nth header, if configured in runtime)
 	/// are relayed. Overrides `only_mandatory_headers`.
-	#[structopt(long)]
+	#[arg(long)]
 	pub only_free_headers: bool,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	/// Prometheus metrics params.
 	pub prometheus_params: PrometheusParams,
 }
@@ -413,7 +413,7 @@ mod tests {
 			Polkadot
 		);
 
-		let res = BridgeHubKusamaBridgeHubPolkadotHeadersAndMessages::from_iter(vec![
+		let res = BridgeHubKusamaBridgeHubPolkadotHeadersAndMessages::parse_from(vec![
 			"bridge-hub-kusama-bridge-hub-polkadot-headers-and-messages",
 			"--bridge-hub-kusama-uri",
 			"ws://bridge-hub-kusama-node-collator1:9944",
diff --git a/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/parachain_to_parachain.rs b/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/parachain_to_parachain.rs
index e8b797f84fa51..14e97f5e11944 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/parachain_to_parachain.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/parachain_to_parachain.rs
@@ -65,28 +65,28 @@ macro_rules! declare_parachain_to_parachain_bridge_schema {
 	($left_parachain:ident, $left_chain:ident, $right_parachain:ident, $right_chain:ident) => {
 		bp_runtime::paste::item! {
 			#[doc = $left_parachain ", " $left_chain ", " $right_parachain " and " $right_chain " headers+parachains+messages relay params."]
-			#[derive(Debug, PartialEq, StructOpt)]
+			#[derive(Debug, PartialEq, Parser)]
 			pub struct [<$left_parachain $right_parachain HeadersAndMessages>] {
 				// shared parameters
-				#[structopt(flatten)]
+				#[command(flatten)]
 				shared: HeadersAndMessagesSharedParams,
 
-				#[structopt(flatten)]
+				#[command(flatten)]
 				left: [<$left_parachain ConnectionParams>],
 				// default signer, which is always used to sign messages relay transactions on the left chain
-				#[structopt(flatten)]
+				#[command(flatten)]
 				left_sign: [<$left_parachain SigningParams>],
 
-				#[structopt(flatten)]
+				#[command(flatten)]
 				left_relay: [<$left_chain ConnectionParams>],
 
-				#[structopt(flatten)]
+				#[command(flatten)]
 				right: [<$right_parachain ConnectionParams>],
 				// default signer, which is always used to sign messages relay transactions on the right chain
-				#[structopt(flatten)]
+				#[command(flatten)]
 				right_sign: [<$right_parachain SigningParams>],
 
-				#[structopt(flatten)]
+				#[command(flatten)]
 				right_relay: [<$right_chain ConnectionParams>],
 			}
 
diff --git a/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/relay_to_parachain.rs b/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/relay_to_parachain.rs
index f9884ee197b40..7637f2290987f 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/relay_to_parachain.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/relay_to_parachain.rs
@@ -65,25 +65,25 @@ macro_rules! declare_relay_to_parachain_bridge_schema {
 	($left_chain:ident, $right_parachain:ident, $right_chain:ident) => {
 		bp_runtime::paste::item! {
 			#[doc = $left_chain ", " $right_parachain " and " $right_chain " headers+parachains+messages relay params."]
-			#[derive(Debug, PartialEq, StructOpt)]
+			#[derive(Debug, PartialEq, Parser)]
 			pub struct [<$left_chain $right_parachain HeadersAndMessages>] {
 				// shared parameters
-				#[structopt(flatten)]
+				#[command(flatten)]
 				shared: HeadersAndMessagesSharedParams,
 
-				#[structopt(flatten)]
+				#[command(flatten)]
 				left: [<$left_chain ConnectionParams>],
 				// default signer, which is always used to sign messages relay transactions on the left chain
-				#[structopt(flatten)]
+				#[command(flatten)]
 				left_sign: [<$left_chain SigningParams>],
 
-				#[structopt(flatten)]
+				#[command(flatten)]
 				right: [<$right_parachain ConnectionParams>],
 				// default signer, which is always used to sign messages relay transactions on the right chain
-				#[structopt(flatten)]
+				#[command(flatten)]
 				right_sign: [<$right_parachain SigningParams>],
 
-				#[structopt(flatten)]
+				#[command(flatten)]
 				right_relay: [<$right_chain ConnectionParams>],
 			}
 
diff --git a/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/relay_to_relay.rs b/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/relay_to_relay.rs
index 3f8c8bb40c99c..605c1eafb70f3 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/relay_to_relay.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/relay_headers_and_messages/relay_to_relay.rs
@@ -53,20 +53,20 @@ macro_rules! declare_relay_to_relay_bridge_schema {
 	($left_chain:ident, $right_chain:ident) => {
 		bp_runtime::paste::item! {
 			#[doc = $left_chain " and " $right_chain " headers+messages relay params."]
-			#[derive(Debug, PartialEq, StructOpt)]
+			#[derive(Debug, PartialEq, Parser)]
 			pub struct [<$left_chain $right_chain HeadersAndMessages>] {
-				#[structopt(flatten)]
+				#[command(flatten)]
 				shared: HeadersAndMessagesSharedParams,
 
-				#[structopt(flatten)]
+				#[command(flatten)]
 				left: [<$left_chain ConnectionParams>],
 				// default signer, which is always used to sign messages relay transactions on the left chain
-				#[structopt(flatten)]
+				#[command(flatten)]
 				left_sign: [<$left_chain SigningParams>],
 
-				#[structopt(flatten)]
+				#[command(flatten)]
 				right: [<$right_chain ConnectionParams>],
-				#[structopt(flatten)]
+				#[command(flatten)]
 				// default signer, which is always used to sign messages relay transactions on the right chain
 				right_sign: [<$right_chain SigningParams>],
 			}
diff --git a/bridges/relays/lib-substrate-relay/src/cli/relay_messages.rs b/bridges/relays/lib-substrate-relay/src/cli/relay_messages.rs
index 71d3adc078e2b..ec04304787557 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/relay_messages.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/relay_messages.rs
@@ -23,8 +23,8 @@ use crate::{
 };
 
 use async_trait::async_trait;
+use clap::Parser;
 use sp_core::Pair;
-use structopt::StructOpt;
 
 use bp_messages::MessageNonce;
 use bp_runtime::HeaderIdProvider;
@@ -36,67 +36,67 @@ use relay_utils::UniqueSaturatedInto;
 use sp_runtime::traits::TryConvert;
 
 /// Messages relaying params.
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct RelayMessagesParams {
 	/// Hex-encoded lane id that should be served by the relay.
-	#[structopt(long)]
+	#[arg(long)]
 	lane: HexLaneId,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source: SourceConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source_sign: SourceSigningParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target: TargetConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target_sign: TargetSigningParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	prometheus_params: PrometheusParams,
 }
 
 /// Messages range relaying params.
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct RelayMessagesRangeParams {
 	/// Number of the source chain header that we will use to prepare a messages proof.
 	/// This header must be previously proved to the target chain.
-	#[structopt(long)]
+	#[arg(long)]
 	at_source_block: u128,
 	/// Hex-encoded lane id that should be served by the relay.
-	#[structopt(long)]
+	#[arg(long)]
 	lane: HexLaneId,
 	/// Nonce (inclusive) of the first message to relay.
-	#[structopt(long)]
+	#[arg(long)]
 	messages_start: MessageNonce,
 	/// Nonce (inclusive) of the last message to relay.
-	#[structopt(long)]
+	#[arg(long)]
 	messages_end: MessageNonce,
 	/// Whether the outbound lane state proof should be included into transaction.
-	#[structopt(long)]
+	#[arg(long)]
 	outbound_state_proof_required: bool,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source: SourceConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source_sign: SourceSigningParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target: TargetConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target_sign: TargetSigningParams,
 }
 
 /// Messages delivery confirmation relaying params.
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct RelayMessagesDeliveryConfirmationParams {
 	/// Number of the target chain header that we will use to prepare a messages
 	/// delivery proof. This header must be previously proved to the source chain.
-	#[structopt(long)]
+	#[arg(long)]
 	at_target_block: u128,
 	/// Hex-encoded lane id that should be served by the relay.
-	#[structopt(long)]
+	#[arg(long)]
 	lane: HexLaneId,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source: SourceConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source_sign: SourceSigningParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target: TargetConnectionParams,
 }
 
diff --git a/bridges/relays/lib-substrate-relay/src/cli/relay_parachains.rs b/bridges/relays/lib-substrate-relay/src/cli/relay_parachains.rs
index 83285b69f7015..65987e7d45877 100644
--- a/bridges/relays/lib-substrate-relay/src/cli/relay_parachains.rs
+++ b/bridges/relays/lib-substrate-relay/src/cli/relay_parachains.rs
@@ -20,11 +20,11 @@ use async_std::sync::Mutex;
 use async_trait::async_trait;
 use bp_polkadot_core::BlockNumber as RelayBlockNumber;
 use bp_runtime::HeaderIdProvider;
+use clap::Parser;
 use parachains_relay::parachains_loop::{AvailableHeader, SourceClient, TargetClient};
 use relay_substrate_client::{Client, Parachain};
 use relay_utils::metrics::{GlobalMetrics, StandaloneMetric};
 use std::sync::Arc;
-use structopt::StructOpt;
 
 use crate::{
 	cli::{
@@ -38,34 +38,34 @@ use crate::{
 };
 
 /// Parachains heads relaying params.
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct RelayParachainsParams {
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source: SourceConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target: TargetConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target_sign: TargetSigningParams,
 	/// If passed, only free headers (those, available at "free" relay chain headers)
 	/// are relayed.
-	#[structopt(long)]
+	#[arg(long)]
 	only_free_headers: bool,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	prometheus_params: PrometheusParams,
 }
 
 /// Single parachains head relaying params.
-#[derive(StructOpt)]
+#[derive(Parser)]
 pub struct RelayParachainHeadParams {
-	#[structopt(flatten)]
+	#[command(flatten)]
 	source: SourceConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target: TargetConnectionParams,
-	#[structopt(flatten)]
+	#[command(flatten)]
 	target_sign: TargetSigningParams,
 	/// Prove parachain head at that relay block number. This relay header must be previously
 	/// proved to the target chain.
-	#[structopt(long)]
+	#[arg(long)]
 	at_relay_block: RelayBlockNumber,
 }
 
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index ded8157ad90ec..8b62fb5b536a1 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -41,7 +41,7 @@ polkadot-node-core-pvf-common = { workspace = true, default-features = true }
 polkadot-node-core-pvf-execute-worker = { workspace = true, default-features = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-tikv-jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_supported_platforms"] }
+tikv-jemallocator = { workspace = true, features = ["unprefixed_malloc_on_supported_platforms"] }
 
 [dev-dependencies]
 assert_cmd = { workspace = true }
diff --git a/polkadot/node/core/pvf/Cargo.toml b/polkadot/node/core/pvf/Cargo.toml
index f47f7b7342854..2293c4384a199 100644
--- a/polkadot/node/core/pvf/Cargo.toml
+++ b/polkadot/node/core/pvf/Cargo.toml
@@ -65,9 +65,9 @@ test-parachain-adder = { workspace = true }
 test-parachain-halt = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dev-dependencies]
-libc = "0.2.155"
-procfs = "0.16.0"
-rusty-fork = "0.3.0"
+libc = { workspace = true }
+procfs = { workspace = true }
+rusty-fork = { workspace = true, default-features = true }
 sc-sysinfo = { workspace = true, default-features = true }
 
 [[bench]]
diff --git a/polkadot/node/core/pvf/common/Cargo.toml b/polkadot/node/core/pvf/common/Cargo.toml
index d058d582fc266..1606aceb58c27 100644
--- a/polkadot/node/core/pvf/common/Cargo.toml
+++ b/polkadot/node/core/pvf/common/Cargo.toml
@@ -35,10 +35,10 @@ sp-io = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-landlock = "0.3.0"
+landlock = { workspace = true }
 
 [target.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.dependencies]
-seccompiler = "0.4.0"
+seccompiler = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
diff --git a/polkadot/node/core/pvf/prepare-worker/Cargo.toml b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
index aa551c196c37d..d38a7f8a80e11 100644
--- a/polkadot/node/core/pvf/prepare-worker/Cargo.toml
+++ b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
@@ -33,8 +33,8 @@ sc-executor-wasmtime = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-tikv-jemallocator = "0.5.0"
-tikv-jemalloc-ctl = "0.5.0"
+tikv-jemallocator = { workspace = true }
+tikv-jemalloc-ctl = { workspace = true }
 
 [features]
 builder = []
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index fd7f1e039247e..6487e600ed445 100644
--- a/polkadot/node/overseer/Cargo.toml
+++ b/polkadot/node/overseer/Cargo.toml
@@ -38,7 +38,7 @@ polkadot-primitives-test-helpers = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-tikv-jemalloc-ctl = "0.5.0"
+tikv-jemalloc-ctl = { workspace = true }
 
 [features]
 default = ["futures_channel"]
diff --git a/polkadot/node/primitives/Cargo.toml b/polkadot/node/primitives/Cargo.toml
index d138b77dea8fb..505a6b6873748 100644
--- a/polkadot/node/primitives/Cargo.toml
+++ b/polkadot/node/primitives/Cargo.toml
@@ -32,7 +32,7 @@ sp-runtime = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-zstd = { version = "0.12.4", default-features = false }
+zstd = { workspace = true, default-features = false }
 
 [dev-dependencies]
 polkadot-erasure-coding = { workspace = true, default-features = true }
diff --git a/polkadot/node/zombienet-backchannel/src/lib.rs b/polkadot/node/zombienet-backchannel/src/lib.rs
index 080dcf1c2b75d..53f31a9e0b404 100644
--- a/polkadot/node/zombienet-backchannel/src/lib.rs
+++ b/polkadot/node/zombienet-backchannel/src/lib.rs
@@ -128,7 +128,7 @@ impl ZombienetBackchannel {
 			tokio::spawn(async move {
 				while let Ok(item) = rx_relay.recv().await {
 					if write
-						.send(Message::Text(serde_json::to_string(&item).unwrap()))
+						.send(Message::Text(serde_json::to_string(&item).unwrap().into()))
 						.await
 						.is_err()
 					{
diff --git a/templates/parachain/Cargo.toml b/templates/parachain/Cargo.toml
index 84b9d5e29bbe8..eaab7734297a3 100644
--- a/templates/parachain/Cargo.toml
+++ b/templates/parachain/Cargo.toml
@@ -10,7 +10,7 @@ edition.workspace = true
 publish = false
 
 [dependencies]
-docify = "0.2.9"
+docify = { workspace = true }
 
 [features]
 generate-readme = []