diff --git a/Cargo.lock b/Cargo.lock
index 2e4501d..dfeb9a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "rmcp"
-version = "1.8.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1f571c72940a19d9532fe52dbea8bc9912bf1d766c2970bb824056b86f3f59"
+checksum = "f00a32c3b81b7b254076a65abd5ab2551209146713ba38f73818657e865e9433"
 dependencies = [
  "async-trait",
  "chrono",
@@ -1793,9 +1793,9 @@ dependencies = [
 
 [[package]]
 name = "rmcp-macros"
-version = "1.8.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aad0035b69380782d78ea95b508327e6deaa2235909053e596eea8f27b5e1d5"
+checksum = "2ee70afb7956da9f30d5348a2539b5eb90d9038f834463657ab717076ac3b1ad"
 dependencies = [
  "darling",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index d876775..cce4dfd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,7 +59,7 @@ aws-smithy-http-client = { version = "1.1.13", default-features = false, feature
 tokio = { version = "1.52.3", default-features = false, features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread"] }
 
 # MCP SDK with macros support
-rmcp = { version = "1.7.0", default-features = false, features = ["server", "transport-io", "macros"] }
+rmcp = { version = "2.1.0", default-features = false, features = ["server", "transport-io", "macros"] }
 
 # Command line argument parsing
 clap = { version = "4.6.1", features = ["derive", "env"] }