diff --git a/Cargo.toml b/Cargo.toml
index a9328f9..9f5b4c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,8 +2,12 @@
 members = ["crates/*"]
 resolver = "2"
 
+[workspace.dependencies]
+mcp-core = { path = "./crates/mcp-core" }
+mcp-macros = { path = "./crates/mcp-macros" }
+
 [workspace.package]
-edition = "2024"
+edition = "2021"
 version = "1.0.7"
 authors = ["Block <ai-oss-tools@block.xyz>"]
 license = "MIT"
diff --git a/crates/mcp-client/Cargo.toml b/crates/mcp-client/Cargo.toml
index ab4ca78..daa033b 100644
--- a/crates/mcp-client/Cargo.toml
+++ b/crates/mcp-client/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "mcp-client"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
-mcp-core = { path = "../mcp-core" }
+mcp-core = { workspace = true }
 tokio = { version = "1", features = ["full"] }
 reqwest = { version = "0.11", default-features = false, features = ["json", "stream", "rustls-tls"] }
 eventsource-client = "0.12.0"
diff --git a/crates/mcp-core/Cargo.toml b/crates/mcp-core/Cargo.toml
index d2d613d..2f753ea 100644
--- a/crates/mcp-core/Cargo.toml
+++ b/crates/mcp-core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "mcp-core"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
 async-trait = "0.1"
diff --git a/crates/mcp-macros/Cargo.toml b/crates/mcp-macros/Cargo.toml
index 65450f7..65a2046 100644
--- a/crates/mcp-macros/Cargo.toml
+++ b/crates/mcp-macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "mcp-macros"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 [lib]
 proc-macro = true
diff --git a/crates/mcp-server/Cargo.toml b/crates/mcp-server/Cargo.toml
index 3657fc5..f09736c 100644
--- a/crates/mcp-server/Cargo.toml
+++ b/crates/mcp-server/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "mcp-server"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
 anyhow = "1.0.94"
 thiserror = "1.0"
-mcp-core = { path = "../mcp-core" }
-mcp-macros = { path = "../mcp-macros" }
+mcp-core = { workspace = true }
+mcp-macros = { workspace = true }
 serde = { version = "1.0.216", features = ["derive"] }
 serde_json = "1.0.133"
 schemars = "0.8"