diff --git a/Cargo.toml b/Cargo.toml
index 3456f46..198b24c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,11 +20,18 @@ panic = 'abort'
 license = "Apache-2.0"
 repository = "https://github.com/containerd/rust-extensions"
 homepage = "https://containerd.io"
-edition = "2018"
+edition = "2021"
 
-# Common crate dependencies
+# Common dependencies for all crates
 [workspace.dependencies]
 tokio = "1.26"
 tower = "0.4"
+
+tonic = "0.9.2"
+tonic-build = "0.9.2"
+
+prost = "0.11"
+prost-types = "0.11"
+
 async-trait = "0.1.52"
 futures = "0.3.19"
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index e1b72cf..0962492 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -12,9 +12,9 @@ repository.workspace = true
 homepage.workspace = true
 
 [dependencies]
-tonic = "0.8"
-prost = "0.11"
-prost-types = "0.11"
+tonic.workspace = true
+prost.workspace = true
+prost-types.workspace = true
 tokio = { workspace = true, optional = true }
 tower = { workspace = true, optional = true }
 
@@ -30,7 +30,7 @@ tower = { workspace = true, optional = true }
 axum-core = ">=0.2.8"
 
 [build-dependencies]
-tonic-build = "0.8"
+tonic-build.workspace = true
 
 [features]
 connect = ["tokio", "tower"]
diff --git a/crates/client/src/lib.rs b/crates/client/src/lib.rs
index 48d58d6..ddde718 100644
--- a/crates/client/src/lib.rs
+++ b/crates/client/src/lib.rs
@@ -78,8 +78,6 @@ pub mod events {
 pub async fn connect(
     path: impl AsRef<std::path::Path>,
 ) -> Result<tonic::transport::Channel, tonic::transport::Error> {
-    use std::convert::TryFrom;
-
     use tokio::net::UnixStream;
     use tonic::transport::Endpoint;
 
diff --git a/crates/snapshots/Cargo.toml b/crates/snapshots/Cargo.toml
index 93216e8..c8be813 100644
--- a/crates/snapshots/Cargo.toml
+++ b/crates/snapshots/Cargo.toml
@@ -13,9 +13,9 @@ homepage.workspace = true
 
 [dependencies]
 thiserror = "1.0"
-tonic = "0.8"
-prost = "0.11"
-prost-types = "0.11"
+tonic.workspace = true
+prost.workspace = true
+prost-types.workspace = true
 tokio = { workspace = true, features = ["sync"] }
 tokio-stream = "0.1.8"
 serde = { version = "1.0", features = ["derive"] }
@@ -41,4 +41,4 @@ futures.workspace = true
 simple_logger = { version  = "4.0", default-features = false }
 
 [build-dependencies]
-tonic-build = "0.8"
+tonic-build.workspace = true