diff --git a/Cargo.toml b/Cargo.toml
index 88d53382b..741781869 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,8 @@ members = [
     "taskchampion/xtask",
 ]
 
+resolver = "2"
+
 # src/tc/rust is just part of the TW build and not a public crate
 exclude = [ "src/tc/rust" ]
 
diff --git a/taskchampion/integration-tests/Cargo.toml b/taskchampion/integration-tests/Cargo.toml
index 9127faa54..9b9579e06 100644
--- a/taskchampion/integration-tests/Cargo.toml
+++ b/taskchampion/integration-tests/Cargo.toml
@@ -2,7 +2,7 @@
 name = "integration-tests"
 version = "0.4.1"
 authors = ["Dustin J. Mitchell <dustin@mozilla.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 build = "build.rs"
 
diff --git a/taskchampion/lib/Cargo.toml b/taskchampion/lib/Cargo.toml
index 414a6a9d8..5cfcd5358 100644
--- a/taskchampion/lib/Cargo.toml
+++ b/taskchampion/lib/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "taskchampion-lib"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 libc.workspace = true
diff --git a/taskchampion/sync-server/Cargo.toml b/taskchampion/sync-server/Cargo.toml
index 49213cd8c..1e2a8c225 100644
--- a/taskchampion/sync-server/Cargo.toml
+++ b/taskchampion/sync-server/Cargo.toml
@@ -2,7 +2,7 @@
 name = "taskchampion-sync-server"
 version = "0.4.1"
 authors = ["Dustin J. Mitchell <dustin@mozilla.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/taskchampion/taskchampion/Cargo.toml b/taskchampion/taskchampion/Cargo.toml
index e96612a8c..db4679828 100644
--- a/taskchampion/taskchampion/Cargo.toml
+++ b/taskchampion/taskchampion/Cargo.toml
@@ -8,7 +8,8 @@ documentation = "https://docs.rs/crate/taskchampion"
 repository = "https://github.com/GothenburgBitFactory/taskwarrior"
 readme = "../README.md"
 license = "MIT"
-edition = "2018"
+edition = "2021"
+rust-version = "1.65"
 
 [dependencies]
 uuid.workspace = true
diff --git a/taskchampion/xtask/Cargo.toml b/taskchampion/xtask/Cargo.toml
index 5e0ccbe3b..0d7c09565 100644
--- a/taskchampion/xtask/Cargo.toml
+++ b/taskchampion/xtask/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
 name = "xtask"
 version = "0.4.1" 
-edition = "2018"
-# rust-version = "1.65" # Used for testing xtask MSRV functionality
+edition = "2021"
 
 [dependencies]
 anyhow.workspace = true
diff --git a/taskchampion/xtask/src/main.rs b/taskchampion/xtask/src/main.rs
index e7db2f21e..1d561827c 100644
--- a/taskchampion/xtask/src/main.rs
+++ b/taskchampion/xtask/src/main.rs
@@ -22,6 +22,7 @@ const MSRV_PATH_REGEX: &[(&str, &str)] = &[
         "taskchampion/src/lib.rs",
         r#"Rust version [0-9.]* and higher"#,
     ),
+    ("taskchampion/Cargo.toml", r#"^rust-version = "[0-9.]"#),
 ];
 
 pub fn main() -> anyhow::Result<()> {