diff --git a/compute_tools/Cargo.toml b/compute_tools/Cargo.toml
index 25661c506a..4efef1f1ca 100644
--- a/compute_tools/Cargo.toml
+++ b/compute_tools/Cargo.toml
@@ -2,7 +2,7 @@
 name = "compute_tools"
 version = "0.1.0"
 authors = ["Alexey Kondratov <kondratov.aleksey@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/control_plane/Cargo.toml b/control_plane/Cargo.toml
index 36c1bd5375..5ea7728877 100644
--- a/control_plane/Cargo.toml
+++ b/control_plane/Cargo.toml
@@ -2,7 +2,7 @@
 name = "control_plane"
 version = "0.1.0"
 authors = ["Stas Kelvich <stas@zenith.tech>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/pageserver/Cargo.toml b/pageserver/Cargo.toml
index 81df026ae8..8f6c382262 100644
--- a/pageserver/Cargo.toml
+++ b/pageserver/Cargo.toml
@@ -2,7 +2,7 @@
 name = "pageserver"
 version = "0.1.0"
 authors = ["Stas Kelvich <stas@zenith.tech>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bookfile = { git = "https://github.com/zenithdb/bookfile.git", branch="generic-readext" }
diff --git a/postgres_ffi/Cargo.toml b/postgres_ffi/Cargo.toml
index b4d21ce665..96e2b94fbf 100644
--- a/postgres_ffi/Cargo.toml
+++ b/postgres_ffi/Cargo.toml
@@ -2,7 +2,7 @@
 name = "postgres_ffi"
 version = "0.1.0"
 authors = ["Heikki Linnakangas <heikki@zenith.tech>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml
index 6efd1d674d..997141edf6 100644
--- a/proxy/Cargo.toml
+++ b/proxy/Cargo.toml
@@ -2,7 +2,7 @@
 name = "proxy"
 version = "0.1.0"
 authors = ["Stas Kelvich <stas.kelvich@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/walkeeper/Cargo.toml b/walkeeper/Cargo.toml
index caf7c86e71..805b93ceea 100644
--- a/walkeeper/Cargo.toml
+++ b/walkeeper/Cargo.toml
@@ -2,7 +2,7 @@
 name = "walkeeper"
 version = "0.1.0"
 authors = ["Stas Kelvich <stas@zenith.tech>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/workspace_hack/Cargo.toml b/workspace_hack/Cargo.toml
index 7a4a229d27..48d81bbc07 100644
--- a/workspace_hack/Cargo.toml
+++ b/workspace_hack/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "workspace_hack"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [target.'cfg(all())'.dependencies]
 libc = { version = "0.2", features = ["default", "extra_traits", "std"] }
diff --git a/zenith/Cargo.toml b/zenith/Cargo.toml
index 207477b5f9..4409ba4295 100644
--- a/zenith/Cargo.toml
+++ b/zenith/Cargo.toml
@@ -2,7 +2,7 @@
 name = "zenith"
 version = "0.1.0"
 authors = ["Stas Kelvich <stas@zenith.tech>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/zenith_metrics/Cargo.toml b/zenith_metrics/Cargo.toml
index 062ebc1c9c..28d8990308 100644
--- a/zenith_metrics/Cargo.toml
+++ b/zenith_metrics/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "zenith_metrics"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 prometheus = {version = "0.12", default_features=false} # removes protobuf dependency
diff --git a/zenith_utils/Cargo.toml b/zenith_utils/Cargo.toml
index 3a81e9bd38..0e4f6d68e8 100644
--- a/zenith_utils/Cargo.toml
+++ b/zenith_utils/Cargo.toml
@@ -2,7 +2,7 @@
 name = "zenith_utils"
 version = "0.1.0"
 authors = ["Eric Seppanen <eric@zenith.tech>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0"