diff --git a/libs/pavexc/src/compiler/codegen/mod.rs b/libs/pavexc/src/compiler/codegen/mod.rs
index e1ab4eb4f..4b6a9cb28 100644
--- a/libs/pavexc/src/compiler/codegen/mod.rs
+++ b/libs/pavexc/src/compiler/codegen/mod.rs
@@ -273,7 +273,7 @@ where
     );
     let manifest = GeneratedManifest {
         dependencies,
-        edition: Edition::E2021,
+        edition: Edition::E2024,
     };
 
     // Toolchain crates are not listed as dependencies in the manifest, but we need to add them to
diff --git a/libs/pavexc_cli/template/Cargo.toml.liquid b/libs/pavexc_cli/template/Cargo.toml.liquid
index 64287c7da..9da98dccc 100644
--- a/libs/pavexc_cli/template/Cargo.toml.liquid
+++ b/libs/pavexc_cli/template/Cargo.toml.liquid
@@ -4,4 +4,7 @@ members = ["app", "server_sdk", "server", "workspace_hack"]
 # when executed from the root of the workspace.
 # Otherwise, you would have to use `cargo run --bin server` to run the server binary.
 default-members = ["server"]
-resolver = "2"
+resolver = "3"
+
+[workspace.package]
+edition = "2024"
diff --git a/libs/pavexc_cli/template/app/Cargo.toml.liquid b/libs/pavexc_cli/template/app/Cargo.toml.liquid
index 49349d12b..652d3da98 100644
--- a/libs/pavexc_cli/template/app/Cargo.toml.liquid
+++ b/libs/pavexc_cli/template/app/Cargo.toml.liquid
@@ -1,7 +1,7 @@
 [package]
 name = "app"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 [[bin]]
 path = "src/bin/bp.rs"
diff --git a/libs/pavexc_cli/template/server/Cargo.toml.liquid b/libs/pavexc_cli/template/server/Cargo.toml.liquid
index cf873d7bf..45375f33e 100644
--- a/libs/pavexc_cli/template/server/Cargo.toml.liquid
+++ b/libs/pavexc_cli/template/server/Cargo.toml.liquid
@@ -1,7 +1,7 @@
 [package]
 name = "server"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 # Telemetry
diff --git a/libs/pavexc_cli/template/server_sdk/Cargo.toml.liquid b/libs/pavexc_cli/template/server_sdk/Cargo.toml.liquid
index d1eeff801..bb18f211b 100644
--- a/libs/pavexc_cli/template/server_sdk/Cargo.toml.liquid
+++ b/libs/pavexc_cli/template/server_sdk/Cargo.toml.liquid
@@ -1,7 +1,7 @@
 [package]
 name = "server_sdk"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [package.metadata.px.generate]
 generator_type = "cargo_workspace_binary"