diff --git a/Cargo.lock b/Cargo.lock
index 105c2bed0..c6883c6ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1464,7 +1464,7 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
 [[package]]
 name = "beacon_node_fallback"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "clap",
  "eth2",
@@ -1568,7 +1568,7 @@ dependencies = [
 [[package]]
 name = "bls"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -1871,7 +1871,7 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 [[package]]
 name = "clap_utils"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "alloy-primitives",
  "clap",
@@ -1942,7 +1942,7 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 [[package]]
 name = "compare_fields"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "itertools 0.10.5",
 ]
@@ -1950,7 +1950,7 @@ dependencies = [
 [[package]]
 name = "compare_fields_derive"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -2550,7 +2550,7 @@ dependencies = [
 [[package]]
 name = "directory"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "clap",
  "clap_utils",
@@ -2856,7 +2856,7 @@ dependencies = [
 [[package]]
 name = "eth2"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "derivative",
  "either",
@@ -2872,6 +2872,7 @@ dependencies = [
  "multiaddr",
  "pretty_reqwest_error",
  "proto_array",
+ "rand 0.8.5",
  "reqwest 0.11.27",
  "reqwest-eventsource",
  "sensitive_url",
@@ -2879,6 +2880,7 @@ dependencies = [
  "serde_json",
  "slashing_protection",
  "ssz_types",
+ "test_random_derive",
  "types",
  "zeroize",
 ]
@@ -2886,7 +2888,7 @@ dependencies = [
 [[package]]
 name = "eth2_config"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "paste",
  "types",
@@ -2895,7 +2897,7 @@ dependencies = [
 [[package]]
 name = "eth2_interop_keypairs"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "bls",
  "ethereum_hashing",
@@ -2908,7 +2910,7 @@ dependencies = [
 [[package]]
 name = "eth2_key_derivation"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "bls",
  "num-bigint-dig",
@@ -2920,7 +2922,7 @@ dependencies = [
 [[package]]
 name = "eth2_keystore"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "aes 0.7.5",
  "bls",
@@ -2942,7 +2944,7 @@ dependencies = [
 [[package]]
 name = "eth2_network_config"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "bytes",
  "discv5",
@@ -3129,7 +3131,7 @@ dependencies = [
 [[package]]
 name = "filesystem"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "winapi",
  "windows-acl",
@@ -3150,7 +3152,7 @@ dependencies = [
 [[package]]
 name = "fixed_bytes"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "alloy-primitives",
  "safe_arith",
@@ -3462,7 +3464,7 @@ dependencies = [
 [[package]]
 name = "graffiti_file"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "bls",
  "serde",
@@ -3579,7 +3581,7 @@ dependencies = [
 [[package]]
 name = "health_metrics"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "eth2",
  "metrics",
@@ -4256,7 +4258,7 @@ dependencies = [
 [[package]]
 name = "int_to_bytes"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "bytes",
 ]
@@ -4439,7 +4441,7 @@ dependencies = [
 [[package]]
 name = "kzg"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "arbitrary",
  "c-kzg",
@@ -4587,7 +4589,7 @@ dependencies = [
 [[package]]
 name = "libp2p-gossipsub"
 version = "0.49.0"
-source = "git+https://github.com/sigp/rust-libp2p.git?rev=7a36e4c#7a36e4cde83041f1bd5f2078c4d3934ccb16777e"
+source = "git+https://github.com/sigp/rust-libp2p.git?rev=61b2820#61b2820de7a3fab5ae5e1362c4dfa93bd7c41e98"
 dependencies = [
  "async-channel 2.3.1",
  "asynchronous-codec",
@@ -5009,7 +5011,7 @@ dependencies = [
 [[package]]
 name = "lighthouse_network"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -5061,7 +5063,7 @@ dependencies = [
 [[package]]
 name = "lighthouse_version"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "git-version",
  "target_info",
@@ -5143,13 +5145,11 @@ dependencies = [
 [[package]]
 name = "logging"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "chrono",
  "logroller",
  "metrics",
- "once_cell",
- "parking_lot",
  "serde",
  "serde_json",
  "tokio",
@@ -5207,7 +5207,7 @@ dependencies = [
 [[package]]
 name = "lru_cache"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "fnv",
 ]
@@ -5277,7 +5277,7 @@ dependencies = [
 [[package]]
 name = "merkle_proof"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "alloy-primitives",
  "ethereum_hashing",
@@ -5370,7 +5370,7 @@ dependencies = [
 [[package]]
 name = "metrics"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "prometheus",
 ]
@@ -6261,7 +6261,7 @@ dependencies = [
 [[package]]
 name = "pretty_reqwest_error"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "reqwest 0.11.27",
  "sensitive_url",
@@ -6428,7 +6428,7 @@ dependencies = [
 [[package]]
 name = "proto_array"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "ethereum_ssz",
  "ethereum_ssz_derive",
@@ -7232,7 +7232,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "safe_arith"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 
 [[package]]
 name = "salsa20"
@@ -7390,7 +7390,7 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 [[package]]
 name = "sensitive_url"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "serde",
  "url",
@@ -7631,7 +7631,7 @@ dependencies = [
 [[package]]
 name = "slashing_protection"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "arbitrary",
  "ethereum_serde_utils",
@@ -7649,7 +7649,7 @@ dependencies = [
 [[package]]
 name = "slot_clock"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "metrics",
  "parking_lot",
@@ -7898,7 +7898,7 @@ dependencies = [
 [[package]]
 name = "swap_or_not_shuffle"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "alloy-primitives",
  "ethereum_hashing",
@@ -8028,7 +8028,7 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
 [[package]]
 name = "task_executor"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "async-channel 1.9.0",
  "futures",
@@ -8063,7 +8063,7 @@ dependencies = [
 [[package]]
 name = "test_random_derive"
 version = "0.2.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -8531,7 +8531,7 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 [[package]]
 name = "types"
 version = "0.2.1"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -8687,7 +8687,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 [[package]]
 name = "unused_port"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "lru_cache",
  "parking_lot",
@@ -8750,7 +8750,7 @@ dependencies = [
 [[package]]
 name = "validator_metrics"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "metrics",
 ]
@@ -8758,7 +8758,7 @@ dependencies = [
 [[package]]
 name = "validator_services"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "beacon_node_fallback",
  "bls",
@@ -8782,7 +8782,7 @@ dependencies = [
 [[package]]
 name = "validator_store"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "slashing_protection",
  "types",
@@ -9539,7 +9539,7 @@ dependencies = [
 [[package]]
 name = "workspace_members"
 version = "0.1.0"
-source = "git+https://github.com/sigp/lighthouse?rev=f1056d9c#f1056d9c19a699c1cb0215dae416aef41fdd29b8"
+source = "git+https://github.com/sigp/lighthouse?rev=2c153d7e#2c153d7e1ace7bb3df053c5eda8bf7a9c740f1b7"
 dependencies = [
  "cargo_metadata",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index bccfad6a4..c54977f84 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,24 +58,24 @@ ssv_types = { path = "anchor/common/ssv_types" }
 subnet_tracker = { path = "anchor/subnet_tracker" }
 version = { path = "anchor/common/version" }
 
-beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-bls = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-eth2 = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-metrics = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-task_executor = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-types = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-unused_port = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-validator_services = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-validator_store = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
-workspace_members = { git = "https://github.com/sigp/lighthouse", rev = "f1056d9c" }
+beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+bls = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+eth2 = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+metrics = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+task_executor = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+types = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+unused_port = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+validator_services = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+validator_store = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
+workspace_members = { git = "https://github.com/sigp/lighthouse", rev = "2c153d7e" }
 
 alloy = { version = "0.12.0", features = [
     "sol-types",
@@ -103,7 +103,7 @@ enr = "0.13.0"
 ethereum_ssz = "0.8"
 ethereum_ssz_derive = "0.8"
 futures = "0.3.30"
-gossipsub = { package = "libp2p-gossipsub", git = "https://github.com/sigp/rust-libp2p.git", rev = "7a36e4c" }
+gossipsub = { package = "libp2p-gossipsub", git = "https://github.com/sigp/rust-libp2p.git", rev = "61b2820" }
 hex = "0.4.3"
 hyper = "1.4"
 indexmap = "2.7.0"
diff --git a/anchor/client/src/lib.rs b/anchor/client/src/lib.rs
index a16684a48..df07ce455 100644
--- a/anchor/client/src/lib.rs
+++ b/anchor/client/src/lib.rs
@@ -50,9 +50,12 @@ use tracing::{debug, error, info, warn};
 use types::{ChainSpec, EthSpec, Hash256};
 use validator_metrics::set_gauge;
 use validator_services::{
-    attestation_service::AttestationServiceBuilder, block_service::BlockServiceBuilder,
-    duties_service, duties_service::DutiesServiceBuilder,
-    preparation_service::PreparationServiceBuilder, sync_committee_service::SyncCommitteeService,
+    attestation_service::AttestationServiceBuilder,
+    block_service::BlockServiceBuilder,
+    duties_service,
+    duties_service::{DutiesServiceBuilder, SelectionProofConfig},
+    preparation_service::PreparationServiceBuilder,
+    sync_committee_service::SyncCommitteeService,
 };
 use zeroize::Zeroizing;
 
@@ -76,6 +79,7 @@ const HTTP_GET_BEACON_BLOCK_SSZ_TIMEOUT_QUOTIENT: u32 = 4;
 const HTTP_GET_DEBUG_BEACON_STATE_QUOTIENT: u32 = 4;
 const HTTP_GET_DEPOSIT_SNAPSHOT_QUOTIENT: u32 = 4;
 const HTTP_GET_VALIDATOR_BLOCK_TIMEOUT_QUOTIENT: u32 = 4;
+const HTTP_DEFAULT_TIMEOUT_QUOTIENT: u32 = 4;
 
 pub struct Client {}
 
@@ -231,17 +235,20 @@ impl Client {
                     attester_duties: slot_duration / HTTP_ATTESTER_DUTIES_TIMEOUT_QUOTIENT,
                     attestation_subscriptions: slot_duration
                         / HTTP_ATTESTATION_SUBSCRIPTIONS_TIMEOUT_QUOTIENT,
+                    attestation_aggregators: slot_duration / HTTP_ATTESTATION_TIMEOUT_QUOTIENT,
                     liveness: slot_duration / HTTP_LIVENESS_TIMEOUT_QUOTIENT,
                     proposal: slot_duration / HTTP_PROPOSAL_TIMEOUT_QUOTIENT,
                     proposer_duties: slot_duration / HTTP_PROPOSER_DUTIES_TIMEOUT_QUOTIENT,
                     sync_committee_contribution: slot_duration
                         / HTTP_SYNC_COMMITTEE_CONTRIBUTION_TIMEOUT_QUOTIENT,
                     sync_duties: slot_duration / HTTP_SYNC_DUTIES_TIMEOUT_QUOTIENT,
+                    sync_aggregators: slot_duration / HTTP_SYNC_DUTIES_TIMEOUT_QUOTIENT,
                     get_beacon_blocks_ssz: slot_duration
                         / HTTP_GET_BEACON_BLOCK_SSZ_TIMEOUT_QUOTIENT,
                     get_debug_beacon_states: slot_duration / HTTP_GET_DEBUG_BEACON_STATE_QUOTIENT,
                     get_deposit_snapshot: slot_duration / HTTP_GET_DEPOSIT_SNAPSHOT_QUOTIENT,
                     get_validator_block: slot_duration / HTTP_GET_VALIDATOR_BLOCK_TIMEOUT_QUOTIENT,
+                    default: slot_duration / HTTP_DEFAULT_TIMEOUT_QUOTIENT,
                 }
             } else {
                 Timeouts::set_all(slot_duration)
@@ -478,6 +485,13 @@ impl Client {
             config.prefer_builder_proposals,
         );
 
+        let selection_proof_config = SelectionProofConfig {
+            lookahead_slot: 0,
+            computation_offset: Duration::ZERO,
+            selections_endpoint: false,
+            parallel_sign: true,
+        };
+
         let duties_service = Arc::new(
             DutiesServiceBuilder::new()
                 .slot_clock(slot_clock.clone())
@@ -486,7 +500,8 @@ impl Client {
                 .spec(spec.clone())
                 .executor(executor.clone())
                 .enable_high_validator_count_metrics(config.enable_high_validator_count_metrics)
-                .distributed(true)
+                .attestation_selection_proof_config(selection_proof_config)
+                .sync_selection_proof_config(selection_proof_config)
                 .build()?,
         );
 
diff --git a/anchor/validator_store/src/lib.rs b/anchor/validator_store/src/lib.rs
index 54d0d64ca..5498db90f 100644
--- a/anchor/validator_store/src/lib.rs
+++ b/anchor/validator_store/src/lib.rs
@@ -58,7 +58,6 @@ use types::{
     signed_aggregate_and_proof::SignedAggregateAndProof,
     signed_beacon_block::SignedBeaconBlock,
     signed_contribution_and_proof::SignedContributionAndProof,
-    signed_voluntary_exit::SignedVoluntaryExit,
     slot_data::SlotData,
     slot_epoch::{Epoch, Slot},
     sync_committee_contribution::SyncCommitteeContribution,
@@ -67,7 +66,6 @@ use types::{
     sync_subnet_id::SyncSubnetId,
     typenum::U13,
     validator_registration_data::{SignedValidatorRegistrationData, ValidatorRegistrationData},
-    voluntary_exit::VoluntaryExit,
 };
 use validator_metrics::IntCounterVec;
 use validator_store::{
@@ -923,15 +921,6 @@ impl<T: SlotClock, E: EthSpec> ValidatorStore for AnchorValidatorStore<T, E> {
         Ok(())
     }
 
-    async fn sign_voluntary_exit(
-        &self,
-        _validator_pubkey: PublicKeyBytes,
-        _voluntary_exit: VoluntaryExit,
-    ) -> Result<SignedVoluntaryExit, Error> {
-        // there should be no situation ever where we want to sign an exit
-        Err(Error::SpecificError(SpecificError::Unsupported))
-    }
-
     async fn sign_validator_registration_data(
         &self,
         mut validator_registration_data: ValidatorRegistrationData,