diff --git a/Makefile b/Makefile
index 3f5d573cd54..94439fe7fba 100644
--- a/Makefile
+++ b/Makefile
@@ -199,7 +199,7 @@ arbitrary-fuzz:
 # Runs cargo audit (Audit Cargo.lock files for crates with security vulnerabilities reported to the RustSec Advisory Database)
 audit:
 	cargo install --force cargo-audit
-	cargo audit --ignore RUSTSEC-2023-0052
+	cargo audit
 
 # Runs `cargo vendor` to make sure dependencies can be vendored for packaging, reproducibility and archival purpose.
 vendor:
diff --git a/account_manager/Cargo.toml b/account_manager/Cargo.toml
index 238e4a77e08..0fab7b31fe3 100644
--- a/account_manager/Cargo.toml
+++ b/account_manager/Cargo.toml
@@ -5,31 +5,31 @@ authors = [
     "Paul Hauner <paul@paulhauner.com>",
     "Luke Anderson <luke@sigmaprime.io>",
 ]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-bls = { path = "../crypto/bls" }
-clap = "2.33.3"
-types = { path = "../consensus/types" }
-environment = { path = "../lighthouse/environment" }
-eth2_network_config = { path = "../common/eth2_network_config" }
-clap_utils = { path = "../common/clap_utils" }
-directory = { path = "../common/directory" }
-eth2_wallet = { path = "../crypto/eth2_wallet" }
+bls = { workspace = true }
+clap = { workspace = true }
+types = { workspace = true }
+environment = { workspace = true }
+eth2_network_config = { workspace = true }
+clap_utils = { workspace = true }
+directory = { workspace = true }
+eth2_wallet = { workspace = true }
 eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
-validator_dir = { path = "../common/validator_dir" }
-tokio = { version = "1.14.0", features = ["full"] }
-eth2_keystore = { path = "../crypto/eth2_keystore" }
-account_utils = { path = "../common/account_utils" }
-slashing_protection = { path = "../validator_client/slashing_protection" }
-eth2 = { path = "../common/eth2" }
-safe_arith = { path = "../consensus/safe_arith" }
-slot_clock = { path = "../common/slot_clock" }
-filesystem = { path = "../common/filesystem" }
-sensitive_url = { path = "../common/sensitive_url" }
-serde = { version = "1.0.116", features = ["derive"] }
-serde_json = "1.0.58"
-slog = { version = "2.5.2" }
+validator_dir = { workspace = true }
+tokio = { workspace = true }
+eth2_keystore = { workspace = true }
+account_utils = { workspace = true }
+slashing_protection = { workspace = true }
+eth2 = { workspace = true }
+safe_arith = { workspace = true }
+slot_clock = { workspace = true }
+filesystem = { workspace = true }
+sensitive_url = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+slog = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }
diff --git a/beacon_node/beacon_chain/src/beacon_snapshot.rs b/beacon_node/beacon_chain/src/beacon_snapshot.rs
index 7d89df98293..afb13247766 100644
--- a/beacon_node/beacon_chain/src/beacon_snapshot.rs
+++ b/beacon_node/beacon_chain/src/beacon_snapshot.rs
@@ -1,4 +1,4 @@
-use serde_derive::Serialize;
+use serde::Serialize;
 use std::sync::Arc;
 use types::{
     beacon_state::CloneConfig, AbstractExecPayload, BeaconState, EthSpec, FullPayload, Hash256,
diff --git a/beacon_node/beacon_chain/src/chain_config.rs b/beacon_node/beacon_chain/src/chain_config.rs
index 885cf2447c3..eb22dcf0774 100644
--- a/beacon_node/beacon_chain/src/chain_config.rs
+++ b/beacon_node/beacon_chain/src/chain_config.rs
@@ -1,5 +1,5 @@
 pub use proto_array::{DisallowedReOrgOffsets, ReOrgThreshold};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use types::{Checkpoint, Epoch, ProgressiveBalancesMode};
 
diff --git a/beacon_node/beacon_processor/Cargo.toml b/beacon_node/beacon_processor/Cargo.toml
index c626441bb71..723b09b581c 100644
--- a/beacon_node/beacon_processor/Cargo.toml
+++ b/beacon_node/beacon_processor/Cargo.toml
@@ -1,26 +1,26 @@
 [package]
 name = "beacon_processor"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-slog = { version = "2.5.2", features = ["max_level_trace"] }
-itertools = "0.10.0"
-logging = { path = "../../common/logging" }
-tokio = { version = "1.14.0", features = ["full"] }
-tokio-util = { version = "0.6.3", features = ["time"] }
-futures = "0.3.7"
-fnv = "1.0.7"
-strum = "0.24.0"
-task_executor = { path = "../../common/task_executor" }
-slot_clock = { path = "../../common/slot_clock" }
-lighthouse_network =  { path = "../lighthouse_network" }
-hex = "0.4.2"
-derivative = "2.2.0"
-types = { path = "../../consensus/types" }
-ethereum_ssz = "0.5.0"
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-parking_lot = "0.12.0"
-num_cpus = "1.13.0"
-serde = { version = "1.0.116", features = ["derive"] }
\ No newline at end of file
+slog = { workspace = true }
+itertools = { workspace = true }
+logging = { workspace = true }
+tokio = { workspace = true }
+tokio-util = { workspace = true }
+futures = { workspace = true }
+fnv = { workspace = true }
+strum = { workspace = true }
+task_executor = { workspace = true }
+slot_clock = { workspace = true }
+lighthouse_network = { workspace = true }
+hex = { workspace = true }
+derivative = { workspace = true }
+types = { workspace = true }
+ethereum_ssz = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+parking_lot = { workspace = true }
+num_cpus = { workspace = true }
+serde = { workspace = true }
\ No newline at end of file
diff --git a/beacon_node/builder_client/Cargo.toml b/beacon_node/builder_client/Cargo.toml
index b79fc5e4073..21b9b841334 100644
--- a/beacon_node/builder_client/Cargo.toml
+++ b/beacon_node/builder_client/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "builder_client"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 authors = ["Sean Anderson <sean@sigmaprime.io>"]
 
 [dependencies]
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-sensitive_url = { path = "../../common/sensitive_url" }
-eth2 = { path = "../../common/eth2" }
-serde = { version = "1.0.116", features = ["derive"] }
-serde_json = "1.0.58"
-lighthouse_version = { path = "../../common/lighthouse_version" }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }
+eth2 = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+lighthouse_version = { workspace = true }
diff --git a/beacon_node/client/Cargo.toml b/beacon_node/client/Cargo.toml
index 87e16509026..b60748e30c6 100644
--- a/beacon_node/client/Cargo.toml
+++ b/beacon_node/client/Cargo.toml
@@ -2,45 +2,46 @@
 name = "client"
 version = "0.2.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-serde_yaml = "0.8.13"
-operation_pool = { path = "../operation_pool" }
-tokio = "1.14.0"
+serde_yaml = { workspace = true }
+state_processing = { workspace = true }
+operation_pool = { workspace = true }
+tokio = { workspace = true }
 
 [dependencies]
-state_processing = { path = "../../consensus/state_processing" }
-beacon_chain = { path = "../beacon_chain" }
-store = { path = "../store" }
-network = { path = "../network" }
+beacon_chain = { workspace = true }
+store = { workspace = true }
+network = { workspace = true }
 timer = { path = "../timer" }
-lighthouse_network = { path = "../lighthouse_network" }
-logging = { path = "../../common/logging" }
-parking_lot = "0.12.0"
-types = { path = "../../consensus/types" }
-eth2_config = { path = "../../common/eth2_config" }
-slot_clock = { path = "../../common/slot_clock" }
-serde = "1.0.116"
+lighthouse_network = { workspace = true }
+logging = { workspace = true }
+parking_lot = { workspace = true }
+types = { workspace = true }
+eth2_config = { workspace = true }
+slot_clock = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-error-chain = "0.12.4"
-slog = { version = "2.5.2", features = ["max_level_trace"] }
-tokio = "1.14.0"
-dirs = "3.0.1"
-eth1 = { path = "../eth1" }
-eth2 = { path = "../../common/eth2" }
-sensitive_url = { path = "../../common/sensitive_url" }
-genesis = { path = "../genesis" }
-task_executor = { path = "../../common/task_executor" }
-environment = { path = "../../lighthouse/environment" }
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
+error-chain = { workspace = true }
+slog = { workspace = true }
+tokio = { workspace = true }
+dirs = { workspace = true }
+eth1 = { workspace = true }
+eth2 = { workspace = true }
+sensitive_url = { workspace = true }
+genesis = { workspace = true }
+task_executor = { workspace = true }
+environment = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
 time = "0.3.5"
-directory = {path = "../../common/directory"}
-http_api = { path = "../http_api" }
+directory = { workspace = true }
+http_api = { workspace = true }
 http_metrics = { path = "../http_metrics" }
-slasher = { path = "../../slasher" }
+slasher = { workspace = true }
 slasher_service = { path = "../../slasher/service" }
-monitoring_api = {path = "../../common/monitoring_api"}
-execution_layer = { path = "../execution_layer" }
-beacon_processor =  { path = "../beacon_processor" }
+monitoring_api = { workspace = true }
+execution_layer = { workspace = true }
+beacon_processor = { workspace = true }
+num_cpus = { workspace = true }
diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml
index cc982aee089..2f716cd19bc 100644
--- a/beacon_node/eth1/Cargo.toml
+++ b/beacon_node/eth1/Cargo.toml
@@ -2,33 +2,33 @@
 name = "eth1"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-eth1_test_rig = { path = "../../testing/eth1_test_rig" }
-serde_yaml = "0.8.13"
-sloggers = { version = "2.1.1", features = ["json"] }
-environment = { path = "../../lighthouse/environment" }
+eth1_test_rig = { workspace = true }
+serde_yaml = { workspace = true }
+sloggers = { workspace = true }
+environment = { workspace = true }
 
 [dependencies]
-reqwest = { version = "0.11.0", features = ["native-tls-vendored"] }
-execution_layer = { path = "../execution_layer" }
-futures = "0.3.7"
-serde_json = "1.0.58"
-serde = { version = "1.0.116", features = ["derive"] }
-hex = "0.4.2"
-types = { path = "../../consensus/types"}
-merkle_proof = { path = "../../consensus/merkle_proof"}
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-tree_hash = "0.5.0"
-parking_lot = "0.12.0"
-slog = "2.5.2"
-superstruct = "0.5.0"
-tokio = { version = "1.14.0", features = ["full"] }
-state_processing = { path = "../../consensus/state_processing" }
-lighthouse_metrics = { path = "../../common/lighthouse_metrics"}
-lazy_static = "1.4.0"
-task_executor = { path = "../../common/task_executor" }
-eth2 = { path = "../../common/eth2" }
-sensitive_url = { path = "../../common/sensitive_url" }
+reqwest = { workspace = true }
+execution_layer = { workspace = true }
+futures = { workspace = true }
+serde_json = { workspace = true }
+serde = { workspace = true }
+hex = { workspace = true }
+types = { workspace = true }
+merkle_proof = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+tree_hash = { workspace = true }
+parking_lot = { workspace = true }
+slog = { workspace = true }
+superstruct = { workspace = true }
+tokio = { workspace = true }
+state_processing = { workspace = true }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+task_executor = { workspace = true }
+eth2 = { workspace = true }
+sensitive_url = { workspace = true }
diff --git a/beacon_node/execution_layer/Cargo.toml b/beacon_node/execution_layer/Cargo.toml
index 80b4c069286..3651e371883 100644
--- a/beacon_node/execution_layer/Cargo.toml
+++ b/beacon_node/execution_layer/Cargo.toml
@@ -1,56 +1,56 @@
 [package]
 name = "execution_layer"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-types = { path = "../../consensus/types"}
-tokio = { version = "1.10.0", features = ["full"] }
+types = { workspace = true }
+tokio = { workspace = true }
 async-trait = "0.1.51"
-slog = "2.5.2"
-futures = "0.3.7"
-sensitive_url = { path = "../../common/sensitive_url" }
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-ethereum_serde_utils = "0.5.0"
-serde_json = "1.0.58"
-serde = { version = "1.0.116", features = ["derive"] }
-warp = { version = "0.3.2", features = ["tls"] }
+slog = { workspace = true }
+futures = { workspace = true }
+sensitive_url = { workspace = true }
+reqwest = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+serde_json = { workspace = true }
+serde = { workspace = true }
+warp = { workspace = true }
 jsonwebtoken = "8"
-environment = { path = "../../lighthouse/environment" }
-bytes = "1.1.0"
-task_executor = { path = "../../common/task_executor" }
-hex = "0.4.2"
-ethereum_ssz = "0.5.0"
-ssz_types = "0.5.3"
-eth2 = { path = "../../common/eth2" }
-state_processing = { path = "../../consensus/state_processing" }
-superstruct = "0.6.0"
-lru = "0.7.1"
-exit-future = "0.2.0"
-tree_hash = "0.5.0"
-tree_hash_derive = "0.5.0"
-parking_lot = "0.12.0"
-slot_clock = { path = "../../common/slot_clock" }
-tempfile = "3.1.0"
-rand = "0.8.5"
-zeroize = { version = "1.4.2", features = ["zeroize_derive"] }
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-lazy_static = "1.4.0"
-ethers-core = "1.0.2"
+environment = { workspace = true }
+bytes = { workspace = true }
+task_executor = { workspace = true }
+hex = { workspace = true }
+ethereum_ssz = { workspace = true }
+ssz_types = { workspace = true }
+eth2 = { workspace = true }
+state_processing = { workspace = true }
+superstruct = { workspace = true }
+lru = { workspace = true }
+exit-future = { workspace = true }
+tree_hash = { workspace = true }
+tree_hash_derive = { workspace = true }
+parking_lot = { workspace = true }
+slot_clock = { workspace = true }
+tempfile = { workspace = true }
+rand = { workspace = true }
+zeroize = { workspace = true }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+ethers-core = { workspace = true }
 builder_client = { path = "../builder_client" }
-fork_choice = { path = "../../consensus/fork_choice" }
+fork_choice = { workspace = true }
 mev-rs = { git = "https://github.com/ralexstokes/mev-rs", rev = "216657016d5c0889b505857c89ae42c7aa2764af" }
 axum = "0.6"
 hyper = "0.14"
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "e380108" }
 ssz_rs = "0.9.0"
-tokio-stream = { version = "0.1.9", features = [ "sync" ] }
-strum = "0.24.0"
+tokio-stream = { workspace = true }
+strum = { workspace = true }
 keccak-hash = "0.10.0"
 hash256-std-hasher = "0.15.2"
 triehash = "0.8.4"
 hash-db = "0.15.2"
-pretty_reqwest_error = { path = "../../common/pretty_reqwest_error" }
+pretty_reqwest_error = { workspace = true }
 arc-swap = "1.6.0"
diff --git a/beacon_node/genesis/Cargo.toml b/beacon_node/genesis/Cargo.toml
index 8a7d224963e..b01e6a6aea7 100644
--- a/beacon_node/genesis/Cargo.toml
+++ b/beacon_node/genesis/Cargo.toml
@@ -2,23 +2,23 @@
 name = "genesis"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-eth1_test_rig = { path = "../../testing/eth1_test_rig" }
-sensitive_url = { path = "../../common/sensitive_url" }
+eth1_test_rig = { workspace = true }
+sensitive_url = { workspace = true }
 
 [dependencies]
-futures = "0.3.7"
-types = { path = "../../consensus/types"}
-environment = { path = "../../lighthouse/environment"}
-eth1 = { path = "../eth1"}
-rayon = "1.4.1"
-state_processing = { path = "../../consensus/state_processing" }
-merkle_proof = { path = "../../consensus/merkle_proof" }
-ethereum_ssz = "0.5.0"
-ethereum_hashing = "1.0.0-beta.2"
-tree_hash = "0.5.0"
-tokio = { version = "1.14.0", features = ["full"] }
-slog = "2.5.2"
-int_to_bytes = { path = "../../consensus/int_to_bytes" }
+futures = { workspace = true }
+types = { workspace = true }
+environment = { workspace = true }
+eth1 = { workspace = true }
+rayon = { workspace = true }
+state_processing = { workspace = true }
+merkle_proof = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_hashing = { workspace = true }
+tree_hash = { workspace = true }
+tokio = { workspace = true }
+slog = { workspace = true }
+int_to_bytes = { workspace = true }
diff --git a/beacon_node/http_metrics/Cargo.toml b/beacon_node/http_metrics/Cargo.toml
index c98f2cb8563..f8c93ad8fc1 100644
--- a/beacon_node/http_metrics/Cargo.toml
+++ b/beacon_node/http_metrics/Cargo.toml
@@ -2,25 +2,25 @@
 name = "http_metrics"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-warp = "0.3.2"
-serde = { version = "1.0.116", features = ["derive"] }
-slog = "2.5.2"
-beacon_chain = { path = "../beacon_chain" }
-store = { path = "../store" }
-lighthouse_network = { path = "../lighthouse_network" }
-slot_clock = { path = "../../common/slot_clock" }
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-lighthouse_version = { path = "../../common/lighthouse_version" }
-warp_utils = { path = "../../common/warp_utils" }
-malloc_utils = { path = "../../common/malloc_utils" }
+warp = { workspace = true }
+serde = { workspace = true }
+slog = { workspace = true }
+beacon_chain = { workspace = true }
+store = { workspace = true }
+lighthouse_network = { workspace = true }
+slot_clock = { workspace = true }
+lighthouse_metrics = { workspace = true }
+lighthouse_version = { workspace = true }
+warp_utils = { workspace = true }
+malloc_utils = { workspace = true }
 
 [dev-dependencies]
-tokio = { version = "1.14.0", features = ["sync"] }
-reqwest = { version = "0.11.0", features = ["json"] }
-environment = { path = "../../lighthouse/environment" }
-types = { path = "../../consensus/types" }
+tokio = { workspace = true }
+reqwest = { workspace = true }
+environment = { workspace = true }
+types = { workspace = true }
diff --git a/beacon_node/lighthouse_network/Cargo.toml b/beacon_node/lighthouse_network/Cargo.toml
index 3e399f74800..07674fb6dd2 100644
--- a/beacon_node/lighthouse_network/Cargo.toml
+++ b/beacon_node/lighthouse_network/Cargo.toml
@@ -2,47 +2,47 @@
 name = "lighthouse_network"
 version = "0.2.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-discv5 = { version = "0.3.1", features = ["libp2p"] }
-unsigned-varint = { version = "0.6.0", features = ["codec"] }
-types = { path =  "../../consensus/types" }
-ssz_types = "0.5.3"
-serde = { version = "1.0.116", features = ["derive"] }
-serde_derive = "1.0.116"
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-tree_hash = "0.5.0"
-tree_hash_derive = "0.5.0"
-slog = { version = "2.5.2", features = ["max_level_trace"] }
-lighthouse_version = { path = "../../common/lighthouse_version" }
-tokio = { version = "1.14.0", features = ["time", "macros"] }
-futures = "0.3.7"
-error-chain = "0.12.4"
-dirs = "3.0.1"
-fnv = "1.0.7"
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-smallvec = "1.6.1"
-tokio-io-timeout = "1.1.1"
-lru = "0.7.1"
-lru_cache = { path = "../../common/lru_cache" }
-parking_lot = "0.12.0"
-sha2 = "0.10"
-snap = "1.0.1"
-hex = "0.4.2"
-tokio-util = { version = "0.6.2", features = ["codec", "compat", "time"] }
-tiny-keccak = "2.0.2"
-task_executor = { path = "../../common/task_executor" }
-rand = "0.8.5"
-directory = { path = "../../common/directory" }
-regex = "1.5.5"
-strum = { version = "0.24.0", features = ["derive"] }
-superstruct = "0.5.0"
+discv5 = { workspace = true }
+unsigned-varint = { version = "0.6", features = ["codec"] }
+ssz_types = { workspace = true }
+types = { workspace = true }
+serde = { workspace = true }
+serde_derive = "1"
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+tree_hash = { workspace = true }
+tree_hash_derive = { workspace = true }
+slog = { workspace = true }
+lighthouse_version = { workspace = true }
+tokio = { workspace = true }
+futures = { workspace = true }
+error-chain = { workspace = true }
+dirs = { workspace = true }
+fnv = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+smallvec = { workspace = true }
+tokio-io-timeout = "1"
+lru = { workspace = true }
+lru_cache = { workspace = true }
+parking_lot = { workspace = true }
+sha2 = { workspace = true }
+snap = { workspace = true }
+hex = { workspace = true }
+tokio-util = { workspace = true }
+tiny-keccak = "2"
+task_executor = { workspace = true }
+rand = { workspace = true }
+directory = { workspace = true }
+regex = { workspace = true }
+strum = { workspace = true }
+superstruct = { workspace = true }
 prometheus-client = "0.21.0"
-unused_port = { path = "../../common/unused_port" }
-delay_map = "0.3.0"
+unused_port = { workspace = true }
+delay_map = { workspace = true }
 void = "1"
 libp2p-quic= { version = "0.9.2", features=["tokio"]}
 libp2p-mplex = "0.40.0"
@@ -53,10 +53,13 @@ default-features = false
 features = ["identify", "yamux", "noise", "gossipsub", "dns", "tcp", "tokio", "plaintext", "secp256k1", "macros", "ecdsa"]
 
 [dev-dependencies]
-slog-term = "2.6.0"
-slog-async = "2.5.0"
-tempfile = "3.1.0"
-exit-future = "0.2.0"
-void = "1"
-quickcheck = "0.9.2"
-quickcheck_macros = "0.9.1"
+slog-term = { workspace = true }
+slog-async = { workspace = true }
+tempfile = { workspace = true }
+exit-future = { workspace = true }
+quickcheck = { workspace = true }
+quickcheck_macros = { workspace = true }
+
+[features]
+libp2p-websocket = []
+
diff --git a/beacon_node/lighthouse_network/src/config.rs b/beacon_node/lighthouse_network/src/config.rs
index 7b850e4f0d4..51b8397b352 100644
--- a/beacon_node/lighthouse_network/src/config.rs
+++ b/beacon_node/lighthouse_network/src/config.rs
@@ -453,7 +453,7 @@ pub fn gossipsub_config(
     // We use the first 8 bytes of SHA256(topic, data) for content addressing
     let fast_gossip_message_id = |message: &gossipsub::RawMessage| {
         let data = [message.topic.as_str().as_bytes(), &message.data].concat();
-        gossipsub::FastMessageId::from(&Sha256::digest(data)[..8])
+        gossipsub::FastMessageId::from(&Sha256::digest(&data)[..8])
     };
     fn prefix(
         prefix: [u8; 4],
diff --git a/beacon_node/lighthouse_network/src/peer_manager/mod.rs b/beacon_node/lighthouse_network/src/peer_manager/mod.rs
index 7a975e5e8e5..6e0f327a3ac 100644
--- a/beacon_node/lighthouse_network/src/peer_manager/mod.rs
+++ b/beacon_node/lighthouse_network/src/peer_manager/mod.rs
@@ -2192,7 +2192,7 @@ mod tests {
         }
 
         impl Arbitrary for PeerCondition {
-            fn arbitrary<G: Gen>(g: &mut G) -> Self {
+            fn arbitrary(g: &mut Gen) -> Self {
                 let attestation_net_bitfield = {
                     let len = <E as EthSpec>::SubnetBitfieldLength::to_usize();
                     let mut bitfield = Vec::with_capacity(len);
diff --git a/beacon_node/operation_pool/Cargo.toml b/beacon_node/operation_pool/Cargo.toml
index fdbecb656f4..afdbd7257a0 100644
--- a/beacon_node/operation_pool/Cargo.toml
+++ b/beacon_node/operation_pool/Cargo.toml
@@ -2,26 +2,26 @@
 name = "operation_pool"
 version = "0.2.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-derivative = "2.1.1"
-itertools = "0.10.0"
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-parking_lot = "0.12.0"
-types = { path = "../../consensus/types" }
-state_processing = { path = "../../consensus/state_processing" }
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-rayon = "1.5.0"
-serde = "1.0.116"
+derivative = { workspace = true }
+itertools = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+parking_lot = { workspace = true }
+types = { workspace = true }
+state_processing = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+rayon = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-store = { path = "../store" }
-bitvec = "1"
-rand = "0.8.5"
+store = { workspace = true }
+bitvec = { workspace = true }
+rand = { workspace = true }
 
 [dev-dependencies]
-beacon_chain =  { path = "../beacon_chain" }
-tokio = { version = "1.14.0", features = ["rt-multi-thread"] }
-maplit = "1.0.2"
+beacon_chain = { workspace = true }
+tokio = { workspace = true }
+maplit = { workspace = true }
diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml
index a952f1b2ffb..32c3868294f 100644
--- a/beacon_node/store/Cargo.toml
+++ b/beacon_node/store/Cargo.toml
@@ -2,27 +2,27 @@
 name = "store"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
-beacon_chain = {path = "../beacon_chain"}
+tempfile = { workspace = true }
+beacon_chain = { workspace = true }
 
 [dependencies]
 db-key = "0.0.5"
-leveldb = { version = "0.8.6" }
-parking_lot = "0.12.0"
-itertools = "0.10.0"
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-types = { path =  "../../consensus/types" }
-state_processing = { path = "../../consensus/state_processing" }
-slog = "2.5.2"
-serde = "1.0.116"
+leveldb = { version = "0.8" }
+parking_lot = { workspace = true }
+itertools = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+types = { workspace = true }
+state_processing = { workspace = true }
+slog = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-lru = "0.7.1"
-sloggers = { version = "2.1.1", features = ["json"] }
-directory = { path = "../../common/directory" }
-strum = { version = "0.24.0", features = ["derive"] }
\ No newline at end of file
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+lru = { workspace = true }
+sloggers = { workspace = true }
+directory = { workspace = true }
+strum = { workspace = true }
diff --git a/beacon_node/timer/Cargo.toml b/beacon_node/timer/Cargo.toml
index bd20f24ee62..afb93f3657d 100644
--- a/beacon_node/timer/Cargo.toml
+++ b/beacon_node/timer/Cargo.toml
@@ -2,11 +2,11 @@
 name = "timer"
 version = "0.2.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-beacon_chain =  { path = "../beacon_chain" }
-slot_clock = { path = "../../common/slot_clock" }
-tokio = { version = "1.14.0", features = ["full"] }
-slog = "2.5.2"
-task_executor = { path = "../../common/task_executor" }
+beacon_chain = { workspace = true }
+slot_clock = { workspace = true }
+tokio = { workspace = true }
+slog = { workspace = true }
+task_executor = { workspace = true }
diff --git a/boot_node/Cargo.toml b/boot_node/Cargo.toml
index fcbe8f84d27..c305e70d686 100644
--- a/boot_node/Cargo.toml
+++ b/boot_node/Cargo.toml
@@ -2,26 +2,26 @@
 name = "boot_node"
 version = "4.4.1"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-beacon_node = { path = "../beacon_node" }
-clap = "2.33.3"
-clap_utils = { path = "../common/clap_utils" }
-lighthouse_network = { path = "../beacon_node/lighthouse_network" }
-types = { path = "../consensus/types" }
-ethereum_ssz = "0.5.0"
-slog = "2.5.2"
-tokio = "1.14.0"
-log = "0.4.11"
-slog-term = "2.6.0"
-logging = { path = "../common/logging" }
-slog-async = "2.5.0"
+beacon_node = { workspace = true }
+clap = { workspace = true }
+clap_utils = { workspace = true }
+lighthouse_network = { workspace = true }
+types = { workspace = true }
+ethereum_ssz = { workspace = true }
+slog = { workspace = true }
+tokio = { workspace = true }
+log = { workspace = true }
+slog-term = { workspace = true }
+logging = { workspace = true }
+slog-async = { workspace = true }
 slog-scope = "4.3.0"
 slog-stdlog = "4.0.0"
-hex = "0.4.2"
-serde = "1.0.116"
+hex = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-serde_json = "1.0.66"
-serde_yaml = "0.8.13"
-eth2_network_config = { path = "../common/eth2_network_config" }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+eth2_network_config = { workspace = true }
diff --git a/common/account_utils/Cargo.toml b/common/account_utils/Cargo.toml
index ccff88ceef3..10113ab3206 100644
--- a/common/account_utils/Cargo.toml
+++ b/common/account_utils/Cargo.toml
@@ -2,22 +2,22 @@
 name = "account_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = "0.8.5"
-eth2_wallet = { path = "../../crypto/eth2_wallet" }
-eth2_keystore = { path = "../../crypto/eth2_keystore" }
-filesystem = { path = "../filesystem" }
-zeroize = { version = "1.4.2", features = ["zeroize_derive"] }
-serde = "1.0.116"
+rand = { workspace = true }
+eth2_wallet = { workspace = true }
+eth2_keystore = { workspace = true }
+filesystem = { workspace = true }
+zeroize = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-serde_yaml = "0.8.13"
-slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
-types = { path = "../../consensus/types" }
-validator_dir = { path = "../validator_dir" }
-regex = "1.5.5"
+serde_yaml = { workspace = true }
+slog = { workspace = true }
+types = { workspace = true }
+validator_dir = { workspace = true }
+regex = { workspace = true }
 rpassword = "5.0.0"
-directory = { path = "../directory" }
+directory = { workspace = true }
diff --git a/common/clap_utils/Cargo.toml b/common/clap_utils/Cargo.toml
index a882b7ce64b..e4dfb2a5560 100644
--- a/common/clap_utils/Cargo.toml
+++ b/common/clap_utils/Cargo.toml
@@ -2,18 +2,18 @@
 name = "clap_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "2.33.3"
-hex = "0.4.2"
-dirs = "3.0.1"
-eth2_network_config = { path = "../eth2_network_config" }
-ethereum_ssz = "0.5.0"
-ethereum-types = "0.14.1"
-serde = "1.0.116"
-serde_json = "1.0.59"
-serde_yaml = "0.8.13"
-types = { path = "../../consensus/types"}
+clap = { workspace = true }
+hex = { workspace = true }
+dirs = { workspace = true }
+eth2_network_config = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum-types = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+types = { workspace = true }
diff --git a/common/compare_fields/Cargo.toml b/common/compare_fields/Cargo.toml
index 58527b57112..8df989e7225 100644
--- a/common/compare_fields/Cargo.toml
+++ b/common/compare_fields/Cargo.toml
@@ -2,10 +2,10 @@
 name = "compare_fields"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-compare_fields_derive = { path = "../compare_fields_derive" }
+compare_fields_derive = { workspace = true }
 
 [package.metadata.cargo-udeps.ignore]
 development = ["compare_fields_derive"] # used in doc-tests
diff --git a/common/compare_fields_derive/Cargo.toml b/common/compare_fields_derive/Cargo.toml
index 7696d3606bd..b4bbbaa4369 100644
--- a/common/compare_fields_derive/Cargo.toml
+++ b/common/compare_fields_derive/Cargo.toml
@@ -2,11 +2,11 @@
 name = "compare_fields_derive"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [lib]
 proc-macro = true
 
 [dependencies]
-syn = "1.0.42"
-quote = "1.0.7"
+syn = { workspace = true }
+quote = { workspace = true }
diff --git a/common/deposit_contract/Cargo.toml b/common/deposit_contract/Cargo.toml
index aabc07fc524..a03ac2178f8 100644
--- a/common/deposit_contract/Cargo.toml
+++ b/common/deposit_contract/Cargo.toml
@@ -2,18 +2,18 @@
 name = "deposit_contract"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 build = "build.rs"
 
 [build-dependencies]
-reqwest = { version = "0.11.0", features = ["blocking", "json", "native-tls-vendored"] }
-serde_json = "1.0.58"
-sha2 = "0.10"
-hex = "0.4.2"
+reqwest = { workspace = true }
+serde_json = { workspace = true }
+sha2 = { workspace = true }
+hex = { workspace = true }
 
 [dependencies]
-types = { path = "../../consensus/types"}
-ethereum_ssz = "0.5.0"
-tree_hash = "0.5.0"
+types = { workspace = true }
+ethereum_ssz = { workspace = true }
+tree_hash = { workspace = true }
 ethabi = "16.0.0"
diff --git a/common/directory/Cargo.toml b/common/directory/Cargo.toml
index f7b77ab7b7d..f7243372618 100644
--- a/common/directory/Cargo.toml
+++ b/common/directory/Cargo.toml
@@ -2,11 +2,11 @@
 name = "directory"
 version = "0.1.0"
 authors = ["pawan <pawandhananjay@gmail.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "2.33.3"
-clap_utils = {path = "../clap_utils"}
-eth2_network_config = { path = "../eth2_network_config" }
+clap = { workspace = true }
+clap_utils = { workspace = true }
+eth2_network_config = { workspace = true }
diff --git a/common/eth2_config/Cargo.toml b/common/eth2_config/Cargo.toml
index 08f8c9a3937..20c3b0b6f26 100644
--- a/common/eth2_config/Cargo.toml
+++ b/common/eth2_config/Cargo.toml
@@ -2,8 +2,8 @@
 name = "eth2_config"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-types = { path = "../../consensus/types" }
-paste = "1.0.5"
+types = { workspace = true }
+paste = { workspace = true }
diff --git a/common/eth2_interop_keypairs/Cargo.toml b/common/eth2_interop_keypairs/Cargo.toml
index 7a376568eb8..ded62653e56 100644
--- a/common/eth2_interop_keypairs/Cargo.toml
+++ b/common/eth2_interop_keypairs/Cargo.toml
@@ -2,19 +2,19 @@
 name = "eth2_interop_keypairs"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lazy_static = "1.4.0"
+lazy_static = { workspace = true }
 num-bigint = "0.4.2"
-ethereum_hashing = "1.0.0-beta.2"
-hex = "0.4.2"
-serde_yaml = "0.8.13"
-serde = "1.0.116"
+ethereum_hashing = { workspace = true }
+hex = { workspace = true }
+serde_yaml = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-bls = { path = "../../crypto/bls" }
+bls = { workspace = true }
 
 [dev-dependencies]
 base64 = "0.13.0"
diff --git a/common/eth2_wallet_manager/Cargo.toml b/common/eth2_wallet_manager/Cargo.toml
index 8e6f0c0e5cf..f4717570653 100644
--- a/common/eth2_wallet_manager/Cargo.toml
+++ b/common/eth2_wallet_manager/Cargo.toml
@@ -2,13 +2,13 @@
 name = "eth2_wallet_manager"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-eth2_wallet = { path = "../../crypto/eth2_wallet" }
-lockfile = { path = "../lockfile" }
+eth2_wallet = { workspace = true }
+lockfile = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }
diff --git a/common/filesystem/Cargo.toml b/common/filesystem/Cargo.toml
index 66cbedbb833..fd026bd517a 100644
--- a/common/filesystem/Cargo.toml
+++ b/common/filesystem/Cargo.toml
@@ -2,7 +2,7 @@
 name = "filesystem"
 version = "0.1.0"
 authors = ["Mark Mackey <mark@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/common/lighthouse_metrics/Cargo.toml b/common/lighthouse_metrics/Cargo.toml
index 06e33555d98..6d905344011 100644
--- a/common/lighthouse_metrics/Cargo.toml
+++ b/common/lighthouse_metrics/Cargo.toml
@@ -2,10 +2,10 @@
 name = "lighthouse_metrics"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lazy_static = "1.4.0"
+lazy_static = { workspace = true }
 prometheus = "0.13.0"
diff --git a/common/lighthouse_version/Cargo.toml b/common/lighthouse_version/Cargo.toml
index 96ac266476c..3c4f9fe50ce 100644
--- a/common/lighthouse_version/Cargo.toml
+++ b/common/lighthouse_version/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lighthouse_version"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -11,4 +11,4 @@ git-version = "0.3.4"
 target_info = "0.1.0"
 
 [dev-dependencies]
-regex = "1.5.5"
+regex = { workspace = true }
diff --git a/common/lockfile/Cargo.toml b/common/lockfile/Cargo.toml
index b9616e87152..d0cca13d45f 100644
--- a/common/lockfile/Cargo.toml
+++ b/common/lockfile/Cargo.toml
@@ -2,10 +2,10 @@
 name = "lockfile"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-fs2 = "0.4.3"
+fs2 = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }
diff --git a/common/logging/Cargo.toml b/common/logging/Cargo.toml
index 0e158f58ff5..9c5321591bc 100644
--- a/common/logging/Cargo.toml
+++ b/common/logging/Cargo.toml
@@ -2,21 +2,21 @@
 name = "logging"
 version = "0.2.0"
 authors = ["blacktemplar <blacktemplar@a1.net>"]
-edition = "2021"
+edition = { workspace = true }
 
 [features]
 test_logger = [] # Print log output to stderr when running tests instead of dropping it
 
 [dependencies]
-slog = "2.5.2"
-slog-term = "2.6.0"
-tokio = { version = "1.26.0", features = ["sync"] }
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-lazy_static = "1.4.0"
-sloggers = { version = "2.1.1", features = ["json"] }
-slog-async = "2.7.0"
+slog = { workspace = true }
+slog-term = { workspace = true }
+tokio = { workspace = true }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+sloggers = { workspace = true }
+slog-async = { workspace = true }
 take_mut = "0.2.2"
-parking_lot = "0.12.1"
-serde = "1.0.153"
-serde_json = "1.0.94"
+parking_lot = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
diff --git a/common/lru_cache/Cargo.toml b/common/lru_cache/Cargo.toml
index 405b7be5d8f..73c623ed443 100644
--- a/common/lru_cache/Cargo.toml
+++ b/common/lru_cache/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lru_cache"
 version = "0.1.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-fnv = "1.0.7"
+fnv = { workspace = true }
diff --git a/common/malloc_utils/Cargo.toml b/common/malloc_utils/Cargo.toml
index c88ec0bd5af..4a5f39b6612 100644
--- a/common/malloc_utils/Cargo.toml
+++ b/common/malloc_utils/Cargo.toml
@@ -2,13 +2,13 @@
 name = "malloc_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-lazy_static = "1.4.0"
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
 libc = "0.2.79"
-parking_lot = "0.12.0"
+parking_lot = { workspace = true }
 jemalloc-ctl = { version = "0.5.0", optional = true }
 
 # Jemalloc's background_threads feature requires Linux (pthreads).
diff --git a/common/monitoring_api/Cargo.toml b/common/monitoring_api/Cargo.toml
index bfb5e720423..e22f747bb1a 100644
--- a/common/monitoring_api/Cargo.toml
+++ b/common/monitoring_api/Cargo.toml
@@ -2,22 +2,22 @@
 name = "monitoring_api"
 version = "0.1.0"
 authors = ["pawan <pawandhananjay@gmail.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-task_executor = { path = "../task_executor" }
-tokio = "1.14.0"
-eth2 = {path = "../eth2"}
-serde_json = "1.0.58"
-serde = "1.0.116"
+reqwest = { workspace = true }
+task_executor = { workspace = true }
+tokio = { workspace = true }
+eth2 = { workspace = true }
+serde_json = { workspace = true }
 serde_derive = "1.0.116"
-lighthouse_version = { path = "../lighthouse_version"}
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-slog = "2.5.2"
-store = { path = "../../beacon_node/store" }
-lazy_static = "1.4.0"
-regex = "1.5.5"
-sensitive_url = { path = "../sensitive_url" }
+serde = { workspace = true }
+lighthouse_version = { workspace = true }
+lighthouse_metrics = { workspace = true }
+slog = { workspace = true }
+store = { workspace = true }
+lazy_static = { workspace = true }
+regex = { workspace = true }
+sensitive_url = { workspace = true }
diff --git a/common/oneshot_broadcast/Cargo.toml b/common/oneshot_broadcast/Cargo.toml
index baefe10661b..12c9b40bc85 100644
--- a/common/oneshot_broadcast/Cargo.toml
+++ b/common/oneshot_broadcast/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "oneshot_broadcast"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-parking_lot = "0.12.0"
+parking_lot = { workspace = true }
diff --git a/common/pretty_reqwest_error/Cargo.toml b/common/pretty_reqwest_error/Cargo.toml
index ca9f4812b0c..dc79832cd3d 100644
--- a/common/pretty_reqwest_error/Cargo.toml
+++ b/common/pretty_reqwest_error/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "pretty_reqwest_error"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-sensitive_url = { path = "../sensitive_url" }
+reqwest = { workspace = true }
+sensitive_url = { workspace = true }
diff --git a/common/sensitive_url/Cargo.toml b/common/sensitive_url/Cargo.toml
index 6de591efcf9..d218c8d93a1 100644
--- a/common/sensitive_url/Cargo.toml
+++ b/common/sensitive_url/Cargo.toml
@@ -2,10 +2,10 @@
 name = "sensitive_url"
 version = "0.1.0"
 authors = ["Mac L <mjladson@pm.me>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-url = "2.2.1"
-serde = "1.0.116"
+url = { workspace = true }
+serde = { workspace = true }
diff --git a/common/slot_clock/Cargo.toml b/common/slot_clock/Cargo.toml
index d9fdd731262..31e53779a86 100644
--- a/common/slot_clock/Cargo.toml
+++ b/common/slot_clock/Cargo.toml
@@ -2,10 +2,10 @@
 name = "slot_clock"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-types = { path = "../../consensus/types" }
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-parking_lot = "0.12.0"
+types = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+parking_lot = { workspace = true }
diff --git a/common/system_health/Cargo.toml b/common/system_health/Cargo.toml
index 0956710b822..c02380c9d4a 100644
--- a/common/system_health/Cargo.toml
+++ b/common/system_health/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "system_health"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-lighthouse_network = { path = "../../beacon_node/lighthouse_network" }
-types = { path = "../../consensus/types" }
-sysinfo = "0.26.5"
-serde = "1.0.116"
+lighthouse_network = { workspace = true }
+types = { workspace = true }
+sysinfo = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-serde_json = "1.0.58"
-parking_lot = "0.12.0"
+serde_json = { workspace = true }
+parking_lot = { workspace = true }
diff --git a/common/target_check/Cargo.toml b/common/target_check/Cargo.toml
index 2cf2cacc644..206a636be47 100644
--- a/common/target_check/Cargo.toml
+++ b/common/target_check/Cargo.toml
@@ -2,7 +2,7 @@
 name = "target_check"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
 static_assertions = "1.1.0"
diff --git a/common/task_executor/Cargo.toml b/common/task_executor/Cargo.toml
index 08bb565870d..38f4eca3699 100644
--- a/common/task_executor/Cargo.toml
+++ b/common/task_executor/Cargo.toml
@@ -2,13 +2,13 @@
 name = "task_executor"
 version = "0.1.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-tokio = { version = "1.14.0", features = ["rt-multi-thread", "macros"] }
-slog = "2.5.2"
-futures = "0.3.7"
-exit-future = "0.2.0"
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-sloggers = { version = "2.1.1", features = ["json"] }
+tokio = { workspace = true }
+slog = { workspace = true }
+futures = { workspace = true }
+exit-future = { workspace = true }
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+sloggers = { workspace = true }
diff --git a/common/test_random_derive/Cargo.toml b/common/test_random_derive/Cargo.toml
index 8794eeea21e..79308797a4b 100644
--- a/common/test_random_derive/Cargo.toml
+++ b/common/test_random_derive/Cargo.toml
@@ -2,12 +2,12 @@
 name = "test_random_derive"
 version = "0.2.0"
 authors = ["thojest <thojest@gmail.com>"]
-edition = "2021"
+edition = { workspace = true }
 description = "Procedural derive macros for implementation of TestRandom trait"
 
 [lib]
 proc-macro = true
 
 [dependencies]
-syn = "1.0.42"
-quote = "1.0.7"
+syn = { workspace = true }
+quote = { workspace = true }
diff --git a/common/unused_port/Cargo.toml b/common/unused_port/Cargo.toml
index 2dd041ff07e..3d70cad2729 100644
--- a/common/unused_port/Cargo.toml
+++ b/common/unused_port/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "unused_port"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lru_cache = { path = "../lru_cache" }
-lazy_static = "1.4.0"
-parking_lot = "0.12.0"
+lru_cache = { workspace = true }
+lazy_static = { workspace = true }
+parking_lot = { workspace = true }
diff --git a/common/validator_dir/Cargo.toml b/common/validator_dir/Cargo.toml
index 8accddfcb9b..ae8742fe07b 100644
--- a/common/validator_dir/Cargo.toml
+++ b/common/validator_dir/Cargo.toml
@@ -2,7 +2,7 @@
 name = "validator_dir"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [features]
 insecure_keys = []
@@ -10,17 +10,17 @@ insecure_keys = []
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bls = { path = "../../crypto/bls" }
-eth2_keystore = { path = "../../crypto/eth2_keystore" }
-filesystem = { path = "../filesystem" }
-types = { path = "../../consensus/types" }
-rand = "0.8.5"
-deposit_contract = { path = "../deposit_contract" }
-tree_hash = "0.5.0"
-hex = "0.4.2"
-derivative = "2.1.1"
-lockfile = { path = "../lockfile" }
-directory = { path = "../directory" }
+bls = { workspace = true }
+eth2_keystore = { workspace = true }
+filesystem = { workspace = true }
+types = { workspace = true }
+rand = { workspace = true }
+deposit_contract = { workspace = true }
+tree_hash = { workspace = true }
+hex = { workspace = true }
+derivative = { workspace = true }
+lockfile = { workspace = true }
+directory = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }
diff --git a/common/warp_utils/Cargo.toml b/common/warp_utils/Cargo.toml
index e66aeddfb8e..85c1901badd 100644
--- a/common/warp_utils/Cargo.toml
+++ b/common/warp_utils/Cargo.toml
@@ -2,20 +2,20 @@
 name = "warp_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-warp = "0.3.2"
-eth2 = { path = "../eth2" }
-types = { path = "../../consensus/types" }
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-state_processing = { path = "../../consensus/state_processing" }
-safe_arith = { path = "../../consensus/safe_arith" }
-serde = { version = "1.0.116", features = ["derive"] }
-tokio = { version = "1.14.0", features = ["sync"] }
+warp = { workspace = true }
+eth2 = { workspace = true }
+types = { workspace = true }
+beacon_chain = { workspace = true }
+state_processing = { workspace = true }
+safe_arith = { workspace = true }
+serde = { workspace = true }
+tokio = { workspace = true }
 headers = "0.3.2"
-lighthouse_metrics = { path = "../lighthouse_metrics" }
-lazy_static = "1.4.0"
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
 serde_array_query = "0.1.0"
diff --git a/consensus/cached_tree_hash/Cargo.toml b/consensus/cached_tree_hash/Cargo.toml
index 0f43c8890f1..05edc348565 100644
--- a/consensus/cached_tree_hash/Cargo.toml
+++ b/consensus/cached_tree_hash/Cargo.toml
@@ -2,20 +2,20 @@
 name = "cached_tree_hash"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-ethereum-types = "0.14.1"
-ssz_types = "0.5.3"
-ethereum_hashing = "1.0.0-beta.2"
-ethereum_ssz_derive = "0.5.0"
-ethereum_ssz = "0.5.0"
-tree_hash = "0.5.0"
-smallvec = "1.6.1"
+ethereum-types = { workspace = true }
+ssz_types = { workspace = true }
+ethereum_hashing = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+ethereum_ssz = { workspace = true }
+tree_hash = { workspace = true }
+smallvec = { workspace = true }
 
 [dev-dependencies]
-quickcheck = "0.9.2"
-quickcheck_macros = "0.9.1"
+quickcheck = { workspace = true }
+quickcheck_macros = { workspace = true }
 
 [features]
 arbitrary = ["ethereum-types/arbitrary"]
diff --git a/consensus/fork_choice/Cargo.toml b/consensus/fork_choice/Cargo.toml
index 3864d52d47c..7a06d7352b7 100644
--- a/consensus/fork_choice/Cargo.toml
+++ b/consensus/fork_choice/Cargo.toml
@@ -2,19 +2,19 @@
 name = "fork_choice"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-types = { path = "../types" }
-state_processing = { path = "../state_processing" }
-proto_array = { path = "../proto_array" }
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
+types = { workspace = true }
+state_processing = { workspace = true }
+proto_array = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+slog = { workspace = true }
 
 [dev-dependencies]
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-store = { path = "../../beacon_node/store" }
-tokio = { version = "1.14.0", features = ["rt-multi-thread"] }
+beacon_chain = { workspace = true }
+store = { workspace = true }
+tokio = { workspace = true }
diff --git a/consensus/int_to_bytes/Cargo.toml b/consensus/int_to_bytes/Cargo.toml
index 73dfec40f96..03bec9d3801 100644
--- a/consensus/int_to_bytes/Cargo.toml
+++ b/consensus/int_to_bytes/Cargo.toml
@@ -2,11 +2,11 @@
 name = "int_to_bytes"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-bytes = "1.0.1"
+bytes = { workspace = true }
 
 [dev-dependencies]
 yaml-rust = "0.4.4"
-hex = "0.4.2"
+hex = { workspace = true }
diff --git a/consensus/merkle_proof/Cargo.toml b/consensus/merkle_proof/Cargo.toml
index 2b883f8646e..3bee25eaac9 100644
--- a/consensus/merkle_proof/Cargo.toml
+++ b/consensus/merkle_proof/Cargo.toml
@@ -2,17 +2,17 @@
 name = "merkle_proof"
 version = "0.2.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-ethereum-types = "0.14.1"
-ethereum_hashing = "1.0.0-beta.2"
-lazy_static = "1.4.0"
-safe_arith = { path = "../safe_arith" }
+ethereum-types = { workspace = true }
+ethereum_hashing = { workspace = true }
+lazy_static = { workspace = true }
+safe_arith = { workspace = true }
 
 [dev-dependencies]
-quickcheck = "0.9.2"
-quickcheck_macros = "0.9.1"
+quickcheck = { workspace = true }
+quickcheck_macros = { workspace = true }
 
 [features]
 arbitrary = ["ethereum-types/arbitrary"]
diff --git a/consensus/proto_array/Cargo.toml b/consensus/proto_array/Cargo.toml
index 81a535e34a1..b30173eb7e0 100644
--- a/consensus/proto_array/Cargo.toml
+++ b/consensus/proto_array/Cargo.toml
@@ -2,18 +2,18 @@
 name = "proto_array"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [[bin]]
 name = "proto_array"
 path = "src/bin.rs"
 
 [dependencies]
-types = { path = "../types" }
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-serde = "1.0.116"
+types = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-serde_yaml = "0.8.13"
-safe_arith = { path = "../safe_arith" }
-superstruct = "0.5.0"
\ No newline at end of file
+serde_yaml = { workspace = true }
+safe_arith = { workspace = true }
+superstruct = { workspace = true }
\ No newline at end of file
diff --git a/consensus/safe_arith/Cargo.toml b/consensus/safe_arith/Cargo.toml
index d212f988420..6f2e4b811c7 100644
--- a/consensus/safe_arith/Cargo.toml
+++ b/consensus/safe_arith/Cargo.toml
@@ -2,7 +2,7 @@
 name = "safe_arith"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/consensus/state_processing/Cargo.toml b/consensus/state_processing/Cargo.toml
index f19cd1d29df..e4dfb45d585 100644
--- a/consensus/state_processing/Cargo.toml
+++ b/consensus/state_processing/Cargo.toml
@@ -2,42 +2,39 @@
 name = "state_processing"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>", "Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dev-dependencies]
-env_logger = "0.9.0"
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-tokio = { version = "1.14.0", features = ["rt-multi-thread"] }
+env_logger = { workspace = true }
+beacon_chain = { workspace = true }
+tokio = { workspace = true }
 
 [dependencies]
-bls = { path = "../../crypto/bls" }
+bls = { workspace = true }
 integer-sqrt = "0.1.5"
-itertools = "0.10.0"
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-ssz_types = "0.5.3"
-merkle_proof = { path = "../merkle_proof" }
-safe_arith = { path = "../safe_arith" }
-tree_hash = "0.5.0"
-types = { path = "../types", default-features = false }
-rayon = "1.4.1"
-ethereum_hashing = "1.0.0-beta.2"
-int_to_bytes = { path = "../int_to_bytes" }
-smallvec = "1.6.1"
-arbitrary = { version = "1.0", features = ["derive"], optional = true }
-lighthouse_metrics = { path = "../../common/lighthouse_metrics", optional = true }
-lazy_static = { version = "1.4.0", optional = true }
-derivative = "2.1.1"
+itertools = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+ssz_types = { workspace = true }
+merkle_proof = { workspace = true }
+safe_arith = { workspace = true }
+tree_hash = { workspace = true }
+types = { workspace = true }
+rayon = { workspace = true }
+ethereum_hashing = { workspace = true }
+int_to_bytes = { workspace = true }
+smallvec = { workspace = true }
+arbitrary = { workspace = true }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+derivative = { workspace = true }
 
 [features]
-default = ["legacy-arith", "metrics"]
+default = ["legacy-arith"]
 fake_crypto = ["bls/fake_crypto"]
 legacy-arith = ["types/legacy-arith"]
-metrics = ["lighthouse_metrics", "lazy_static"]
 arbitrary-fuzz = [
-  "arbitrary",
   "types/arbitrary-fuzz",
-  "bls/arbitrary",
   "merkle_proof/arbitrary",
   "ethereum_ssz/arbitrary",
   "ssz_types/arbitrary",
diff --git a/consensus/state_processing/src/metrics.rs b/consensus/state_processing/src/metrics.rs
index 360b007678a..d8a51135e85 100644
--- a/consensus/state_processing/src/metrics.rs
+++ b/consensus/state_processing/src/metrics.rs
@@ -1,5 +1,3 @@
-#![cfg(feature = "metrics")]
-
 use lazy_static::lazy_static;
 pub use lighthouse_metrics::*;
 
diff --git a/consensus/state_processing/src/per_epoch_processing/epoch_processing_summary.rs b/consensus/state_processing/src/per_epoch_processing/epoch_processing_summary.rs
index 6eb2f97766b..89bc4ab5a34 100644
--- a/consensus/state_processing/src/per_epoch_processing/epoch_processing_summary.rs
+++ b/consensus/state_processing/src/per_epoch_processing/epoch_processing_summary.rs
@@ -21,7 +21,6 @@ pub enum EpochProcessingSummary<T: EthSpec> {
 
 impl<T: EthSpec> EpochProcessingSummary<T> {
     /// Updates some Prometheus metrics with some values in `self`.
-    #[cfg(feature = "metrics")]
     pub fn observe_metrics(&self) -> Result<(), ParticipationCacheError> {
         metrics::set_gauge(
             &metrics::PARTICIPATION_PREV_EPOCH_HEAD_ATTESTING_GWEI_TOTAL,
diff --git a/consensus/swap_or_not_shuffle/Cargo.toml b/consensus/swap_or_not_shuffle/Cargo.toml
index 303e5cfba17..ea9b603c5bc 100644
--- a/consensus/swap_or_not_shuffle/Cargo.toml
+++ b/consensus/swap_or_not_shuffle/Cargo.toml
@@ -2,18 +2,18 @@
 name = "swap_or_not_shuffle"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [[bench]]
 name = "benches"
 harness = false
 
 [dev-dependencies]
-criterion = "0.3.3"
+criterion = { workspace = true }
 
 [dependencies]
-ethereum_hashing = "1.0.0-beta.2"
-ethereum-types = "0.14.1"
+ethereum_hashing = { workspace = true }
+ethereum-types = { workspace = true }
 
 [features]
 arbitrary = ["ethereum-types/arbitrary"]
diff --git a/crypto/bls/Cargo.toml b/crypto/bls/Cargo.toml
index a610f257cdb..4340fb3e853 100644
--- a/crypto/bls/Cargo.toml
+++ b/crypto/bls/Cargo.toml
@@ -2,24 +2,25 @@
 name = "bls"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-ethereum_ssz = "0.5.0"
-tree_hash = "0.5.0"
-milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v1.4.2", optional = true }
-rand = "0.7.3"
-serde = "1.0.116"
+ethereum_ssz = { workspace = true }
+tree_hash = { workspace = true }
+milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v1.5.1", optional = true }
+rand = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-ethereum_serde_utils = "0.5.0"
-hex = "0.4.2"
-ethereum_hashing = "1.0.0-beta.2"
-ethereum-types = "0.14.1"
-arbitrary = { version = "1.0", features = ["derive"], optional = true }
-zeroize = { version = "1.4.2", features = ["zeroize_derive"] }
+ethereum_serde_utils = { workspace = true }
+hex = { workspace = true }
+ethereum_hashing = { workspace = true }
+ethereum-types = { workspace = true }
+arbitrary = { workspace = true }
+zeroize = { workspace = true }
 blst = { version = "0.3.3", optional = true }
 
 [features]
+arbitrary = []
 default = ["supranational"]
 fake_crypto = []
 milagro = ["milagro_bls"]
diff --git a/crypto/eth2_key_derivation/Cargo.toml b/crypto/eth2_key_derivation/Cargo.toml
index 3f174a02d4f..a0237ba7ede 100644
--- a/crypto/eth2_key_derivation/Cargo.toml
+++ b/crypto/eth2_key_derivation/Cargo.toml
@@ -2,16 +2,16 @@
 name = "eth2_key_derivation"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sha2 = "0.10"
-zeroize = { version = "1.4.2", features = ["zeroize_derive"] }
-num-bigint-dig = { version = "0.6.0", features = ["zeroize"] }
-ring = "0.16.19"
-bls = { path = "../bls" }
+sha2 = { workspace = true }
+zeroize = { workspace = true }
+num-bigint-dig = { version = "0.8.4", features = ["zeroize"] }
+ring = { workspace = true }
+bls = { workspace = true }
 
 [dev-dependencies]
-hex = "0.4.2"
+hex = { workspace = true }
diff --git a/crypto/eth2_keystore/Cargo.toml b/crypto/eth2_keystore/Cargo.toml
index d83a60da24a..bb6222807bd 100644
--- a/crypto/eth2_keystore/Cargo.toml
+++ b/crypto/eth2_keystore/Cargo.toml
@@ -2,26 +2,26 @@
 name = "eth2_keystore"
 version = "0.1.0"
 authors = ["Pawan Dhananjay <pawan@sigmaprime.io", "Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = "0.8.5"
+rand = { workspace = true }
 hmac = "0.11.0"
 pbkdf2 = { version = "0.8.0", default-features = false }
 scrypt = { version = "0.7.0", default-features = false }
-sha2 = "0.9.2"
-uuid = { version = "0.8.1", features = ["serde", "v4"] }
-zeroize = { version = "1.4.2", features = ["zeroize_derive"] }
-serde = "1.0.116"
-serde_repr = "0.1.6"
-hex = "0.4.2"
-bls = { path = "../bls" }
-serde_json = "1.0.58"
-eth2_key_derivation = { path = "../eth2_key_derivation" }
+sha2 = { workspace = true }
+uuid = { workspace = true }
+zeroize = { workspace = true }
+serde = { workspace = true }
+serde_repr = { workspace = true }
+hex = { workspace = true }
+bls = { workspace = true }
+serde_json = { workspace = true }
+eth2_key_derivation = { workspace = true }
 unicode-normalization = "0.1.16"
 aes = { version = "0.7", features = ["ctr"] }
 
 [dev-dependencies]
-tempfile = "3.1.0"
+tempfile = { workspace = true }
diff --git a/crypto/eth2_wallet/Cargo.toml b/crypto/eth2_wallet/Cargo.toml
index 71f66ff9335..f3af6aab592 100644
--- a/crypto/eth2_wallet/Cargo.toml
+++ b/crypto/eth2_wallet/Cargo.toml
@@ -2,20 +2,20 @@
 name = "eth2_wallet"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = "1.0.116"
-serde_json = "1.0.58"
-serde_repr = "0.1.6"
-uuid = { version = "0.8.1", features = ["serde", "v4"] }
-rand = "0.8.5"
-eth2_keystore = { path = "../eth2_keystore" }
-eth2_key_derivation = { path = "../eth2_key_derivation" }
-tiny-bip39 = "0.8.1"
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_repr = { workspace = true }
+uuid = { workspace = true }
+rand = { workspace = true }
+eth2_keystore = { workspace = true }
+eth2_key_derivation = { workspace = true }
+tiny-bip39 = "1"
 
 [dev-dependencies]
-hex = "0.4.2"
-tempfile = "3.1.0"
+hex = { workspace = true }
+tempfile = { workspace = true }
diff --git a/database_manager/Cargo.toml b/database_manager/Cargo.toml
index f715528138a..1570c171cb6 100644
--- a/database_manager/Cargo.toml
+++ b/database_manager/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 name = "database_manager"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-beacon_chain = { path = "../beacon_node/beacon_chain" }
-beacon_node = { path = "../beacon_node" }
-clap = "2.33.3"
-clap_utils = { path = "../common/clap_utils" }
-environment = { path = "../lighthouse/environment" }
-logging = { path = "../common/logging" }
-sloggers = "2.0.2"
-store = { path = "../beacon_node/store" }
-tempfile = "3.1.0"
-types = { path = "../consensus/types" }
-slog = "2.5.2"
-strum = { version = "0.24.0", features = ["derive"] }
+beacon_chain = { workspace = true }
+beacon_node = { workspace = true }
+clap = { workspace = true }
+clap_utils = { workspace = true }
+environment = { workspace = true }
+logging = { workspace = true }
+sloggers = { workspace = true }
+store = { workspace = true }
+tempfile = { workspace = true }
+types = { workspace = true }
+slog = { workspace = true }
+strum = { workspace = true }
diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml
index 920ad70142d..64d444efb87 100644
--- a/lighthouse/Cargo.toml
+++ b/lighthouse/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lighthouse"
 version = "4.4.1"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 autotests = false
 rust-version = "1.69.0"
 
@@ -28,45 +28,45 @@ slasher-lmdb = ["slasher/lmdb"]
 jemalloc = ["malloc_utils/jemalloc"]
 
 [dependencies]
-beacon_node = { "path" = "../beacon_node" }
-slog = { version = "2.5.2", features = ["max_level_trace"] }
-sloggers = { version = "2.1.1", features = ["json"] }
-types = { "path" = "../consensus/types" }
-bls = { path = "../crypto/bls" }
-ethereum_hashing = "1.0.0-beta.2"
-clap = "2.33.3"
-env_logger = "0.9.0"
-environment = { path = "./environment" }
+beacon_node = { workspace = true }
+slog = { workspace = true }
+sloggers = { workspace = true }
+types = { workspace = true }
+bls = { workspace = true }
+ethereum_hashing = { workspace = true }
+clap = { workspace = true }
+env_logger = { workspace = true }
+environment = { workspace = true }
 boot_node = { path = "../boot_node" }
-futures = "0.3.7"
-validator_client = { "path" = "../validator_client" }
+futures = { workspace = true }
+validator_client = { workspace = true }
 account_manager = { "path" = "../account_manager" }
-clap_utils = { path = "../common/clap_utils" }
-eth2_network_config = { path = "../common/eth2_network_config" }
-lighthouse_version = { path = "../common/lighthouse_version" }
-account_utils = { path = "../common/account_utils" }
-lighthouse_metrics = { path = "../common/lighthouse_metrics" }
-lazy_static = "1.4.0"
-serde = { version = "1.0.116", features = ["derive"] }
-serde_json = "1.0.59"
-serde_yaml = "0.8.13"
-task_executor = { path = "../common/task_executor" }
-malloc_utils = { path = "../common/malloc_utils" }
-directory = { path = "../common/directory" }
-unused_port = { path = "../common/unused_port" }
+clap_utils = { workspace = true }
+eth2_network_config = { workspace = true }
+lighthouse_version = { workspace = true }
+account_utils = { workspace = true }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+task_executor = { workspace = true }
+malloc_utils = { workspace = true }
+directory = { workspace = true }
+unused_port = { workspace = true }
 database_manager = { path = "../database_manager" }
-slasher = { path = "../slasher" }
+slasher = { workspace = true }
 validator_manager = { path = "../validator_manager" }
 
 [dev-dependencies]
-tempfile = "3.1.0"
-validator_dir = { path = "../common/validator_dir" }
-slashing_protection = { path = "../validator_client/slashing_protection" }
-lighthouse_network = { path = "../beacon_node/lighthouse_network" }
-sensitive_url = { path = "../common/sensitive_url" }
-eth1 = { path = "../beacon_node/eth1" }
-eth2 = { path = "../common/eth2" }
-beacon_processor = { path = "../beacon_node/beacon_processor" }
+tempfile = { workspace = true }
+validator_dir = { workspace = true }
+slashing_protection = { workspace = true }
+lighthouse_network = { workspace = true }
+sensitive_url = { workspace = true }
+eth1 = { workspace = true }
+eth2 = { workspace = true }
+beacon_processor = { workspace = true }
 
 [[test]]
 name = "lighthouse_tests"
diff --git a/lighthouse/environment/Cargo.toml b/lighthouse/environment/Cargo.toml
index 1ba0bb267c5..d2a181a1b9f 100644
--- a/lighthouse/environment/Cargo.toml
+++ b/lighthouse/environment/Cargo.toml
@@ -2,23 +2,23 @@
 name = "environment"
 version = "0.1.2"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-tokio = { version = "1.14.0", features = ["macros", "rt", "rt-multi-thread", "signal" ] }
-slog = { version = "2.5.2", features = ["max_level_trace"] }
-sloggers = { version = "2.1.1", features = ["json"] }
-types = { path = "../../consensus/types" }
-eth2_config = { path = "../../common/eth2_config" }
-task_executor = { path = "../../common/task_executor" }
-eth2_network_config = { path = "../../common/eth2_network_config" }
-logging = { path = "../../common/logging" }
-slog-term = "2.6.0"
-slog-async = "2.5.0"
-futures = "0.3.7"
+tokio = { workspace = true }
+slog = { workspace = true }
+sloggers = { workspace = true }
+types = { workspace = true }
+eth2_config = { workspace = true }
+task_executor = { workspace = true }
+eth2_network_config = { workspace = true }
+logging = { workspace = true }
+slog-term = { workspace = true }
+slog-async = { workspace = true }
+futures = { workspace = true }
 slog-json = "2.3.0"
-exit-future = "0.2.0"
-serde = "1.0.116"
+exit-future = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
 
 [target.'cfg(not(target_family = "unix"))'.dependencies]
diff --git a/slasher/Cargo.toml b/slasher/Cargo.toml
index bfa7b5f64c5..9df77daa103 100644
--- a/slasher/Cargo.toml
+++ b/slasher/Cargo.toml
@@ -2,7 +2,7 @@
 name = "slasher"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [features]
 default = ["lmdb"]
@@ -10,26 +10,26 @@ mdbx = ["dep:mdbx"]
 lmdb = ["lmdb-rkv", "lmdb-rkv-sys"]
 
 [dependencies]
-bincode = "1.3.1"
-byteorder = "1.3.4"
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
+bincode = { workspace = true }
+byteorder = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
 flate2 = { version = "1.0.14", features = ["zlib"], default-features = false }
-lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../common/lighthouse_metrics" }
-filesystem = { path = "../common/filesystem" }
-lru = "0.7.1"
-parking_lot = "0.12.0"
-rand = "0.8.5"
-safe_arith = { path = "../consensus/safe_arith" }
-serde = "1.0"
+lazy_static = { workspace = true }
+lighthouse_metrics = { workspace = true }
+filesystem = { workspace = true }
+lru = { workspace = true }
+parking_lot = { workspace = true }
+rand = { workspace = true }
+safe_arith = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0"
-slog = "2.5.2"
-sloggers = { version = "2.1.1", features = ["json"] }
-tree_hash = "0.5.0"
-tree_hash_derive = "0.5.0"
-types = { path = "../consensus/types" }
-strum = { version = "0.24.1", features = ["derive"] }
+slog = { workspace = true }
+sloggers = { workspace = true }
+tree_hash = { workspace = true }
+tree_hash_derive = { workspace = true }
+types = { workspace = true }
+strum = { workspace = true }
 
 # MDBX is pinned at the last version with Windows and macOS support.
 mdbx = { package = "libmdbx", git = "https://github.com/sigp/libmdbx-rs", tag = "v0.1.4", optional = true }
@@ -37,8 +37,8 @@ lmdb-rkv = { git = "https://github.com/sigp/lmdb-rs", rev = "f33845c6469b9426531
 lmdb-rkv-sys = { git = "https://github.com/sigp/lmdb-rs", rev = "f33845c6469b94265319aac0ed5085597862c27e", optional = true }
 
 [dev-dependencies]
-maplit = "1.0.2"
-rayon = "1.3.0"
-tempfile = "3.1.0"
-logging = { path = "../common/logging" }
+maplit = { workspace = true }
+rayon = { workspace = true }
+tempfile = { workspace = true }
+logging = { workspace = true }
 
diff --git a/slasher/service/Cargo.toml b/slasher/service/Cargo.toml
index 63cf1e4649e..41e3b5b90ad 100644
--- a/slasher/service/Cargo.toml
+++ b/slasher/service/Cargo.toml
@@ -2,17 +2,17 @@
 name = "slasher_service"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-directory = { path = "../../common/directory" }
-lighthouse_network = { path = "../../beacon_node/lighthouse_network" }
-network = { path = "../../beacon_node/network" }
-slasher = { path = ".." }
-slog = "2.5.2"
-slot_clock = { path = "../../common/slot_clock" }
-state_processing = { path = "../../consensus/state_processing" }
-task_executor = { path = "../../common/task_executor" }
-tokio = { version = "1.14.0", features = ["full"] }
-types = { path = "../../consensus/types" }
+beacon_chain = { workspace = true }
+directory = { workspace = true }
+lighthouse_network = { workspace = true }
+network = { workspace = true }
+slasher = { workspace = true }
+slog = { workspace = true }
+slot_clock = { workspace = true }
+state_processing = { workspace = true }
+task_executor = { workspace = true }
+tokio = { workspace = true }
+types = { workspace = true }
diff --git a/testing/ef_tests/Cargo.toml b/testing/ef_tests/Cargo.toml
index 11283052f07..16fe2250490 100644
--- a/testing/ef_tests/Cargo.toml
+++ b/testing/ef_tests/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ef_tests"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [features]
 # `ef_tests` feature must be enabled to actually run the tests
@@ -11,28 +11,28 @@ milagro = ["bls/milagro"]
 fake_crypto = ["bls/fake_crypto"]
 
 [dependencies]
-bls = { path = "../../crypto/bls", default-features = false }
-compare_fields = { path = "../../common/compare_fields" }
-compare_fields_derive = { path = "../../common/compare_fields_derive" }
-derivative = "2.1.1"
-ethereum-types = "0.14.1"
-hex = "0.4.2"
-rayon = "1.4.1"
-serde = "1.0.116"
+bls = { workspace = true }
+compare_fields = { workspace = true }
+compare_fields_derive = { workspace = true }
+derivative = { workspace = true }
+ethereum-types = { workspace = true }
+hex = { workspace = true }
+rayon = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-serde_repr = "0.1.6"
-serde_yaml = "0.8.13"
-ethereum_ssz = "0.5.0"
-ethereum_ssz_derive = "0.5.0"
-tree_hash = "0.5.0"
-tree_hash_derive = "0.5.0"
-cached_tree_hash = { path = "../../consensus/cached_tree_hash" }
-state_processing = { path = "../../consensus/state_processing" }
-swap_or_not_shuffle = { path = "../../consensus/swap_or_not_shuffle" }
-types = { path = "../../consensus/types" }
-snap = "1.0.1"
-fs2 = "0.4.3"
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-store = { path = "../../beacon_node/store" }
-fork_choice = { path = "../../consensus/fork_choice" }
-execution_layer = { path = "../../beacon_node/execution_layer" }
+serde_repr = { workspace = true }
+serde_yaml = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+tree_hash = { workspace = true }
+tree_hash_derive = { workspace = true }
+cached_tree_hash = { workspace = true }
+state_processing = { workspace = true }
+swap_or_not_shuffle = { workspace = true }
+types = { workspace = true }
+snap = { workspace = true }
+fs2 = { workspace = true }
+beacon_chain = { workspace = true }
+store = { workspace = true }
+fork_choice = { workspace = true }
+execution_layer = { workspace = true }
diff --git a/testing/eth1_test_rig/Cargo.toml b/testing/eth1_test_rig/Cargo.toml
index 5c78c090227..c76ef91183b 100644
--- a/testing/eth1_test_rig/Cargo.toml
+++ b/testing/eth1_test_rig/Cargo.toml
@@ -2,15 +2,15 @@
 name = "eth1_test_rig"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-tokio = { version = "1.14.0", features = ["time"] }
-ethers-core = "1.0.2"
-ethers-providers = "1.0.2"
+tokio = { workspace = true }
+ethers-core = { workspace = true }
+ethers-providers = { workspace = true }
 ethers-contract = "1.0.2"
-types = { path = "../../consensus/types"}
-serde_json = "1.0.58"
-deposit_contract = { path = "../../common/deposit_contract"}
-unused_port = { path = "../../common/unused_port" }
-hex = "0.4.2"
+types = { workspace = true }
+serde_json = { workspace = true }
+deposit_contract = { workspace = true }
+unused_port = { workspace = true }
+hex = { workspace = true }
diff --git a/testing/node_test_rig/Cargo.toml b/testing/node_test_rig/Cargo.toml
index ac77349c58e..5fe820d15b6 100644
--- a/testing/node_test_rig/Cargo.toml
+++ b/testing/node_test_rig/Cargo.toml
@@ -2,16 +2,16 @@
 name = "node_test_rig"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 [dependencies]
-environment = { path = "../../lighthouse/environment" }
-beacon_node = { path = "../../beacon_node" }
-types = { path = "../../consensus/types" }
-tempfile = "3.1.0"
-eth2 = { path = "../../common/eth2" }
-validator_client = { path = "../../validator_client" }
-validator_dir = { path = "../../common/validator_dir", features = ["insecure_keys"] }
-sensitive_url = { path = "../../common/sensitive_url" }
-execution_layer = { path = "../../beacon_node/execution_layer" }
-tokio = { version = "1.14.0", features = ["time"] }
+environment = { workspace = true }
+beacon_node = { workspace = true }
+types = { workspace = true }
+tempfile = { workspace = true }
+eth2 = { workspace = true }
+validator_client = { workspace = true }
+validator_dir = { workspace = true }
+sensitive_url = { workspace = true }
+execution_layer = { workspace = true }
+tokio = { workspace = true }
diff --git a/testing/simulator/Cargo.toml b/testing/simulator/Cargo.toml
index a01c133fd92..eadcaf51b20 100644
--- a/testing/simulator/Cargo.toml
+++ b/testing/simulator/Cargo.toml
@@ -2,20 +2,20 @@
 name = "simulator"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 node_test_rig = { path = "../node_test_rig" }
-eth1 = {path = "../../beacon_node/eth1"}
-execution_layer = {path = "../../beacon_node/execution_layer"}
-types = { path = "../../consensus/types" }
-parking_lot = "0.12.0"
-futures = "0.3.7"
-tokio = "1.14.0"
-eth1_test_rig = { path = "../eth1_test_rig" }
-env_logger = "0.9.0"
-clap = "2.33.3"
-rayon = "1.4.1"
+eth1 = { workspace = true }
+execution_layer = { workspace = true }
+types = { workspace = true }
+parking_lot = { workspace = true }
+futures = { workspace = true }
+tokio = { workspace = true }
+eth1_test_rig = { workspace = true }
+env_logger = { workspace = true }
+clap = { workspace = true }
+rayon = { workspace = true }
 sensitive_url  = { path = "../../common/sensitive_url" }
diff --git a/testing/state_transition_vectors/Cargo.toml b/testing/state_transition_vectors/Cargo.toml
index a25b3c31c1a..8d930d13bc7 100644
--- a/testing/state_transition_vectors/Cargo.toml
+++ b/testing/state_transition_vectors/Cargo.toml
@@ -2,14 +2,14 @@
 name = "state_transition_vectors"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-state_processing = { path = "../../consensus/state_processing" }
-types = { path = "../../consensus/types" }
-ethereum_ssz = "0.5.0"
-beacon_chain = { path = "../../beacon_node/beacon_chain" }
-lazy_static = "1.4.0"
-tokio = { version = "1.14.0", features = ["rt-multi-thread"] }
+state_processing = { workspace = true }
+types = { workspace = true }
+ethereum_ssz = { workspace = true }
+beacon_chain = { workspace = true }
+lazy_static = { workspace = true }
+tokio = { workspace = true }
diff --git a/testing/test-test_logger/Cargo.toml b/testing/test-test_logger/Cargo.toml
index 3d91862dbba..63bb87c06e5 100644
--- a/testing/test-test_logger/Cargo.toml
+++ b/testing/test-test_logger/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "test-test_logger"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-logging = { path = "../../common/logging" }
-slog = "2.7.0"
+logging = { workspace = true }
+slog = { workspace = true }
diff --git a/testing/web3signer_tests/Cargo.toml b/testing/web3signer_tests/Cargo.toml
index faad76a19c3..38b775b3928 100644
--- a/testing/web3signer_tests/Cargo.toml
+++ b/testing/web3signer_tests/Cargo.toml
@@ -1,31 +1,30 @@
 [package]
 name = "web3signer_tests"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 
 [dev-dependencies]
-eth2_keystore = { path = "../../crypto/eth2_keystore" }
-types = { path = "../../consensus/types" }
-tempfile = "3.1.0"
-tokio = { version = "1.14.0", features = ["rt-multi-thread", "macros"] }
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-url = "2.2.2"
-validator_client = { path = "../../validator_client" }
-slot_clock = { path = "../../common/slot_clock" }
-futures = "0.3.7"
-exit-future = "0.2.0"
-task_executor = { path = "../../common/task_executor" }
-environment = { path = "../../lighthouse/environment" }
-account_utils = { path = "../../common/account_utils" }
-serde = "1.0.116"
-serde_derive = "1.0.116"
-serde_yaml = "0.8.13"
-eth2_network_config = { path = "../../common/eth2_network_config" }
-serde_json = "1.0.58"
-zip = "0.6"
-lazy_static = "1.4.0"
-parking_lot = "0.12.0"
+eth2_keystore = { workspace = true }
+types = { workspace = true }
+tempfile = { workspace = true }
+tokio = { workspace = true }
+reqwest = { workspace = true }
+url = { workspace = true }
+validator_client = { workspace = true }
+slot_clock = { workspace = true }
+futures = { workspace = true }
+exit-future = { workspace = true }
+task_executor = { workspace = true }
+environment = { workspace = true }
+account_utils = { workspace = true }
+serde = { workspace = true }
+serde_yaml = { workspace = true }
+eth2_network_config = { workspace = true }
+serde_json = { workspace = true }
+zip = { workspace = true }
+lazy_static = { workspace = true }
+parking_lot = { workspace = true }
diff --git a/testing/web3signer_tests/tls/lighthouse/cert.pem b/testing/web3signer_tests/tls/lighthouse/cert.pem
index 061b0e3cd7b..5746d19a165 100644
--- a/testing/web3signer_tests/tls/lighthouse/cert.pem
+++ b/testing/web3signer_tests/tls/lighthouse/cert.pem
@@ -1,32 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFmzCCA4OgAwIBAgIUXpTV/0rd/GAoCfCyzPOtwcb4t7YwDQYJKoZIhvcNAQEL
+MIIFujCCA6KgAwIBAgIUELASgYwStCn/u/8tPByRADyCwLEwDQYJKoZIhvcNAQEL
 BQAwazELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlZBMREwDwYDVQQHDAhTb21lQ2l0
 eTESMBAGA1UECgwJTXlDb21wYW55MRMwEQYDVQQLDApNeURpdmlzaW9uMRMwEQYD
-VQQDDApsaWdodGhvdXNlMCAXDTIyMDUxMTEzNDEwOFoYDzIxMjIwNDE3MTM0MTA4
+VQQDDApsaWdodGhvdXNlMCAXDTIzMDkyMjAzMDA1N1oYDzIxMjMwODI5MDMwMDU3
 WjBrMQswCQYDVQQGEwJVUzELMAkGA1UECAwCVkExETAPBgNVBAcMCFNvbWVDaXR5
 MRIwEAYDVQQKDAlNeUNvbXBhbnkxEzARBgNVBAsMCk15RGl2aXNpb24xEzARBgNV
-BAMMCmxpZ2h0aG91c2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC0
-HrD6fJGcqm8zwEs+Y+FGIpRYPyjdlugj3qqwvMSI9jeDW2fr1zUl/wIuf4o+O16P
-XZitHgAyg3lph1x/kKL59c4rwWxUabSudAQZ6YCJHo4jWf3hR+UmMQEdNPgNrofv
-vGCA7CjLPKZfW6pzZo9kvMwbgeRNuJCuKZ0v/p9Y/lOplj+TTBq16HMtsSarib3b
-nKEaRdLCQgTJS3vwbtEiCC9BcZAkvs0fmVUIENRVeKGZIqcAdiOTUPvs4zctchzJ
-MGG+TA2ckKIpGT0F4be8gy1uHyP0fncJAtNvkGRPmVQcNew/HIIkJjiJvmrwewn4
-dYqYAe+aEL5AB4dZhlKjIPENfq38t7iY/aXV8COTQZGMEZ7Diext1JmEb34vEXgS
-7Gk9ZSCp/1X+fk/wW4uQeRlGwblaRtRxBrfJWmEoQHohzyP4jog8dajSZTjUbsA+
-HGaeZo1k3M0i3lxRBbLGamPODIO9CVGwKaiEJTy4bEpreM2tLR1rk5JECf46WPUR
-SN6OdHrO5x38wzQlUv+Hb4vN4p0ZkiGJO62Duuw6hbGA6UIBffM20QuJUtz3Pa8D
-un/NunIagmIL5KCsrDtZkt5wBsX3XU6OPdfZrfgOIXNfQmpbbeAUOok1NOgszXjP
-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
+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
 -----END CERTIFICATE-----
diff --git a/testing/web3signer_tests/tls/lighthouse/key.key b/testing/web3signer_tests/tls/lighthouse/key.key
index bbc69ca38bc..91bee6a783a 100644
--- a/testing/web3signer_tests/tls/lighthouse/key.key
+++ b/testing/web3signer_tests/tls/lighthouse/key.key
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-JAkxGuYLZeyrHEyeKLm7S77SLipKWg==
+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
+GlPvUaKC1KX0CX1qT1anVZq9bSMTG+M=
 -----END PRIVATE KEY-----
diff --git a/testing/web3signer_tests/tls/lighthouse/key.p12 b/testing/web3signer_tests/tls/lighthouse/key.p12
index 22b7d7f4254..d96ab477574 100644
Binary files a/testing/web3signer_tests/tls/lighthouse/key.p12 and b/testing/web3signer_tests/tls/lighthouse/key.p12 differ
diff --git a/testing/web3signer_tests/tls/lighthouse/web3signer.pem b/testing/web3signer_tests/tls/lighthouse/web3signer.pem
index 460cb8b4003..4550214478a 100644
--- a/testing/web3signer_tests/tls/lighthouse/web3signer.pem
+++ b/testing/web3signer_tests/tls/lighthouse/web3signer.pem
@@ -1,32 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/testing/web3signer_tests/tls/web3signer/cert.pem b/testing/web3signer_tests/tls/web3signer/cert.pem
index 460cb8b4003..4550214478a 100644
--- a/testing/web3signer_tests/tls/web3signer/cert.pem
+++ b/testing/web3signer_tests/tls/web3signer/cert.pem
@@ -1,32 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/testing/web3signer_tests/tls/web3signer/key.key b/testing/web3signer_tests/tls/web3signer/key.key
index 6e5171f3742..42b7ad9a944 100644
--- a/testing/web3signer_tests/tls/web3signer/key.key
+++ b/testing/web3signer_tests/tls/web3signer/key.key
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-/OsV3MTX1gCaTE9Q2GlZVybDh20ZvdBC/g==
+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
+CXDusRSlsQNpzHc6QKq8IDZLut9g
 -----END PRIVATE KEY-----
diff --git a/testing/web3signer_tests/tls/web3signer/key.p12 b/testing/web3signer_tests/tls/web3signer/key.p12
index 459f4fb62e8..51269be8d0f 100644
Binary files a/testing/web3signer_tests/tls/web3signer/key.p12 and b/testing/web3signer_tests/tls/web3signer/key.p12 differ
diff --git a/testing/web3signer_tests/tls/web3signer/known_clients.txt b/testing/web3signer_tests/tls/web3signer/known_clients.txt
index de80bb7cebe..33013273122 100644
--- a/testing/web3signer_tests/tls/web3signer/known_clients.txt
+++ b/testing/web3signer_tests/tls/web3signer/known_clients.txt
@@ -1 +1 @@
-lighthouse 1B:43:E1:58:26:7D:3F:70:BD:DA:32:E9:29:A5:A9:50:EA:B2:A8:C3:0C:82:BF:90:13:ED:5B:E0:7D:5B:0A:C0
+lighthouse FF:4C:84:A6:37:28:EC:7E:A7:D8:C6:49:0D:C6:F9:5D:C1:06:BA:6D:69:49:0A:AA:38:32:01:2B:ED:D9:F2:FA
diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml
index 200db731677..46f523c9905 100644
--- a/validator_client/Cargo.toml
+++ b/validator_client/Cargo.toml
@@ -2,63 +2,63 @@
 name = "validator_client"
 version = "0.3.5"
 authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com>", "Luke Anderson <luke@lukeanderson.com.au>"]
-edition = "2021"
+edition = { workspace = true }
 
 [lib]
 name = "validator_client"
 path = "src/lib.rs"
 
 [dev-dependencies]
-tokio = { version = "1.14.0", features = ["time", "rt-multi-thread", "macros"] }
+tokio = { workspace = true }
 
 [dependencies]
-tree_hash = "0.5.0"
-clap = "2.33.3"
-slashing_protection = { path = "./slashing_protection" }
-slot_clock = { path = "../common/slot_clock" }
-types = { path = "../consensus/types" }
-safe_arith = { path = "../consensus/safe_arith" }
-serde = "1.0.116"
+tree_hash = { workspace = true }
+clap = { workspace = true }
+slashing_protection = { workspace = true }
+slot_clock = { workspace = true }
+types = { workspace = true }
+safe_arith = { workspace = true }
+serde = { workspace = true }
 serde_derive = "1.0.116"
-bincode = "1.3.1"
-serde_json = "1.0.58"
-slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
-tokio = { version = "1.14.0", features = ["time"] }
-tokio-stream = { version = "0.1.3", features = ["sync"] }
-futures = "0.3.7"
-dirs = "3.0.1"
-directory = { path = "../common/directory" }
-lockfile = { path = "../common/lockfile" }
-environment = { path = "../lighthouse/environment" }
-parking_lot = "0.12.0"
-exit-future = "0.2.0"
-filesystem = { path = "../common/filesystem" }
-hex = "0.4.2"
-deposit_contract = { path = "../common/deposit_contract" }
-bls = { path = "../crypto/bls" }
-eth2 = { path = "../common/eth2" }
-tempfile = "3.1.0"
-validator_dir = { path = "../common/validator_dir" }
-clap_utils = { path = "../common/clap_utils" }
-eth2_keystore = { path = "../crypto/eth2_keystore" }
-account_utils = { path = "../common/account_utils" }
-lighthouse_version = { path = "../common/lighthouse_version" }
-warp_utils = { path = "../common/warp_utils" }
-warp = "0.3.2"
-hyper = "0.14.4"
-ethereum_serde_utils = "0.5.0"
-libsecp256k1 = "0.7.0"
-ring = "0.16.19"
-rand = { version = "0.8.5", features = ["small_rng"] }
-lighthouse_metrics = { path = "../common/lighthouse_metrics" }
-lazy_static = "1.4.0"
-itertools = "0.10.0"
-monitoring_api = { path = "../common/monitoring_api" }
-sensitive_url = { path = "../common/sensitive_url" }
-task_executor = { path = "../common/task_executor" }
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-url = "2.2.2"
-malloc_utils = { path = "../common/malloc_utils" }
-sysinfo = "0.26.5"
+bincode = { workspace = true }
+serde_json = { workspace = true }
+slog = { workspace = true }
+tokio = { workspace = true }
+tokio-stream = { workspace = true }
+futures = { workspace = true }
+dirs = { workspace = true }
+directory = { workspace = true }
+lockfile = { workspace = true }
+environment = { workspace = true }
+parking_lot = { workspace = true }
+exit-future = { workspace = true }
+filesystem = { workspace = true }
+hex = { workspace = true }
+deposit_contract = { workspace = true }
+bls = { workspace = true }
+eth2 = { workspace = true }
+tempfile = { workspace = true }
+validator_dir = { workspace = true }
+clap_utils = { workspace = true }
+eth2_keystore = { workspace = true }
+account_utils = { workspace = true }
+lighthouse_version = { workspace = true }
+warp_utils = { workspace = true }
+warp = { workspace = true }
+hyper = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+libsecp256k1 = { workspace = true }
+ring = { workspace = true }
+rand = { workspace = true, features = ["small_rng"] }
+lighthouse_metrics = { workspace = true }
+lazy_static = { workspace = true }
+itertools = { workspace = true }
+monitoring_api = { workspace = true }
+sensitive_url = { workspace = true }
+task_executor = { workspace = true }
+reqwest = { workspace = true }
+url = { workspace = true }
+malloc_utils = { workspace = true }
+sysinfo = { workspace = true }
 system_health = { path = "../common/system_health" }
-logging = { path = "../common/logging" }
+logging = { workspace = true }
diff --git a/validator_client/slashing_protection/Cargo.toml b/validator_client/slashing_protection/Cargo.toml
index 278dc22d0de..cc90c979b9a 100644
--- a/validator_client/slashing_protection/Cargo.toml
+++ b/validator_client/slashing_protection/Cargo.toml
@@ -2,7 +2,7 @@
 name = "slashing_protection"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>", "pscott <scottpiriou@gmail.com>"]
-edition = "2021"
+edition = { workspace = true }
 autotests = false
 
 [[test]]
@@ -10,21 +10,21 @@ name = "slashing_protection_tests"
 path = "tests/main.rs"
 
 [dependencies]
-tempfile = "3.1.0"
-types = { path = "../../consensus/types" }
-rusqlite = { version = "0.28.0", features = ["bundled"] }
-r2d2 = "0.8.9"
+tempfile = { workspace = true }
+types = { workspace = true }
+rusqlite = { workspace = true }
+r2d2 = { workspace = true }
 r2d2_sqlite = "0.21.0"
-serde = "1.0.116"
+serde = { workspace = true }
 serde_derive = "1.0.116"
-serde_json = "1.0.58"
-ethereum_serde_utils = "0.5.0"
-filesystem = { path = "../../common/filesystem" }
-arbitrary = { version = "1.0", features = ["derive"], optional = true }
+serde_json = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+filesystem = { workspace = true }
+arbitrary = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
-lazy_static = "1.4.0"
-rayon = "1.4.1"
+lazy_static = { workspace = true }
+rayon = { workspace = true }
 
 [features]
-arbitrary-fuzz = ["arbitrary", "types/arbitrary-fuzz"]
+arbitrary-fuzz = ["types/arbitrary-fuzz"]
diff --git a/validator_manager/Cargo.toml b/validator_manager/Cargo.toml
index 851510820e8..35af2b1ce73 100644
--- a/validator_manager/Cargo.toml
+++ b/validator_manager/Cargo.toml
@@ -1,30 +1,29 @@
 [package]
 name = "validator_manager"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bls = { path = "../crypto/bls" }
-clap = "2.33.3"
-types = { path = "../consensus/types" }
-environment = { path = "../lighthouse/environment" }
-eth2_network_config = { path = "../common/eth2_network_config" }
-clap_utils = { path = "../common/clap_utils" }
-eth2_wallet = { path = "../crypto/eth2_wallet" }
-eth2_keystore = { path = "../crypto/eth2_keystore" }
-account_utils = { path = "../common/account_utils" }
-serde = { version = "1.0.116", features = ["derive"] }
-serde_json = "1.0.58"
-ethereum_serde_utils = "0.5.0"
-tree_hash = "0.5.0"
-eth2 = { path = "../common/eth2", features = ["lighthouse"]}
-hex = "0.4.2"
-tokio = { version = "1.14.0", features = ["time", "rt-multi-thread", "macros"] }
+bls = { workspace = true }
+clap = { workspace = true }
+types = { workspace = true }
+environment = { workspace = true }
+eth2_network_config = { workspace = true }
+clap_utils = { workspace = true }
+eth2_wallet = { workspace = true }
+eth2_keystore = { workspace = true }
+account_utils = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+tree_hash = { workspace = true }
+eth2 = { workspace = true }
+hex = { workspace = true }
+tokio = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.1.0"
-regex = "1.6.0"
-eth2_network_config = { path = "../common/eth2_network_config" }
-validator_client = { path = "../validator_client" }
+tempfile = { workspace = true }
+regex = { workspace = true }
+validator_client = { workspace = true }
diff --git a/watch/Cargo.toml b/watch/Cargo.toml
index 3dc3b7c1905..67cbc3cc233 100644
--- a/watch/Cargo.toml
+++ b/watch/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "watch"
 version = "0.1.0"
-edition = "2018"
+edition = { workspace = true }
 
 [lib]
 name = "watch"
@@ -14,35 +14,35 @@ path = "src/main.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "2.33.3"
-log = "0.4.14"
-env_logger = "0.9.0"
-types = { path = "../consensus/types" }
-eth2 = { path = "../common/eth2" }
-beacon_node = { path = "../beacon_node"}
-tokio = { version = "1.14.0", features = ["time"] }
+clap = { workspace = true }
+log = { workspace = true }
+env_logger = { workspace = true }
+types = { workspace = true }
+eth2 = { workspace = true }
+beacon_node = { workspace = true }
+tokio = { workspace = true }
 axum = "0.6.18"
-hyper = "0.14.20"
-serde = "1.0.116"
-serde_json = "1.0.58"
-reqwest = { version = "0.11.0", features = ["json","stream"] }
-url = "2.2.2"
-rand = "0.7.3"
+hyper = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+reqwest = { workspace = true }
+url = { workspace = true }
+rand = { workspace = true }
 diesel = { version = "2.0.2", features = ["postgres", "r2d2"] }
 diesel_migrations = { version = "2.0.0", features = ["postgres"] }
-byteorder = "1.4.3"
-bls = { path = "../crypto/bls" }
-hex = "0.4.2"
-r2d2 = "0.8.9"
-serde_yaml = "0.8.24"
+byteorder = { workspace = true }
+bls = { workspace = true }
+hex = { workspace = true }
+r2d2 = { workspace = true }
+serde_yaml = { workspace = true }
 
 [dev-dependencies]
 tokio-postgres = "0.7.5"
-http_api = { path = "../beacon_node/http_api" }
-beacon_chain = { path = "../beacon_node/beacon_chain" }
-network = { path = "../beacon_node/network" }
+http_api = { workspace = true }
+beacon_chain = { workspace = true }
+network = { workspace = true }
 # TODO: update to 0.15 when released: https://github.com/testcontainers/testcontainers-rs/issues/497
 testcontainers = { git = "https://github.com/testcontainers/testcontainers-rs/", rev = "0f2c9851" }
-unused_port = { path = "../common/unused_port" }
-task_executor = { path = "../common/task_executor" }
-logging = { path = "../common/logging" }
+unused_port = { workspace = true }
+task_executor = { workspace = true }
+logging = { workspace = true }