diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0be84a0..e39c273 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * Bring SPHINCS+ to closer to FIPS variants by removing -robust and Haraka variants
 * Small fix in Falcon
 * Add Falcon NEON implementation
+* Update Rust edition to 2021
 
 ## 2023-04-26
 
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-classicmceliece/Cargo.toml b/pqcrypto-classicmceliece/Cargo.toml
index 912afee..3b8eee8 100644
--- a/pqcrypto-classicmceliece/Cargo.toml
+++ b/pqcrypto-classicmceliece/Cargo.toml
@@ -4,7 +4,7 @@ description = "Post-Quantum Key-Encapsulation Mechanism classicmceliece"
 readme = "README.md"
 version = "0.2.0"
 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-dilithium/Cargo.toml b/pqcrypto-dilithium/Cargo.toml
index a96cb2d..835d2e4 100644
--- a/pqcrypto-dilithium/Cargo.toml
+++ b/pqcrypto-dilithium/Cargo.toml
@@ -4,7 +4,7 @@ description = "Post-Quantum Signature Scheme dilithium"
 readme = "README.md"
 version = "0.5.0"
 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-falcon/Cargo.toml b/pqcrypto-falcon/Cargo.toml
index 57858b2..269d16d 100644
--- a/pqcrypto-falcon/Cargo.toml
+++ b/pqcrypto-falcon/Cargo.toml
@@ -4,7 +4,7 @@ description = "Post-Quantum Signature Scheme falcon"
 readme = "README.md"
 version = "0.3.0"
 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-hqc/Cargo.toml b/pqcrypto-hqc/Cargo.toml
index faa5269..1b89217 100644
--- a/pqcrypto-hqc/Cargo.toml
+++ b/pqcrypto-hqc/Cargo.toml
@@ -4,7 +4,7 @@ description = "Post-Quantum Key-Encapsulation Mechanism hqc"
 readme = "README.md"
 version = "0.2.0"
 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-kyber/Cargo.toml b/pqcrypto-kyber/Cargo.toml
index c850a8e..41fc6f5 100644
--- a/pqcrypto-kyber/Cargo.toml
+++ b/pqcrypto-kyber/Cargo.toml
@@ -4,7 +4,7 @@ description = "Post-Quantum Key-Encapsulation Mechanism kyber"
 readme = "README.md"
 version = "0.7.7"
 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-sphincsplus/Cargo.toml b/pqcrypto-sphincsplus/Cargo.toml
index eef71e0..d2b373f 100644
--- a/pqcrypto-sphincsplus/Cargo.toml
+++ b/pqcrypto-sphincsplus/Cargo.toml
@@ -4,7 +4,7 @@ description = "Post-Quantum Signature Scheme sphincsplus"
 readme = "README.md"
 version = "0.7.0"
 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/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"