diff --git a/Cargo.dev.toml b/Cargo.dev.toml
index 23c88f6268c76d1fd0065c77d2293b93328a06e0..7ce5324c2c059be8ea72f13adeb95fcdf9c3cda0 100644
--- a/Cargo.dev.toml
+++ b/Cargo.dev.toml
@@ -30,72 +30,72 @@ resolver = "2"
 split-debuginfo = "unpacked"
 
 [patch.'https://github.com/paritytech/substrate']
-frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-frame-support = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-frame-system = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-max-encoded-len = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-max-encoded-len-derive = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-session = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sc-executor = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-allocator = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-api = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-core = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-io = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-npos-elections-compact = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-session = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-staking = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-std = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-storage = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-trie = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-version = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
-sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "e23d4afc1f43472a2d134b7630cf31b59ee0ef76" }
+frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+frame-support = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+frame-system = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+max-encoded-len = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+max-encoded-len-derive = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-session = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sc-executor = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-allocator = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-api = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-core = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-io = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-npos-elections-compact = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-session = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-staking = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-std = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-storage = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-trie = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-version = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
+sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "9c572625f6557dfdb19f47474369a0327d51dfbc" }
 
 # [patch.'https://github.com/paritytech/cumulus']
-# cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "63842b09741b7f4cae9d77453564bbd1fa0c81cf" }
-# cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "63842b09741b7f4cae9d77453564bbd1fa0c81cf" }
-# parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "63842b09741b7f4cae9d77453564bbd1fa0c81cf" }
-# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech//cumulus", rev = "63842b09741b7f4cae9d77453564bbd1fa0c81cf" }
+# cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "05ab7a377d2c3b73566c0c3bd41b003486d6913b" }
+# cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "05ab7a377d2c3b73566c0c3bd41b003486d6913b" }
+# parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "05ab7a377d2c3b73566c0c3bd41b003486d6913b" }
+# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech//cumulus", rev = "05ab7a377d2c3b73566c0c3bd41b003486d6913b" }
 
 # [patch.'https://github.com/paritytech/polkadot']
-# xcm = { git = "https://github.com/paritytech//polkadot", rev = "f47d3dcd0fde590652262b8b87cd2e27e59d1001" }
-# xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "f47d3dcd0fde590652262b8b87cd2e27e59d1001" }
-# xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "f47d3dcd0fde590652262b8b87cd2e27e59d1001" }
-# polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "f47d3dcd0fde590652262b8b87cd2e27e59d1001" }
-# polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "f47d3dcd0fde590652262b8b87cd2e27e59d1001" }
-# polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "f47d3dcd0fde590652262b8b87cd2e27e59d1001" }
-# polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "f47d3dcd0fde590652262b8b87cd2e27e59d1001" }
+# xcm = { git = "https://github.com/paritytech//polkadot", rev = "3ce09da502dd74d88f24d76f579d19fd4e6c5624" }
+# xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "3ce09da502dd74d88f24d76f579d19fd4e6c5624" }
+# xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "3ce09da502dd74d88f24d76f579d19fd4e6c5624" }
+# polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "3ce09da502dd74d88f24d76f579d19fd4e6c5624" }
+# polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "3ce09da502dd74d88f24d76f579d19fd4e6c5624" }
+# polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "3ce09da502dd74d88f24d76f579d19fd4e6c5624" }
+# polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "3ce09da502dd74d88f24d76f579d19fd4e6c5624" }
 
 # [patch.'https://github.com/shaunxw/xcm-simulator']
 # xcm-simulator = { git = "https://github.com/shaunxw//xcm-simulator", rev = "c52bd64a41a51d08bd5a1e27f32c47419b41f3e5" }
diff --git a/auction/Cargo.toml b/auction/Cargo.toml
index e2d0303ed9c48580601dc9b1d10195c4c70fadac..f72d848c4d2c9a2ca87358119c18a7ac000c7731 100644
--- a/auction/Cargo.toml
+++ b/auction/Cargo.toml
@@ -10,16 +10,16 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
 [features]
 default = ["std"]
diff --git a/authority/Cargo.toml b/authority/Cargo.toml
index 4832f25012783fd7f3ce4abb1b84026df2412db8..d72baea74f6440c78181d812b8783e8ab6c1995b 100644
--- a/authority/Cargo.toml
+++ b/authority/Cargo.toml
@@ -10,17 +10,17 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
 [features]
 default = ["std"]
diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml
index c8aa26c6fcdddbdfac9e3d4804742055ed62a40c..4bfe2fbff1b550b220dcc4500b55371987ca7ff1 100644
--- a/bencher/Cargo.toml
+++ b/bencher/Cargo.toml
@@ -21,16 +21,16 @@ linregress = { version = "0.4.0", optional = true }
 serde = { version = "1.0.119", optional = true, features = ['derive'] }
 serde_json = {version = "1.0.64", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"], default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false, optional = true }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false, features = ["wasmtime"], optional = true }
-sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", optional = true }
-sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false, features = ["with-kvdb-rocksdb"], optional = true }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false, optional = true }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false, features = ["wasmtime"], optional = true }
+sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", optional = true }
+sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false, features = ["with-kvdb-rocksdb"], optional = true }
 sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate",  branch = "polkadot-v0.9.5", default-features = false, optional = true }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml
index eea188e94957df6227cb474e87ad931ba5fa5c0a..345313ec42192d1f98077adec884ff5f32d8d376 100644
--- a/benchmarking/Cargo.toml
+++ b/benchmarking/Cargo.toml
@@ -11,17 +11,17 @@ edition = "2018"
 serde = { version = "1.0.124", optional = true }
 paste = "1.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-storage = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 [dev-dependencies]
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 hex-literal = "0.2.1"
 
 [features]
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
index fb41d6d4b5a32ff0849717ece6df18b50c930a7f..b878451d094a492d343fda01710e3b1d8710aac2 100644
--- a/currencies/Cargo.toml
+++ b/currencies/Cargo.toml
@@ -10,19 +10,19 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" }
 
 [features]
diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml
index c31c57905d5fe57a0a7a10700cef24c816ce8e0c..20b41e4632b0b01db645df7930e6cec2d33a0e13 100644
--- a/gradually-update/Cargo.toml
+++ b/gradually-update/Cargo.toml
@@ -10,13 +10,13 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/nft/Cargo.toml b/nft/Cargo.toml
index 37f083601a9f92a5bdf4392274c0a8ff19cad1cc..2c164fdbb065782594a0d6fbb521db780ed34a53 100644
--- a/nft/Cargo.toml
+++ b/nft/Cargo.toml
@@ -10,16 +10,16 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
 [features]
 default = ["std"]
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
index 27f101c6a5b6dff67093b0686d9864850ce1d2a5..8fda331318deb842a9762d3a23c0abc8fbde9946 100644
--- a/oracle/Cargo.toml
+++ b/oracle/Cargo.toml
@@ -10,19 +10,19 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml
index f51b9de93972494c4ca101a3ca9a1113c60d0633..853333dc8b87218a133f5bd86cc3cff6bcfe8e7a 100644
--- a/oracle/rpc/Cargo.toml
+++ b/oracle/rpc/Cargo.toml
@@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.0.0"
 jsonrpc-core-client = "15.0.0"
 jsonrpc-derive = "15.0.0"
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
 orml-oracle-rpc-runtime-api = { path = "runtime-api", version = "0.4.1-dev" }
diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml
index 4d48617fa532f9546d05222135389d5b816c5fba..a2cafd50c19665df189429b6136c01ddc355e5ca 100644
--- a/oracle/rpc/runtime-api/Cargo.toml
+++ b/oracle/rpc/runtime-api/Cargo.toml
@@ -8,8 +8,8 @@ description = "Runtime API module for orml-oracle-rpc."
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs
index 95234009c1ac3c4bcf34739451cbb26f72fc664c..b06163371ed5a84a04862d4631d3399eb094fcfe 100644
--- a/oracle/src/lib.rs
+++ b/oracle/src/lib.rs
@@ -248,11 +248,11 @@ impl<T: Config<I>, I: 'static> ChangeMembers<T::AccountId> for Pallet<T, I> {
 	fn change_members_sorted(_incoming: &[T::AccountId], outgoing: &[T::AccountId], _new: &[T::AccountId]) {
 		// remove values
 		for removed in outgoing {
-			RawValues::<T, I>::remove_prefix(removed, None);
+			RawValues::<T, I>::remove_prefix(removed);
 		}
 
 		// not bothering to track which key needs recompute, just update all
-		IsUpdated::<T, I>::remove_all(None);
+		IsUpdated::<T, I>::remove_all();
 	}
 
 	fn set_prime(_prime: Option<T::AccountId>) {
diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml
index fadd3deb615caaa945efc7ea1b282d043a380d18..c587ecf1a3f97bfcff9d7bd89b7deaf705f58b0d 100644
--- a/rewards/Cargo.toml
+++ b/rewards/Cargo.toml
@@ -10,16 +10,16 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
 [features]
 default = ["std"]
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 7eed6e37be43f598a1f65c1e5d120b9e9fb0ab99..3a6e836d885594cee54e89f8be2abc6b0ca86e2c 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -10,17 +10,17 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-support = {  git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = {  git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-support = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 # Patch doesn't work as `pallet-elections-phragmen` is now 4.0.0 version. Revert `rev` to `statemint` branch after
 # other `statemint` dependencies upgraded.
 pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "85fa0ab80c3ceccf4bb98380d7833578aaf8815e" }
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index 5eeca14a3dd5a01529db07887a8375dd2605e8d6..56f521995f55395a1f4a4ffa620568795e782fb1 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -10,12 +10,12 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 num-traits = { version = "0.2.14", default-features = false }
 impl-trait-for-tuples = "0.2.1"
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false }
 # xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.5", default-features = false }
 
diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml
index 13772c31ca5a3615429b3e54a0cc6353b7e662a6..9f4fee2d8bb826a8c1b6943a06a86eb132e739fb 100644
--- a/unknown-tokens/Cargo.toml
+++ b/unknown-tokens/Cargo.toml
@@ -10,18 +10,18 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.5", default-features = false }
 
 orml-xcm-support = { path = "../xcm-support", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
 [features]
 default = ["std"]
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
index ae8bafd3549894b6dd27fdefd3dc98b36702cf44..6e578e83d06d49e010954bdac660115acdcccd77 100644
--- a/utilities/Cargo.toml
+++ b/utilities/Cargo.toml
@@ -10,14 +10,14 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.64"
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
 [features]
 default = ["std"]
diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml
index 70e807aabf3b81a70cc21913a801a9800b78e64e..836d3a73dcacca4ec4a69f20926fd90ac04f917e 100644
--- a/vesting/Cargo.toml
+++ b/vesting/Cargo.toml
@@ -10,17 +10,17 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+max-encoded-len = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
 [features]
 default = ["std"]
diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml
index addb709b1e6594371c2bb9432f5f0005fa21fe2a..dbfdac868e542f97a6052148b87de1e88c12d7a2 100644
--- a/weight-meter/Cargo.toml
+++ b/weight-meter/Cargo.toml
@@ -10,20 +10,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 spin = "0.7.1"
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 weight-meter-procedural = { path = "weight-meter-procedural", default-features = false }
 orml-bencher = { path = "../bencher", default-features = false, optional = true }
 
 [dev-dependencies]
 serde = { version = "1.0.124" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions"}
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5"}
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 
 [features]
 default = ["std"]
diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml
index 5c6986c75dc450639d394b7c46605f89846c9011..3c356d7010dc9c0f301a7a2d975a16986d6605b4 100644
--- a/xcm-support/Cargo.toml
+++ b/xcm-support/Cargo.toml
@@ -10,10 +10,10 @@ edition = "2018"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.5", default-features = false }
 xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.5", default-features = false }
diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml
index 71f3f506bb65f10649cf96aa8f38faab4d7fb345..e4d7b9066d2fea49d506114a6512f02c3b49b381 100644
--- a/xtokens/Cargo.toml
+++ b/xtokens/Cargo.toml
@@ -10,12 +10,12 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.124", optional = true }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5", default-features = false }
 
 cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.5", default-features = false }
 
@@ -25,10 +25,10 @@ orml-xcm-support = { path = "../xcm-support", default-features = false }
 orml-traits = { path = "../traits", default-features = false}
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.5" }
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.5" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "rh-v0.9.5-missing-companions" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.5" }
 xcm-simulator = { git = "https://github.com/shaunxw/xcm-simulator", branch = "master" }
 cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.5" }
 parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.5" }