diff --git a/Cargo.lock b/Cargo.lock
index 6bac8562..0e357359 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -386,7 +386,7 @@ dependencies = [
  "polling",
  "rustix 0.37.23",
  "slab",
- "socket2",
+ "socket2 0.4.9",
  "waker-fn",
 ]
 
@@ -2536,7 +2536,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
  "tower-service",
  "tracing",
@@ -2891,7 +2891,7 @@ dependencies = [
  "quoted_printable",
  "rustls",
  "rustls-pemfile",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
  "tokio-rustls",
  "tracing",
@@ -5472,6 +5472,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 = "spin"
 version = "0.5.2"
@@ -5991,11 +6001,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.29.1"
+version = "1.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
+checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd"
 dependencies = [
- "autocfg",
  "backtrace",
  "bytes 1.4.0",
  "libc",
@@ -6004,7 +6013,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.5.3",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml
index 8fab5b3e..f7f2de26 100644
--- a/crates/axum-utils/Cargo.toml
+++ b/crates/axum-utils/Cargo.toml
@@ -23,7 +23,7 @@ serde_with = "3.2.0"
 serde_urlencoded = "0.7.1"
 serde_json = "1.0.104"
 thiserror = "1.0.44"
-tokio = "1.29.1"
+tokio = "1.30.0"
 tower = { version = "0.4.13", features = ["util"] }
 tracing = "0.1.37"
 url = "2.4.0"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index 8814b9d7..7efb1219 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -22,7 +22,7 @@ rustls = "0.21.6"
 serde_json = "1.0.104"
 serde_yaml = "0.9.25"
 sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres"] }
-tokio = { version = "1.29.1", features = ["full"] }
+tokio = { version = "1.30.0", features = ["full"] }
 tower = { version = "0.4.13", features = ["full"] }
 tower-http = { version = "0.4.3", features = ["fs"] }
 url = "2.4.0"
diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml
index dd1fe7f4..5fb27a65 100644
--- a/crates/config/Cargo.toml
+++ b/crates/config/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-tokio = { version = "1.29.1", features = ["fs", "rt"] }
+tokio = { version = "1.30.0", features = ["fs", "rt"] }
 tracing = "0.1.37"
 async-trait = "0.1.72"
 
diff --git a/crates/graphql/Cargo.toml b/crates/graphql/Cargo.toml
index c3953955..b7f66588 100644
--- a/crates/graphql/Cargo.toml
+++ b/crates/graphql/Cargo.toml
@@ -13,7 +13,7 @@ chrono = "0.4.26"
 lettre = { version = "0.10.4", default-features = false  }
 serde = { version = "1.0.183", features = ["derive"] }
 thiserror = "1.0.44"
-tokio = { version = "1.29.1", features = ["sync"] }
+tokio = { version = "1.30.0", features = ["sync"] }
 tracing = "0.1.37"
 tower = { version = "0.4.13", features = ["util"] }
 ulid = "1.0.0"
diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml
index 6fcdfc53..c7b82d57 100644
--- a/crates/handlers/Cargo.toml
+++ b/crates/handlers/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [dependencies]
 # Async runtime
-tokio = { version = "1.29.1", features = ["macros"] }
+tokio = { version = "1.30.0", features = ["macros"] }
 futures-util = "0.3.28"
 
 # Logging and tracing
diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml
index 2c2df11f..004cac54 100644
--- a/crates/http/Cargo.toml
+++ b/crates/http/Cargo.toml
@@ -24,7 +24,7 @@ serde = "1.0.183"
 serde_json = "1.0.104"
 serde_urlencoded = "0.7.1"
 thiserror = "1.0.44"
-tokio = { version = "1.29.1", features = ["sync", "parking_lot"], optional = true }
+tokio = { version = "1.30.0", features = ["sync", "parking_lot"], optional = true }
 tower = { version = "0.4.13", features = [] }
 tower-http = { version = "0.4.3", features = ["cors"] }
 tracing = "0.1.37"
@@ -37,7 +37,7 @@ mas-tower = { path = "../tower" }
 [dev-dependencies]
 anyhow = "1.0.72"
 serde = { version = "1.0.183", features = ["derive"] }
-tokio = { version = "1.29.1", features = ["macros", "rt"] }
+tokio = { version = "1.30.0", features = ["macros", "rt"] }
 tower = { version = "0.4.13", features = ["util"] }
 
 [features]
diff --git a/crates/iana-codegen/Cargo.toml b/crates/iana-codegen/Cargo.toml
index 9532317f..7f886ddf 100644
--- a/crates/iana-codegen/Cargo.toml
+++ b/crates/iana-codegen/Cargo.toml
@@ -14,6 +14,6 @@ csv = "1.2.2"
 futures-util = "0.3.28"
 hyper = { version = "0.14.27", features = ["tcp", "client", "http1"] }
 serde = { version = "1.0.183", features = ["derive"] }
-tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "fs", "io-util"] }
+tokio = { version = "1.30.0", features = ["macros", "rt-multi-thread", "fs", "io-util"] }
 tracing = "0.1.37"
 tracing-subscriber = "0.3.17"
diff --git a/crates/listener/Cargo.toml b/crates/listener/Cargo.toml
index f094c9b4..4987cb10 100644
--- a/crates/listener/Cargo.toml
+++ b/crates/listener/Cargo.toml
@@ -12,7 +12,7 @@ http-body = "0.4.5"
 hyper = { version = "0.14.27", features = ["server", "http1", "http2", "tcp"] }
 pin-project-lite = "0.2.11"
 thiserror = "1.0.44"
-tokio = { version = "1.29.1", features = ["net", "rt", "macros", "signal", "time"] }
+tokio = { version = "1.30.0", features = ["net", "rt", "macros", "signal", "time"] }
 tokio-rustls = "0.24.1"
 tower-http = { version = "0.4.3", features = ["add-extension"] }
 tower-service = "0.3.2"
@@ -22,7 +22,7 @@ libc = "0.2.147"
 [dev-dependencies]
 anyhow = "1.0.72"
 rustls-pemfile = "1.0.3"
-tokio = { version = "1.29.1", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] }
+tokio = { version = "1.30.0", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] }
 tokio-test = "0.4.2"
 tracing-subscriber = "0.3.17"
 
diff --git a/crates/matrix/Cargo.toml b/crates/matrix/Cargo.toml
index 304f58d0..4b5c0717 100644
--- a/crates/matrix/Cargo.toml
+++ b/crates/matrix/Cargo.toml
@@ -10,5 +10,5 @@ anyhow = "1.0.71"
 serde = { version = "1.0.183", features = ["derive"] }
 async-trait = "0.1.72"
 http = "0.2.9"
-tokio = { version = "1.28.2", features = ["sync", "macros", "rt"] }
+tokio = { version = "1.30.0", features = ["sync", "macros", "rt"] }
 url = "2.4.0"
diff --git a/crates/oidc-client/Cargo.toml b/crates/oidc-client/Cargo.toml
index ce19b591..aedda0d9 100644
--- a/crates/oidc-client/Cargo.toml
+++ b/crates/oidc-client/Cargo.toml
@@ -35,7 +35,7 @@ serde_json = "1.0.104"
 serde_urlencoded = "0.7.1"
 serde_with = "3.2.0"
 thiserror = "1.0.44"
-tokio = { version = "1.29.1", features = ["rt", "macros", "rt-multi-thread"] }
+tokio = { version = "1.30.0", features = ["rt", "macros", "rt-multi-thread"] }
 tower = { version = "0.4.13", features = ["full"] }
 tracing = "0.1.37"
 url = { version = "2.4.0", features = ["serde"] }
diff --git a/crates/policy/Cargo.toml b/crates/policy/Cargo.toml
index 10dd0df9..e4abd3dc 100644
--- a/crates/policy/Cargo.toml
+++ b/crates/policy/Cargo.toml
@@ -11,7 +11,7 @@ opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" }
 serde = { version = "1.0.183", features = ["derive"] }
 serde_json = "1.0.104"
 thiserror = "1.0.44"
-tokio = { version = "1.29.1", features = ["io-util"] }
+tokio = { version = "1.30.0", features = ["io-util"] }
 tracing = "0.1.37"
 wasmtime = { version = "11.0.1", default-features = false, features = ["async", "cranelift"] }
 
@@ -19,7 +19,7 @@ mas-data-model = { path = "../data-model" }
 oauth2-types = { path = "../oauth2-types" }
 
 [dev-dependencies]
-tokio = { version = "1.29.1", features = ["fs", "rt", "macros"] }
+tokio = { version = "1.30.0", features = ["fs", "rt", "macros"] }
 
 [features]
 cache = ["wasmtime/cache"]
diff --git a/crates/tasks/Cargo.toml b/crates/tasks/Cargo.toml
index 192717ef..ad909474 100644
--- a/crates/tasks/Cargo.toml
+++ b/crates/tasks/Cargo.toml
@@ -18,7 +18,7 @@ rand = "0.8.5"
 rand_chacha = "0.3.1"
 sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres"] }
 thiserror = "1.0.44"
-tokio = { version = "1.29.1", features = ["rt"] }
+tokio = { version = "1.30.0", features = ["rt"] }
 tower = "0.4.13"
 tracing = "0.1.37"
 tracing-opentelemetry = "0.19.0"
diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml
index fbeb8f38..356daff9 100644
--- a/crates/templates/Cargo.toml
+++ b/crates/templates/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [dependencies]
 tracing = "0.1.37"
-tokio = { version = "1.29.1", features = ["macros", "rt", "fs"] }
+tokio = { version = "1.30.0", features = ["macros", "rt", "fs"] }
 
 anyhow = "1.0.72"
 thiserror = "1.0.44"
diff --git a/crates/tower/Cargo.toml b/crates/tower/Cargo.toml
index a2d251e2..bbbd6f79 100644
--- a/crates/tower/Cargo.toml
+++ b/crates/tower/Cargo.toml
@@ -11,7 +11,7 @@ http = "0.2.9"
 tracing = "0.1.37"
 tracing-opentelemetry = "0.19.0"
 tower = "0.4.13"
-tokio = { version = "1.29.1", features = ["time"] }
+tokio = { version = "1.30.0", features = ["time"] }
 opentelemetry = { version = "0.19.0", features = ["metrics"] }
 opentelemetry-http = "0.8.0"
 pin-project-lite = "0.2.11"