diff --git a/Cargo.lock b/Cargo.lock
index 06e7902f..06676ba9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1874,7 +1874,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
  "tower-service",
  "tracing",
@@ -2922,9 +2922,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.10"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
 
 [[package]]
 name = "pin-utils"
@@ -4050,6 +4050,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "spandoc"
 version = "0.2.2"
@@ -4315,11 +4325,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.29.1"
+version = "1.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
+checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920"
 dependencies = [
- "autocfg",
  "backtrace",
  "bytes",
  "libc",
@@ -4328,7 +4337,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.5.3",
  "tokio-macros",
  "tracing",
  "windows-sys 0.48.0",
diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml
index 1df5a5e5..a3283e24 100644
--- a/tower-batch-control/Cargo.toml
+++ b/tower-batch-control/Cargo.toml
@@ -26,7 +26,7 @@ futures = "0.3.28"
 futures-core = "0.3.28"
 pin-project = "1.1.3"
 rayon = "1.7.0"
-tokio = { version = "1.29.1", features = ["time", "sync", "tracing", "macros"] }
+tokio = { version = "1.31.0", features = ["time", "sync", "tracing", "macros"] }
 tokio-util = "0.7.8"
 tower = { version = "0.4.13", features = ["util", "buffer"] }
 tracing = "0.1.37"
@@ -41,7 +41,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
 ed25519-zebra = "4.0.1"
 rand = "0.8.5"
 
-tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] }
 tokio-test = "0.4.2"
 tower-fallback = { path = "../tower-fallback/" }
 tower-test = "0.4.0"
diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml
index 6cd7ed21..4611bfa4 100644
--- a/tower-fallback/Cargo.toml
+++ b/tower-fallback/Cargo.toml
@@ -22,6 +22,6 @@ futures-core = "0.3.28"
 tracing = "0.1.37"
 
 [dev-dependencies]
-tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] }
 
 zebra-test = { path = "../zebra-test/" }
diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
index 31d0ab45..44ebbb97 100644
--- a/zebra-chain/Cargo.toml
+++ b/zebra-chain/Cargo.toml
@@ -114,7 +114,7 @@ reddsa = "0.5.1"
 serde_json = { version = "1.0.105", optional = true }
 
 # Production feature async-error and testing feature proptest-impl
-tokio = { version = "1.29.1", optional = true }
+tokio = { version = "1.31.0", optional = true }
 
 # Experimental feature getblocktemplate-rpcs
 zcash_address = { version = "0.3.0", optional = true }
@@ -147,7 +147,7 @@ proptest-derive = "0.3.0"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 
-tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] }
 
 zebra-test = { path = "../zebra-test/" }
 
diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml
index d7007595..ac28cb2b 100644
--- a/zebra-consensus/Cargo.toml
+++ b/zebra-consensus/Cargo.toml
@@ -53,7 +53,7 @@ futures = "0.3.28"
 futures-util = "0.3.28"
 metrics = "0.21.1"
 thiserror = "1.0.46"
-tokio = { version = "1.29.1", features = ["time", "sync", "tracing", "rt-multi-thread"] }
+tokio = { version = "1.31.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
 tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
 tracing = "0.1.37"
 tracing-futures = "0.2.5"
@@ -89,7 +89,7 @@ proptest = "1.2.0"
 proptest-derive = "0.3.0"
 spandoc = "0.2.2"
 
-tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] }
 tracing-error = "0.2.0"
 tracing-subscriber = "0.3.17"
 
diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml
index fcd8deb0..8097df71 100644
--- a/zebra-network/Cargo.toml
+++ b/zebra-network/Cargo.toml
@@ -61,7 +61,7 @@ tempfile = "3.7.1"
 thiserror = "1.0.46"
 
 futures = "0.3.28"
-tokio = { version = "1.29.1", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
+tokio = { version = "1.31.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
 tokio-stream = { version = "0.1.14", features = ["sync", "time"] }
 tokio-util = { version = "0.7.8", features = ["codec"] }
 tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] }
@@ -90,7 +90,7 @@ proptest = "1.2.0"
 proptest-derive = "0.3.0"
 
 static_assertions = "1.1.0"
-tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] }
 toml = "0.7.6"
 
 zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml
index 98bfbebd..f82dbee4 100644
--- a/zebra-rpc/Cargo.toml
+++ b/zebra-rpc/Cargo.toml
@@ -54,7 +54,7 @@ num_cpus = "1.16.0"
 serde_json = { version = "1.0.105", features = ["preserve_order"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 
-tokio = { version = "1.29.1", features = ["time", "rt-multi-thread", "macros", "tracing"] }
+tokio = { version = "1.31.0", features = ["time", "rt-multi-thread", "macros", "tracing"] }
 tower = "0.4.13"
 
 tracing = "0.1.37"
@@ -83,7 +83,7 @@ insta = { version = "1.31.0", features = ["redactions", "json", "ron"] }
 proptest = "1.2.0"
 
 thiserror = "1.0.46"
-tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] }
 
 zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
 zebra-consensus = { path = "../zebra-consensus", features = ["proptest-impl"] }
diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml
index c0775df1..a00c4e38 100644
--- a/zebra-state/Cargo.toml
+++ b/zebra-state/Cargo.toml
@@ -62,7 +62,7 @@ tempfile = "3.7.1"
 thiserror = "1.0.46"
 
 rayon = "1.7.0"
-tokio = { version = "1.29.1", features = ["rt-multi-thread", "sync", "tracing"] }
+tokio = { version = "1.31.0", features = ["rt-multi-thread", "sync", "tracing"] }
 tower = { version = "0.4.13", features = ["buffer", "util"] }
 tracing = "0.1.37"
 
@@ -100,7 +100,7 @@ rand = "0.8.5"
 halo2 = { package = "halo2_proofs", version = "0.3.0" }
 jubjub = "0.10.0"
 
-tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] }
 
 zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
 zebra-test = { path = "../zebra-test/" }
diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml
index 5b0d9de6..d96ad48f 100644
--- a/zebra-test/Cargo.toml
+++ b/zebra-test/Cargo.toml
@@ -24,7 +24,7 @@ once_cell = "1.18.0"
 rand = "0.8.5"
 regex = "1.9.3"
 
-tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] }
 tower = { version = "0.4.13", features = ["util"] }
 futures = "0.3.28"
 
diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml
index d1252b26..243435ff 100644
--- a/zebra-utils/Cargo.toml
+++ b/zebra-utils/Cargo.toml
@@ -89,4 +89,4 @@ regex = { version = "1.9.3", optional = true }
 reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls"], optional = true }
 
 # These crates are needed for the zebra-checkpoints and search-issue-refs binaries
-tokio = { version = "1.29.1", features = ["full"], optional = true }
+tokio = { version = "1.31.0", features = ["full"], optional = true }
diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml
index f4f90f66..df9324f5 100644
--- a/zebrad/Cargo.toml
+++ b/zebrad/Cargo.toml
@@ -164,7 +164,7 @@ toml = "0.7.6"
 
 futures = "0.3.28"
 rayon = "1.7.0"
-tokio = { version = "1.29.1", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] }
+tokio = { version = "1.31.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] }
 tower = { version = "0.4.13", features = ["hedge", "limit"] }
 pin-project = "1.1.3"
 
@@ -242,7 +242,7 @@ tempfile = "3.7.1"
 hyper = { version = "0.14.27", features = ["http1", "http2", "server"]}
 tracing-test = { version = "0.2.4", features = ["no-env-filter"] }
 
-tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.31.0", features = ["full", "tracing", "test-util"] }
 tokio-stream = "0.1.14"
 
 # test feature lightwalletd-grpc-tests