diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4a909ad42..8a55baf3ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,12 @@
 
 #### Upcoming Changes
 
+* fix: specify resolver version 2 in the virtual workspace's manifest [#1311](https://github.com/lambdaclass/cairo-vm/pull/1311)
+
 * feat: add `lambdaworks-felt` feature to `cairo-vm-cli` [#1308](https://github.com/lambdaclass/cairo-vm/pull/1308)
 
-* chore: update dependencies, particularly clap 3.2 -> 4.3
+* chore: update dependencies, particularly clap 3.2 -> 4.3 [#1309](https://github.com/lambdaclass/cairo-vm/pull/1309)
+
   * this removes dependency on _atty_, that's no longer mantained
 
 * chore: remove unused dependencies [#1307](https://github.com/lambdaclass/cairo-vm/pull/1307)
diff --git a/Cargo.toml b/Cargo.toml
index 4c40c4ac95..f3b1cbc9da 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,10 @@
 members = ["cairo-vm-cli", "felt", "vm", "hint_accountant"]
 exclude = ["ensure-no_std"]
 
+# Explicitly set the resolver to the default for edition >= 2021
+# https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
+resolver = "2"
+
 [workspace.package]
 version = "0.8.1"
 edition = "2021"