diff --git a/Cargo.toml b/Cargo.toml
index b1af8d8..2e0565c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,4 +10,5 @@ members=[
     "pqcrypto-dilithium",
     "pqcrypto-falcon",
     "pqcrypto-sphincsplus",
-]
\ No newline at end of file
+]
+resolver="2"
\ No newline at end of file
diff --git a/pqcrypto-template/scheme/Cargo.toml.j2 b/pqcrypto-template/scheme/Cargo.toml.j2
index 79826aa..1e144e7 100644
--- a/pqcrypto-template/scheme/Cargo.toml.j2
+++ b/pqcrypto-template/scheme/Cargo.toml.j2
@@ -4,7 +4,7 @@ description = "Post-Quantum {% if type == "kem" %}Key-Encapsulation Mechanism{%
 readme = "README.md"
 version = "{{ version }}"
 authors = ["Thom Wiggers <thom@thomwiggers.nl>"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/rustpq/"
 repository = "https://github.com/rustpq/pqcrypto/"
diff --git a/pqcrypto-template/workspace-Cargo.toml.j2 b/pqcrypto-template/workspace-Cargo.toml.j2
index a9f5c3d..3922be8 100644
--- a/pqcrypto-template/workspace-Cargo.toml.j2
+++ b/pqcrypto-template/workspace-Cargo.toml.j2
@@ -8,3 +8,4 @@ members=[
     "{{ name }}",
 {% endfor %}
 ]
+resolver="2"