diff --git a/Cargo.lock b/Cargo.lock
index c7a9f93826..ae4b7e2be0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1122,9 +1122,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.1.10"
+version = "3.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3124f3f75ce09e22d1410043e1e24f2ecc44fad3afe4f08408f1f7663d68da2b"
+checksum = "7c167e37342afc5f33fd87bbc870cedd020d2a6dffa05d45ccd9241fbdd146db"
 dependencies = [
  "atty",
  "bitflags",
@@ -1505,7 +1505,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-cli"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "clap",
  "sc-cli",
@@ -1516,7 +1516,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-collator"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
@@ -1540,7 +1540,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-aura"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "async-trait",
  "cumulus-client-consensus-common",
@@ -1569,7 +1569,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-common"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -1590,7 +1590,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-relay-chain"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "async-trait",
  "cumulus-client-consensus-common",
@@ -1614,7 +1614,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-network"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -1639,7 +1639,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-pov-recovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
@@ -1663,7 +1663,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-service"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -1693,7 +1693,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-aura-ext"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -1711,7 +1711,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "cumulus-pallet-parachain-system-proc-macro",
  "cumulus-primitives-core",
@@ -1741,7 +1741,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
@@ -1752,7 +1752,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1766,7 +1766,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -1784,7 +1784,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-core"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -1800,7 +1800,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1823,7 +1823,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-timestamp"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "cumulus-primitives-core",
  "futures 0.3.21",
@@ -1836,7 +1836,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1864,7 +1864,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1888,7 +1888,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-rpc-interface"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "async-trait",
  "backoff",
@@ -1914,7 +1914,7 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
@@ -1983,7 +1983,7 @@ dependencies = [
  "attestation",
  "bitflags",
  "ctype",
- "env_logger 0.8.4",
+ "env_logger",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -2039,7 +2039,7 @@ name = "did"
 version = "1.6.2"
 dependencies = [
  "ctype",
- "env_logger 0.8.4",
+ "env_logger",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -2278,19 +2278,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.9.0"
@@ -2442,7 +2429,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f"
 dependencies = [
- "env_logger 0.9.0",
+ "env_logger",
  "log",
 ]
 
@@ -4777,7 +4764,6 @@ dependencies = [
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
  "try-runtime-cli",
- "vergen",
 ]
 
 [[package]]
@@ -6674,7 +6660,7 @@ dependencies = [
 [[package]]
 name = "parachain-info"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#2317ef00dfa29a4d23fd6aa808d791a5dab82a02"
+source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.19#0c779d926beeb6e1f3f2aa777d9bcec792c0bdac"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -7865,7 +7851,7 @@ name = "polkadot-performance-test"
 version = "0.9.19"
 source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.19#f00a2772497aadddf75b8b4b475843ea0d910c48"
 dependencies = [
- "env_logger 0.9.0",
+ "env_logger",
  "kusama-runtime",
  "log",
  "polkadot-erasure-coding",
@@ -8717,7 +8703,7 @@ name = "remote-externalities"
 version = "0.10.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.19#174735ea1bb5fc4513519c45181d8df63d86f613"
 dependencies = [
- "env_logger 0.9.0",
+ "env_logger",
  "jsonrpsee",
  "log",
  "parity-scale-codec",
@@ -12154,17 +12140,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vergen"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a"
-dependencies = [
- "bitflags",
- "chrono",
- "rustc_version 0.4.0",
-]
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
diff --git a/nodes/parachain/Cargo.toml b/nodes/parachain/Cargo.toml
index 63224ad693..b4fd9c4017 100644
--- a/nodes/parachain/Cargo.toml
+++ b/nodes/parachain/Cargo.toml
@@ -21,15 +21,15 @@ runtime-common = {path = "../../runtimes/common"}
 spiritnet-runtime = {path = "../../runtimes/spiritnet"}
 
 # External dependencies
-clap = { version = "3.1.6", features = ["derive"] }
-codec = {package = "parity-scale-codec", version = "3.0.0"}
-derive_more = "0.99.16"
-futures = {version = "0.3.1", features = ["compat"]}
+clap = {version = "3.1.12", features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2"}
+derive_more = "0.99.17"
+futures = {version = "0.3.21", features = ["compat"]}
 hex-literal = "0.3.4"
 log = "0.4.16"
 parking_lot = "0.12.0"
-serde = {version = "1.0.132", features = ["derive"]}
-serde_json = "1.0.74"
+serde = {version = "1.0.136", features = ["derive"]}
+serde_json = "1.0.79"
 
 # Substrate dependencies
 sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
@@ -79,8 +79,8 @@ cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch
 cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
 cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
 cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
-cumulus-relay-chain-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
 cumulus-relay-chain-inprocess-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
+cumulus-relay-chain-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
 cumulus-relay-chain-rpc-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
 
 # Polkadot dependencies
@@ -96,8 +96,8 @@ frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", branc
 
 # Runtime tests
 node-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}
-pallet-conviction-voting = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19",  optional = true}
-pallet-referenda = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19",  optional = true}
+pallet-conviction-voting = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}
+pallet-referenda = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}
 try-runtime-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}
 
 [features]
diff --git a/nodes/standalone/Cargo.toml b/nodes/standalone/Cargo.toml
index a2759b98fd..74770b6787 100644
--- a/nodes/standalone/Cargo.toml
+++ b/nodes/standalone/Cargo.toml
@@ -10,8 +10,7 @@ name = "mashnet-node"
 path = "src/main.rs"
 
 [build-dependencies]
-build-script-utils = {package = "substrate-build-script-utils", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
-vergen = "3.1.0"
+substrate-build-script-utils = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
 
 [dependencies]
 
@@ -20,12 +19,12 @@ mashnet-node-runtime = {path = "../../runtimes/standalone"}
 runtime-common = {path = "../../runtimes/common"}
 
 # External dependencies
-clap = {version = "3.1", features = ["derive"]}
-futures = "0.3"
+clap = {version = "3.1.12", features = ["derive"]}
+futures = "0.3.21"
 hex-literal = "0.3.4"
 log = "0.4.16"
-serde = {version = "1.0.132", features = ["derive"]}
-serde_json = "1.0.74"
+serde = {version = "1.0.136", features = ["derive"]}
+serde_json = "1.0.79"
 
 # Substrate dependencies
 sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
@@ -75,7 +74,7 @@ runtime-benchmarks = [
   "mashnet-node-runtime/runtime-benchmarks",
   "pallet-conviction-voting/runtime-benchmarks",
   "pallet-referenda/runtime-benchmarks",
-  "runtime-common/runtime-benchmarks"
+  "runtime-common/runtime-benchmarks",
 ]
 try-runtime = [
   "mashnet-node-runtime/try-runtime",
diff --git a/nodes/standalone/build.rs b/nodes/standalone/build.rs
index 8b0b37b235..531baa940e 100644
--- a/nodes/standalone/build.rs
+++ b/nodes/standalone/build.rs
@@ -16,12 +16,10 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use vergen::{generate_cargo_keys, ConstantsFlags};
-
-const ERROR_MSG: &str = "Failed to generate metadata files";
+use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
 
 fn main() {
-	generate_cargo_keys(ConstantsFlags::SHA_SHORT).expect(ERROR_MSG);
+	generate_cargo_keys();
 
-	build_script_utils::rerun_if_git_head_changed();
+	rerun_if_git_head_changed();
 }
diff --git a/nodes/standalone/src/chain_spec.rs b/nodes/standalone/src/chain_spec.rs
index 8a593354b5..091e1a1850 100644
--- a/nodes/standalone/src/chain_spec.rs
+++ b/nodes/standalone/src/chain_spec.rs
@@ -79,9 +79,9 @@ fn get_authority_keys_from_secret(seed: &str) -> (AccountId, AuraId, GrandpaId)
 
 const TELEMETRY_URL: &str = "wss://telemetry-backend.kilt.io:8080/submit";
 
-const SPORRAN_AUTHORITY_ACC: [u8; 32] = hex!("0621f3a33afc66ab7973e3d2cdf86d30ab89aa3e717e8bb1db23a9cb1736061b");
+const SPORRAN_AUTHORITY_ACC: [u8; 32] = hex!("2c94fbcfe0a7db40579e12bc74d0f7215fe91ba51b3eade92799788ca549f373");
 const SPORRAN_AUTHORITY_SESSION: [u8; 32] = hex!("3bbaa842650064362767a1d9dd8899f531c80dc42eafb9599f4df0965e4a5299");
-const SPORRAN_FAUCET: [u8; 32] = hex!("2c9e9c40e15a2767e2d04dc1f05d824dd76d1d37bada3d7bb1d40eca29f3a4ff");
+const SPORRAN_FAUCET: [u8; 32] = hex!("780d87860ac7a02ebffa10e41a5a486efdebf63d595a44907ec0ced1d8626c4a");
 const TRANSFER_ACCOUNT: [u8; 32] = hex!("6a3c793cec9dbe330b349dc4eea6801090f5e71f53b1b41ad11afb4a313a282c");
 
 impl Alternative {
diff --git a/pallets/attestation/Cargo.toml b/pallets/attestation/Cargo.toml
index ef9aa527fc..f7feecaa56 100644
--- a/pallets/attestation/Cargo.toml
+++ b/pallets/attestation/Cargo.toml
@@ -10,23 +10,23 @@ version = "1.6.2"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder-runner = {version = "3.0.0"}
+substrate-wasm-builder-runner = "3.0.0"
 
 [dev-dependencies]
 ctype = {features = ["mock"], path = "../ctype"}
 kilt-support = {features = ["mock"], path = "../../support"}
 
-pallet-balances = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-serde = {version = "1.0.132"}
-sp-core = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-io = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-keystore = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
+pallet-balances = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+serde = "1.0.136"
+sp-core = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-io = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-keystore = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
 log = "0.4.16"
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
-serde = {version = "1.0.132", optional = true}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
+serde = {version = "1.0.136", optional = true}
 
 # Internal dependencies
 ctype = {default-features = false, path = "../ctype"}
diff --git a/pallets/ctype/Cargo.toml b/pallets/ctype/Cargo.toml
index a45078541e..414c666302 100644
--- a/pallets/ctype/Cargo.toml
+++ b/pallets/ctype/Cargo.toml
@@ -10,20 +10,20 @@ version = "1.6.2"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder-runner = {version = "3.0.0"}
+substrate-wasm-builder-runner = "3.0.0"
 
 [dev-dependencies]
 kilt-support = {features = ["mock"], path = "../../support"}
-pallet-balances = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-serde = {version = "1.0.132"}
-sp-core = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-keystore = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
+pallet-balances = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+serde = "1.0.136"
+sp-core = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-keystore = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
 log = "0.4.16"
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
-serde = {version = "1.0.132", optional = true}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
+serde = {version = "1.0.136", optional = true}
 
 # Internal dependencies
 kilt-support = {default-features = false, path = "../../support"}
diff --git a/pallets/delegation/Cargo.toml b/pallets/delegation/Cargo.toml
index d83bcfa6dc..563e2ba816 100644
--- a/pallets/delegation/Cargo.toml
+++ b/pallets/delegation/Cargo.toml
@@ -10,7 +10,7 @@ version = "1.6.2"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder-runner = {version = "3.0.0"}
+substrate-wasm-builder-runner = "3.0.0"
 
 [dev-dependencies]
 attestation = {features = ["mock"], path = "../attestation"}
@@ -18,13 +18,13 @@ ctype = {features = ["mock"], path = "../ctype"}
 kilt-support = {features = ["mock"], path = "../../support"}
 
 # External dependencies
-env_logger = {version = "0.8.4"}
-serde = {version = "1.0.132"}
+env_logger = "0.9.0"
+serde = "1.0.136"
 
 # Substrate dependencies
-pallet-balances = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-core = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-keystore = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
+pallet-balances = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-core = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-keystore = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
 
 [dependencies]
 # Internal dependencies
@@ -34,10 +34,10 @@ kilt-support = {default-features = false, path = "../../support"}
 
 #External dependencies
 bitflags = {default-features = false, version = "1.3.2"}
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
 log = "0.4.16"
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
-serde = {version = "1.0.132", optional = true}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
+serde = {version = "1.0.136", optional = true}
 
 # Substrate dependencies
 frame-benchmarking = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate", optional = true}
diff --git a/pallets/did/Cargo.toml b/pallets/did/Cargo.toml
index 08bdea8938..a727180068 100644
--- a/pallets/did/Cargo.toml
+++ b/pallets/did/Cargo.toml
@@ -10,17 +10,17 @@ version = "1.6.2"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder-runner = {version = "3.0.0"}
+substrate-wasm-builder-runner = "3.0.0"
 
 [dev-dependencies]
-env_logger = {version = "0.8.3"}
-serde = {version = "1.0.132"}
+env_logger = "0.9.0"
+serde = "1.0.136"
 
 ctype = {features = ["mock"], path = "../ctype"}
 
-frame-benchmarking = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-pallet-balances = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-keystore = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
+frame-benchmarking = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+pallet-balances = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-keystore = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
 
 [dependencies]
 # Internal dependencies
@@ -28,14 +28,13 @@ ctype = {path = "../ctype", optional = true}
 kilt-support = {default-features = false, path = "../../support"}
 
 # External dependencies
-env_logger = {default-features = false, version = "0.8.3", optional = true}
-hex = {default-features = false, features = ["alloc"], version = "0.4.2"}
+hex = {default-features = false, features = ["alloc"], version = "0.4.3"}
 log = "0.4.16"
 
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
 frame-support = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
 frame-system = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
 sp-core = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
 sp-io = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
 sp-runtime = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
@@ -50,7 +49,6 @@ sp-keystore = {branch = "polkadot-v0.9.19", default-features = false, git = "htt
 default = ["std"]
 mock = [
   "ctype",
-  "env_logger",
   "pallet-balances",
   "sp-keystore",
 ]
diff --git a/pallets/did/src/did_details.rs b/pallets/did/src/did_details.rs
index 528d641134..d8dd578a76 100644
--- a/pallets/did/src/did_details.rs
+++ b/pallets/did/src/did_details.rs
@@ -21,13 +21,15 @@ use frame_support::{
 	ensure,
 	storage::{bounded_btree_map::BoundedBTreeMap, bounded_btree_set::BoundedBTreeSet},
 	traits::Get,
+	RuntimeDebug,
 };
-use kilt_support::deposit::Deposit;
 use scale_info::TypeInfo;
 use sp_core::{ecdsa, ed25519, sr25519};
 use sp_runtime::{traits::Verify, MultiSignature, SaturatedConversion};
 use sp_std::{convert::TryInto, vec::Vec};
 
+use kilt_support::deposit::Deposit;
+
 use crate::{
 	errors::{DidError, InputError, SignatureError, StorageError},
 	service_endpoints::DidEndpoint,
@@ -35,7 +37,7 @@ use crate::{
 };
 
 /// Types of verification keys a DID can control.
-#[derive(Clone, Decode, Debug, Encode, Eq, Ord, PartialEq, PartialOrd, TypeInfo, MaxEncodedLen)]
+#[derive(Clone, Decode, RuntimeDebug, Encode, Eq, Ord, PartialEq, PartialOrd, TypeInfo, MaxEncodedLen)]
 pub enum DidVerificationKey {
 	/// An Ed25519 public key.
 	Ed25519(ed25519::Public),
@@ -86,14 +88,14 @@ impl From<ecdsa::Public> for DidVerificationKey {
 }
 
 /// Types of encryption keys a DID can control.
-#[derive(Clone, Copy, Decode, Debug, Encode, Eq, Ord, PartialEq, PartialOrd, TypeInfo, MaxEncodedLen)]
+#[derive(Clone, Copy, Decode, RuntimeDebug, Encode, Eq, Ord, PartialEq, PartialOrd, TypeInfo, MaxEncodedLen)]
 pub enum DidEncryptionKey {
 	/// An X25519 public key.
 	X25519([u8; 32]),
 }
 
 /// A general public key under the control of the DID.
-#[derive(Clone, Decode, Debug, Encode, Eq, Ord, PartialEq, PartialOrd, TypeInfo, MaxEncodedLen)]
+#[derive(Clone, Decode, RuntimeDebug, Encode, Eq, Ord, PartialEq, PartialOrd, TypeInfo, MaxEncodedLen)]
 pub enum DidPublicKey {
 	/// A verification key, used to generate and verify signatures.
 	PublicVerificationKey(DidVerificationKey),
@@ -115,7 +117,7 @@ impl From<DidEncryptionKey> for DidPublicKey {
 
 /// Verification methods a verification key can
 /// fulfil, according to the [DID specification](https://w3c.github.io/did-spec-registries/#verification-relationships).
-#[derive(Clone, Copy, Debug, Decode, Encode, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
+#[derive(Clone, Copy, RuntimeDebug, Decode, Encode, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
 pub enum DidVerificationKeyRelationship {
 	/// Key used to authenticate all the DID operations.
 	Authentication,
@@ -128,7 +130,7 @@ pub enum DidVerificationKeyRelationship {
 }
 
 /// Types of signatures supported by this pallet.
-#[derive(Clone, Decode, Debug, Encode, Eq, PartialEq, TypeInfo)]
+#[derive(Clone, Decode, RuntimeDebug, Encode, Eq, PartialEq, TypeInfo)]
 pub enum DidSignature {
 	/// A Ed25519 signature.
 	Ed25519(ed25519::Signature),
@@ -229,7 +231,7 @@ impl<I: AsRef<[u8; 32]>> DidVerifiableIdentifier for I {
 ///
 /// It is currently used to keep track of all the past and current
 /// attestation keys a DID might control.
-#[derive(Clone, Debug, Decode, Encode, PartialEq, Ord, PartialOrd, Eq, TypeInfo, MaxEncodedLen)]
+#[derive(Clone, RuntimeDebug, Decode, Encode, PartialEq, Ord, PartialOrd, Eq, TypeInfo, MaxEncodedLen)]
 #[scale_info(skip_type_params(T))]
 #[codec(mel_bound())]
 pub struct DidPublicKeyDetails<T: Config> {
@@ -551,7 +553,7 @@ pub(crate) type DidPublicKeyMap<T> =
 	BoundedBTreeMap<KeyIdOf<T>, DidPublicKeyDetails<T>, <T as Config>::MaxPublicKeysPerDid>;
 
 /// The details of a new DID to create.
-#[derive(Clone, Decode, Encode, PartialEq, TypeInfo)]
+#[derive(Clone, RuntimeDebug, Decode, Encode, PartialEq, TypeInfo)]
 #[scale_info(skip_type_params(T))]
 
 pub struct DidCreationDetails<T: Config> {
@@ -569,25 +571,9 @@ pub struct DidCreationDetails<T: Config> {
 	pub new_service_details: Vec<DidEndpoint<T>>,
 }
 
-impl<T: Config> sp_std::fmt::Debug for DidCreationDetails<T> {
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
-		f.debug_struct("DidCreationDetails")
-			.field("did", &self.did)
-			.field("submitter", &self.submitter)
-			.field(
-				"new_key_agreement_keys",
-				&self.new_key_agreement_keys.clone().into_inner(),
-			)
-			.field("new_attestation_key", &self.new_attestation_key)
-			.field("new_delegation_key", &self.new_delegation_key)
-			.field("new_service_details", &self.new_service_details)
-			.finish()
-	}
-}
-
 /// Errors that might occur while deriving the authorization verification key
 /// relationship.
-#[derive(Clone, Debug, Decode, Encode, PartialEq)]
+#[derive(Clone, RuntimeDebug, Decode, Encode, PartialEq)]
 pub enum RelationshipDeriveError {
 	/// The call is not callable by a did origin.
 	NotCallableByDid,
@@ -618,7 +604,7 @@ pub trait DeriveDidCallAuthorizationVerificationKeyRelationship {
 /// A DID operation that wraps other extrinsic calls, allowing those
 /// extrinsic to have a DID origin and perform DID-based authorization upon
 /// their invocation.
-#[derive(Clone, Debug, Decode, Encode, PartialEq, TypeInfo)]
+#[derive(Clone, RuntimeDebug, Decode, Encode, PartialEq, TypeInfo)]
 #[scale_info(skip_type_params(T))]
 
 pub struct DidAuthorizedCallOperation<T: Config> {
@@ -638,7 +624,7 @@ pub struct DidAuthorizedCallOperation<T: Config> {
 ///
 /// It contains additional information about the type of DID key to used for
 /// authorization.
-#[derive(Clone, Debug, PartialEq, TypeInfo)]
+#[derive(Clone, RuntimeDebug, PartialEq, TypeInfo)]
 #[scale_info(skip_type_params(T))]
 
 pub struct DidAuthorizedCallOperationWithVerificationRelationship<T: Config> {
diff --git a/pallets/did/src/service_endpoints.rs b/pallets/did/src/service_endpoints.rs
index 104aee443c..87ffe1102f 100644
--- a/pallets/did/src/service_endpoints.rs
+++ b/pallets/did/src/service_endpoints.rs
@@ -18,7 +18,7 @@
 
 use crate::{errors::InputError, Config};
 use codec::{Decode, Encode, MaxEncodedLen};
-use frame_support::{ensure, traits::Get, BoundedVec};
+use frame_support::{ensure, traits::Get, BoundedVec, RuntimeDebug};
 use scale_info::TypeInfo;
 use sp_runtime::traits::SaturatedConversion;
 use sp_std::str;
@@ -43,7 +43,7 @@ pub(crate) type ServiceEndpointUrlEntries<T> =
 	BoundedVec<ServiceEndpointUrl<T>, <T as Config>::MaxNumberOfUrlsPerService>;
 
 /// A single service endpoint description.
-#[derive(Clone, Decode, Encode, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
+#[derive(Clone, Decode, RuntimeDebug, Encode, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
 #[scale_info(skip_type_params(T))]
 #[codec(mel_bound())]
 pub struct DidEndpoint<T: Config> {
@@ -56,16 +56,6 @@ pub struct DidEndpoint<T: Config> {
 	pub urls: ServiceEndpointUrlEntries<T>,
 }
 
-impl<T: Config> sp_std::fmt::Debug for DidEndpoint<T> {
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
-		f.debug_struct("DidEndpoint")
-			.field("id", &self.id.clone().into_inner())
-			.field("service_types", &self.service_types.encode())
-			.field("urls", &self.urls.encode())
-			.finish()
-	}
-}
-
 impl<T: Config> DidEndpoint<T> {
 	/// Validates a given [DidEndpoint] instance against the constraint
 	/// set in the pallet's [Config].
diff --git a/pallets/kilt-launch/Cargo.toml b/pallets/kilt-launch/Cargo.toml
index e6aa26e25e..8c976008a5 100644
--- a/pallets/kilt-launch/Cargo.toml
+++ b/pallets/kilt-launch/Cargo.toml
@@ -10,14 +10,14 @@ version = "1.6.2"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
-sp-core = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.19"}
-sp-io = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.19"}
+sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
+sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
 log = "0.4.16"
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
-serde = {version = "1.0.132", optional = true}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
+serde = {version = "1.0.136", optional = true}
 
 frame-benchmarking = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.19", optional = true}
 frame-support = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.19"}
diff --git a/pallets/pallet-did-lookup/Cargo.toml b/pallets/pallet-did-lookup/Cargo.toml
index 26cb5cc48c..5f30fbac54 100644
--- a/pallets/pallet-did-lookup/Cargo.toml
+++ b/pallets/pallet-did-lookup/Cargo.toml
@@ -12,15 +12,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dev-dependencies]
 kilt-support = {features = ["mock"], path = "../../support"}
 
-pallet-balances = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-core = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-io = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-keystore = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
+pallet-balances = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-core = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-io = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-keystore = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
 log = "0.4.16"
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
 
 # KILT
 kilt-support = {default-features = false, path = "../../support"}
diff --git a/pallets/pallet-inflation/Cargo.toml b/pallets/pallet-inflation/Cargo.toml
index 7dc3642d55..1d66c6f95b 100644
--- a/pallets/pallet-inflation/Cargo.toml
+++ b/pallets/pallet-inflation/Cargo.toml
@@ -10,16 +10,16 @@ version = "1.6.2"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
-serde = {version = "1.0.132"}
+serde = "1.0.136"
 
-pallet-balances = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-core = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-io = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
+pallet-balances = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-core = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-io = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
-serde = {version = "1.0.132", optional = true}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
+serde = {version = "1.0.136", optional = true}
 
 # benchmarking
 frame-benchmarking = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false, optional = true}
diff --git a/pallets/pallet-web3-names/Cargo.toml b/pallets/pallet-web3-names/Cargo.toml
index e06b52f354..30bcd50fa3 100644
--- a/pallets/pallet-web3-names/Cargo.toml
+++ b/pallets/pallet-web3-names/Cargo.toml
@@ -12,14 +12,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dev-dependencies]
 kilt-support = {features = ["mock"], path = "../../support"}
 
-pallet-balances = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-core = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-io = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
-sp-keystore = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
+pallet-balances = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-core = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-io = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
+sp-keystore = {branch = "polkadot-v0.9.19", git = "https://github.com/paritytech/substrate"}
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
 
 # KILT
 kilt-support = {default-features = false, path = "../../support"}
diff --git a/pallets/pallet-web3-names/src/mock.rs b/pallets/pallet-web3-names/src/mock.rs
index 1d1ddb4886..5f415c5124 100644
--- a/pallets/pallet-web3-names/src/mock.rs
+++ b/pallets/pallet-web3-names/src/mock.rs
@@ -103,7 +103,7 @@ impl pallet_balances::Config for Test {
 	type WeightInfo = ();
 }
 
-pub(crate) type TestWeb3Name = AsciiWeb3Name<Test, MinNameLength, MaxNameLength>;
+pub(crate) type TestWeb3Name = AsciiWeb3Name<Test>;
 pub(crate) type TestWeb3NameOwner = SubjectId;
 pub(crate) type TestWeb3NamePayer = AccountId;
 pub(crate) type TestOwnerOrigin = mock_origin::EnsureDoubleOrigin<TestWeb3NamePayer, TestWeb3NameOwner>;
diff --git a/pallets/pallet-web3-names/src/web3_name.rs b/pallets/pallet-web3-names/src/web3_name.rs
index 4b4b935e46..bd2d2abc08 100644
--- a/pallets/pallet-web3-names/src/web3_name.rs
+++ b/pallets/pallet-web3-names/src/web3_name.rs
@@ -19,7 +19,7 @@
 use sp_std::{fmt::Debug, marker::PhantomData, vec::Vec};
 
 use codec::{Decode, Encode, MaxEncodedLen};
-use frame_support::{ensure, sp_runtime::SaturatedConversion, traits::Get, BoundedVec};
+use frame_support::{ensure, sp_runtime::SaturatedConversion, traits::Get, BoundedVec, RuntimeDebug};
 use scale_info::TypeInfo;
 
 use crate::{Config, Error};
@@ -28,15 +28,15 @@ use crate::{Config, Error};
 ///
 /// It is bounded in size (inclusive range [MinLength, MaxLength]) and can only
 /// contain a subset of ASCII characters.
-#[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]
+#[derive(Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 #[scale_info(skip_type_params(T, MinLength, MaxLength))]
 #[codec(mel_bound())]
-pub struct AsciiWeb3Name<T: Config, MinLength: Get<u32>, MaxLength: Get<u32>>(
-	pub(crate) BoundedVec<u8, MaxLength>,
-	PhantomData<(T, MinLength)>,
+pub struct AsciiWeb3Name<T: Config>(
+	pub(crate) BoundedVec<u8, T::MaxNameLength>,
+	PhantomData<(T, T::MinNameLength)>,
 );
 
-impl<T: Config> TryFrom<Vec<u8>> for AsciiWeb3Name<T, T::MinNameLength, T::MaxNameLength> {
+impl<T: Config> TryFrom<Vec<u8>> for AsciiWeb3Name<T> {
 	type Error = Error<T>;
 
 	/// Fallible initialization from a provided byte vector if it is below the
@@ -61,21 +61,15 @@ fn is_valid_web3_name(input: &[u8]) -> bool {
 		.all(|c| matches!(c, b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_'))
 }
 
-impl<T: Config> Debug for AsciiWeb3Name<T, T::MinNameLength, T::MaxNameLength> {
-	fn fmt(&self, f: &mut sp_std::fmt::Formatter<'_>) -> sp_std::fmt::Result {
-		f.debug_tuple("AsciiWeb3Name").field(&self.0).finish()
-	}
-}
-
 // FIXME: did not find a way to automatically implement this.
-impl<T: Config> PartialEq for AsciiWeb3Name<T, T::MinNameLength, T::MaxNameLength> {
+impl<T: Config> PartialEq for AsciiWeb3Name<T> {
 	fn eq(&self, other: &Self) -> bool {
 		self.0 == other.0
 	}
 }
 
 // FIXME: did not find a way to automatically implement this.
-impl<T: Config> Clone for AsciiWeb3Name<T, T::MinNameLength, T::MaxNameLength> {
+impl<T: Config> Clone for AsciiWeb3Name<T> {
 	fn clone(&self) -> Self {
 		Self(self.0.clone(), self.1)
 	}
@@ -129,21 +123,11 @@ mod tests {
 		];
 
 		for valid in valid_inputs {
-			assert!(
-				AsciiWeb3Name::<Test, <Test as Config>::MinNameLength, <Test as Config>::MaxNameLength>::try_from(
-					valid
-				)
-				.is_ok()
-			);
+			assert!(AsciiWeb3Name::<Test>::try_from(valid).is_ok());
 		}
 
 		for invalid in invalid_inputs {
-			assert!(
-				AsciiWeb3Name::<Test, <Test as Config>::MinNameLength, <Test as Config>::MaxNameLength>::try_from(
-					invalid
-				)
-				.is_err(),
-			);
+			assert!(AsciiWeb3Name::<Test>::try_from(invalid).is_err(),);
 		}
 	}
 }
diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml
index 2c7645576a..ecca089566 100644
--- a/pallets/parachain-staking/Cargo.toml
+++ b/pallets/parachain-staking/Cargo.toml
@@ -6,18 +6,18 @@ name = "parachain-staking"
 version = "1.6.2"
 
 [dev-dependencies]
-pallet-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false}
-pallet-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false}
-sp-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false}
-sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false}
-sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false}
+pallet-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
+pallet-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
+sp-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
+sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
+sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
 
 [dependencies]
 hex-literal = "0.3.4"
 log = "0.4.16"
-parity-scale-codec = {version = "3.0.0", default-features = false, features = ["derive"]}
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
-serde = {version = "1.0.132", optional = true}
+parity-scale-codec = {version = "3.1.2", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
+serde = {version = "1.0.136", optional = true}
 
 kilt-support = {default-features = false, path = "../../support"}
 
diff --git a/pallets/parachain-staking/src/set.rs b/pallets/parachain-staking/src/set.rs
index a0e2cf4205..c55e7a2a60 100644
--- a/pallets/parachain-staking/src/set.rs
+++ b/pallets/parachain-staking/src/set.rs
@@ -16,7 +16,7 @@
 
 // If you feel like getting in touch with us, you can do so at info@botlabs.org
 
-use frame_support::{traits::Get, BoundedVec, DefaultNoBound};
+use frame_support::{traits::Get, BoundedVec, DefaultNoBound, RuntimeDebug};
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{traits::Zero, SaturatedConversion};
@@ -27,10 +27,10 @@ use sp_std::{
 };
 
 #[cfg(feature = "std")]
-use sp_std::{fmt, prelude::*};
+use sp_std::prelude::*;
 
 /// An ordered set backed by `BoundedVec`.
-#[derive(PartialEq, Eq, Encode, Decode, DefaultNoBound, Clone, TypeInfo, MaxEncodedLen)]
+#[derive(PartialEq, Eq, Encode, Decode, DefaultNoBound, Clone, TypeInfo, MaxEncodedLen, RuntimeDebug)]
 #[scale_info(skip_type_params(S))]
 #[codec(mel_bound(T: MaxEncodedLen))]
 pub struct OrderedSet<T, S: Get<u32>>(BoundedVec<T, S>);
@@ -230,17 +230,6 @@ impl<T: Ord + Clone, S: Get<u32>> OrderedSet<T, S> {
 	}
 }
 
-#[cfg(feature = "std")]
-impl<T, S> fmt::Debug for OrderedSet<T, S>
-where
-	T: fmt::Debug,
-	S: Get<u32>,
-{
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		f.debug_tuple("OrderedSet").field(&self.0).finish()
-	}
-}
-
 impl<T: Ord + Clone, S: Get<u32>> From<BoundedVec<T, S>> for OrderedSet<T, S> {
 	fn from(bv: BoundedVec<T, S>) -> Self {
 		Self::from(bv)
diff --git a/runtimes/common/Cargo.toml b/runtimes/common/Cargo.toml
index 15e2b9a106..8bed6f103d 100644
--- a/runtimes/common/Cargo.toml
+++ b/runtimes/common/Cargo.toml
@@ -5,12 +5,12 @@ name = "runtime-common"
 version = "1.6.2"
 
 [dev-dependencies]
-sp-io = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.19"}
+sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
-serde = {version = "1.0.132", optional = true, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
+serde = {version = "1.0.136", optional = true, features = ["derive"]}
 smallvec = "1.8.0"
 
 attestation = {default-features = false, path = "../../pallets/attestation"}
diff --git a/runtimes/peregrine/Cargo.toml b/runtimes/peregrine/Cargo.toml
index c57f35f06e..2bd5c785a8 100644
--- a/runtimes/peregrine/Cargo.toml
+++ b/runtimes/peregrine/Cargo.toml
@@ -8,14 +8,14 @@ version = "1.6.2"
 substrate-wasm-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
 log = "0.4.16"
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
 smallvec = "1.8.0"
 static_assertions = "1.1.0"
 
 hex-literal = {version = "0.3.4", optional = true}
-serde = {version = "1.0.132", optional = true, features = ["derive"]}
+serde = {version = "1.0.136", optional = true, features = ["derive"]}
 
 # RPC
 frame-system-rpc-runtime-api = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.19"}
diff --git a/runtimes/peregrine/src/lib.rs b/runtimes/peregrine/src/lib.rs
index 313dd83139..92d18d136d 100644
--- a/runtimes/peregrine/src/lib.rs
+++ b/runtimes/peregrine/src/lib.rs
@@ -598,11 +598,7 @@ impl pallet_web3_names::Config for Runtime {
 	type Event = Event;
 	type MaxNameLength = constants::web3_names::MaxNameLength;
 	type MinNameLength = constants::web3_names::MinNameLength;
-	type Web3Name = pallet_web3_names::web3_name::AsciiWeb3Name<
-		Runtime,
-		constants::web3_names::MinNameLength,
-		constants::web3_names::MaxNameLength,
-	>;
+	type Web3Name = pallet_web3_names::web3_name::AsciiWeb3Name<Runtime>;
 	type Web3NameOwner = DidIdentifier;
 	type WeightInfo = weights::pallet_web3_names::WeightInfo<Runtime>;
 }
diff --git a/runtimes/spiritnet/Cargo.toml b/runtimes/spiritnet/Cargo.toml
index 1e426854b7..54c44b161a 100644
--- a/runtimes/spiritnet/Cargo.toml
+++ b/runtimes/spiritnet/Cargo.toml
@@ -8,14 +8,14 @@ version = "1.6.2"
 substrate-wasm-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
 log = "0.4.16"
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
 smallvec = "1.8.0"
 static_assertions = "1.1.0"
 
 hex-literal = {version = "0.3.4", optional = true}
-serde = {version = "1.0.132", optional = true, features = ["derive"]}
+serde = {version = "1.0.136", optional = true, features = ["derive"]}
 
 # RPC
 frame-system-rpc-runtime-api = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.19"}
diff --git a/runtimes/spiritnet/src/lib.rs b/runtimes/spiritnet/src/lib.rs
index 4b7e9e889c..10e4dbbbc6 100644
--- a/runtimes/spiritnet/src/lib.rs
+++ b/runtimes/spiritnet/src/lib.rs
@@ -603,11 +603,7 @@ impl pallet_web3_names::Config for Runtime {
 	type Event = Event;
 	type MaxNameLength = constants::web3_names::MaxNameLength;
 	type MinNameLength = constants::web3_names::MinNameLength;
-	type Web3Name = pallet_web3_names::web3_name::AsciiWeb3Name<
-		Runtime,
-		constants::web3_names::MinNameLength,
-		constants::web3_names::MaxNameLength,
-	>;
+	type Web3Name = pallet_web3_names::web3_name::AsciiWeb3Name<Runtime>;
 	type Web3NameOwner = DidIdentifier;
 	type WeightInfo = weights::pallet_web3_names::WeightInfo<Runtime>;
 }
diff --git a/runtimes/standalone/Cargo.toml b/runtimes/standalone/Cargo.toml
index 48e407f1c3..7eef43c179 100644
--- a/runtimes/standalone/Cargo.toml
+++ b/runtimes/standalone/Cargo.toml
@@ -9,12 +9,12 @@ substrate-wasm-builder = {git = "https://github.com/paritytech/substrate", branc
 
 [dependencies]
 bitflags = {default-features = false, version = "1.3.2"}
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
 log = "0.4.16"
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
 
 hex-literal = {version = "0.3.4", optional = true}
-serde = {version = "1.0.132", optional = true, features = ["derive"]}
+serde = {version = "1.0.136", optional = true, features = ["derive"]}
 
 # kilt functionality
 attestation = {default-features = false, path = "../../pallets/attestation"}
diff --git a/runtimes/standalone/src/lib.rs b/runtimes/standalone/src/lib.rs
index 4390bd1677..0f95bf5a42 100644
--- a/runtimes/standalone/src/lib.rs
+++ b/runtimes/standalone/src/lib.rs
@@ -456,7 +456,7 @@ impl pallet_web3_names::Config for Runtime {
 	type Event = Event;
 	type MaxNameLength = MaxNameLength;
 	type MinNameLength = MinNameLength;
-	type Web3Name = pallet_web3_names::web3_name::AsciiWeb3Name<Runtime, MinNameLength, MaxNameLength>;
+	type Web3Name = pallet_web3_names::web3_name::AsciiWeb3Name<Runtime>;
 	type Web3NameOwner = DidIdentifier;
 	type WeightInfo = ();
 }
diff --git a/support/Cargo.toml b/support/Cargo.toml
index aee1df743c..61c4c0a78c 100644
--- a/support/Cargo.toml
+++ b/support/Cargo.toml
@@ -7,8 +7,8 @@ repository = "https://github.com/KILTprotocol/mashnet-node"
 version = "1.6.2"
 
 [dependencies]
-codec = {package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]}
-scale-info = {version = "2.0.1", default-features = false, features = ["derive"]}
+codec = {package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"]}
+scale-info = {version = "2.1.1", default-features = false, features = ["derive"]}
 
 frame-support = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}
 frame-system = {branch = "polkadot-v0.9.19", default-features = false, git = "https://github.com/paritytech/substrate"}