diff --git a/Cargo.lock b/Cargo.lock
index ea5c7d0a..4d6e5164 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2199,7 +2199,7 @@ dependencies = [
 [[package]]
 name = "geohash"
 version = "0.13.0"
-source = "git+https://github.com/encointer/geohash?tag=v0.13.0#ad60d861f6bdbfd96ee9318f82554a7bec3089af"
+source = "git+https://github.com/encointer/geohash?tag=polkadot-v1.0.0#c5a8e70ea8b5db68571e51838b54612b556a4c7e"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -6829,12 +6829,12 @@ dependencies = [
 [[package]]
 name = "substrate-fixed"
 version = "0.5.9"
-source = "git+https://github.com/encointer/substrate-fixed?tag=v0.5.9#a4fb461aae6205ffc55bed51254a40c52be04e5d"
+source = "git+https://github.com/encointer/substrate-fixed?tag=polkadot-v1.0.0#df67f97a6db9b40215f105613b381ca82f1e2ff4"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "typenum 1.16.0 (git+https://github.com/encointer/typenum?tag=v1.16.0)",
+ "typenum 1.16.0 (git+https://github.com/encointer/typenum?tag=polkadot-v1.0.0)",
 ]
 
 [[package]]
@@ -7398,7 +7398,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "typenum"
 version = "1.16.0"
-source = "git+https://github.com/encointer/typenum?tag=v1.16.0#4c8dddaa8bdd13130149e43b4085ad14e960617f"
+source = "git+https://github.com/encointer/typenum?tag=polkadot-v1.0.0#4cba9a73f7e94ba38c824616efab93f177c9a556"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
diff --git a/balances-tx-payment/Cargo.toml b/balances-tx-payment/Cargo.toml
index 36eb4bf5..54298777 100644
--- a/balances-tx-payment/Cargo.toml
+++ b/balances-tx-payment/Cargo.toml
@@ -22,7 +22,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
     "derive",
 ] }
 rstest = "0.12.0"
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false }
 sp-io = { version = "23.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
 test-utils = { path = "../test-utils" }
 
diff --git a/balances-tx-payment/rpc/runtime-api/Cargo.toml b/balances-tx-payment/rpc/runtime-api/Cargo.toml
index c34bd384..dd2dd0c4 100644
--- a/balances-tx-payment/rpc/runtime-api/Cargo.toml
+++ b/balances-tx-payment/rpc/runtime-api/Cargo.toml
@@ -13,7 +13,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
     "derive",
 ] }
 frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false }
 sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
 sp-std = { version = "8.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
 
diff --git a/balances/Cargo.toml b/balances/Cargo.toml
index 7c9f2de9..15315b29 100644
--- a/balances/Cargo.toml
+++ b/balances/Cargo.toml
@@ -12,7 +12,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
     "derive",
 ] }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false }
 
 # local deps
 encointer-primitives = { path = "../primitives", default-features = false }
diff --git a/bazaar/Cargo.toml b/bazaar/Cargo.toml
index 431cb017..6e47a426 100644
--- a/bazaar/Cargo.toml
+++ b/bazaar/Cargo.toml
@@ -9,7 +9,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
     "derive",
 ] }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false }
 
 # local deps
 encointer-communities = { package = "pallet-encointer-communities", path = "../communities", default-features = false }
diff --git a/ceremonies/Cargo.toml b/ceremonies/Cargo.toml
index f31bfca7..83439b79 100644
--- a/ceremonies/Cargo.toml
+++ b/ceremonies/Cargo.toml
@@ -9,7 +9,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
     "derive",
 ] }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false }
 
 # local deps
 encointer-balances = { package = "pallet-encointer-balances", path = "../balances", default-features = false }
diff --git a/ceremonies/meetup-validation/Cargo.toml b/ceremonies/meetup-validation/Cargo.toml
index 7d64fe7e..55c3d5f0 100644
--- a/ceremonies/meetup-validation/Cargo.toml
+++ b/ceremonies/meetup-validation/Cargo.toml
@@ -7,7 +7,7 @@ version = "1.2.0"
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
     "derive",
 ] }
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false }
 serde = { version = "1.0.136", default-features = false, features = [
     "derive",
     "alloc",
diff --git a/communities/Cargo.toml b/communities/Cargo.toml
index e2f0f022..126ce60c 100644
--- a/communities/Cargo.toml
+++ b/communities/Cargo.toml
@@ -9,7 +9,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
     "derive",
 ] }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false }
 
 # local deps
 encointer-balances = { package = "pallet-encointer-balances", path = "../balances", default-features = false }
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 9cd02f33..ff065613 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -12,7 +12,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
     "derive",
 ] }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false }
 
 # local deps
 encointer-communities = { package = "pallet-encointer-communities", path = "../communities", default-features = false }
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index ebe2ea36..307cd518 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -11,9 +11,9 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
     "max-encoded-len",
 ] }
 crc = "2.1.0"
-geohash = { tag = "v0.13.0", git = "https://github.com/encointer/geohash" }
+geohash = { tag = "polkadot-v1.0.0", git = "https://github.com/encointer/geohash" }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = [
+scale-info = { version = "2.5.0", default-features = false, features = [
     "derive",
 ] }
 serde = { version = "1.0.136", optional = true, default-features = false, features = [
diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
index 64dec35f..b64a29ed 100644
--- a/primitives/core/Cargo.toml
+++ b/primitives/core/Cargo.toml
@@ -7,9 +7,9 @@ version = "1.2.0"
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
     "derive",
 ] }
-fixed = { package = "substrate-fixed", tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed" }
+fixed = { package = "substrate-fixed", tag = "polkadot-v1.0.0", default-features = false, git = "https://github.com/encointer/substrate-fixed" }
 impl-serde = { version = "0.3.2", optional = true, default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = [
+scale-info = { version = "2.5.0", default-features = false, features = [
     "derive",
 ] }
 serde = { version = "1.0.136", optional = true, default-features = false, features = [
diff --git a/reputation-commitments/Cargo.toml b/reputation-commitments/Cargo.toml
index 750947b4..ec40f499 100644
--- a/reputation-commitments/Cargo.toml
+++ b/reputation-commitments/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 approx = { version = "0.5.1", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false }
 
 # local deps
 encointer-ceremonies = { package = "pallet-encointer-ceremonies", path = "../ceremonies", default-features = false }
@@ -46,7 +46,6 @@ std = [
     "sp-std/std",
     "sp-runtime/std",
     "sp-core/std",
-    "sp-runtime/std",
 ]
 
 runtime-benchmarks = ["frame-benchmarking", "approx"]
diff --git a/scheduler/Cargo.toml b/scheduler/Cargo.toml
index c2fabde3..9f8f9180 100644
--- a/scheduler/Cargo.toml
+++ b/scheduler/Cargo.toml
@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 ] }
 impl-trait-for-tuples = { version = "0.2.2", default-features = false }
 log = { version = "0.4.14", default-features = false }
-scale-info = { version = "2.0.1", default-features = false }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"]}
 
 # local deps
 encointer-primitives = { path = "../primitives", default-features = false }