diff --git a/Cargo.toml b/Cargo.toml
index d8f3b24..325fc79 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,8 @@
 [workspace]
+resolver = "2"
 members = [
     "encryption-demo",
     "encryption-demo-methods",
+    "encryption-demo-methods/guest/chacha20",
+    "encryption-demo-methods/guest/xchacha20",
 ]
-workspace.resolver = "2"
diff --git a/encryption-demo-methods/Cargo.toml b/encryption-demo-methods/Cargo.toml
index ff9c336..bccc044 100644
--- a/encryption-demo-methods/Cargo.toml
+++ b/encryption-demo-methods/Cargo.toml
@@ -6,9 +6,10 @@ publish = false
 build = "build.rs"
 
 [dependencies]
-build = "0.0.2"
-risc0-zkvm = { version = "2.2", default-features = false }
-risc0-build = { version = "2.2", default-features = false }
+risc0-zkvm = { version = "2.3.1", default-features = false }
+
+[build-dependencies]
+risc0-build = { version = "2.3.1", default-features = false }
 
 [package.metadata.risc0]
 methods = ["guest/chacha20", "guest/xchacha20"]
diff --git a/encryption-demo-methods/guest/chacha20/Cargo.toml b/encryption-demo-methods/guest/chacha20/Cargo.toml
index bce8cdd..fdf0bfb 100644
--- a/encryption-demo-methods/guest/chacha20/Cargo.toml
+++ b/encryption-demo-methods/guest/chacha20/Cargo.toml
@@ -9,9 +9,9 @@ crate-type = ["staticlib"]
 [dependencies]
 # no_std stream cipher
 chacha20 = { version = "0.9", default-features = false }
-cipher   = { version = "0.5", default-features = false }
+cipher   = { version = "0.4", default-features = false }
 
-risc0-zkvm-guest = "2.2"
+risc0-zkvm-guest = "2.3.1"
 
 [features]
 default = ["alloc"]    # pull in alloc inside guest
diff --git a/encryption-demo-methods/guest/xchacha20/Cargo.toml b/encryption-demo-methods/guest/xchacha20/Cargo.toml
index f94e10f..efd6e1e 100644
--- a/encryption-demo-methods/guest/xchacha20/Cargo.toml
+++ b/encryption-demo-methods/guest/xchacha20/Cargo.toml
@@ -9,9 +9,9 @@ crate-type = ["staticlib"]
 [dependencies]
 # no_std stream cipher
 xchacha20 = { version = "0.9", default-features = false }
-cipher   = { version = "0.5", default-features = false }
+cipher   = { version = "0.4", default-features = false }
 
-risc0-zkvm-guest = "2.2"
+risc0-zkvm-guest = "2.3.1"
 
 [features]
 default = ["alloc"]    # pull in alloc inside guest
diff --git a/encryption-demo/Cargo.toml b/encryption-demo/Cargo.toml
index 6d6a565..bd556c7 100644
--- a/encryption-demo/Cargo.toml
+++ b/encryption-demo/Cargo.toml
@@ -5,11 +5,12 @@ edition = "2021"
 publish = false
 
 [dependencies]
-risc0-zkvm = "2.2"
+risc0-zkvm = "2.3.1"
 rand = { version = "0.8", features = ["std"]}
 hex = "0.4"
 
 encryption-demo-methods = { path = "../encryption-demo-methods" }
+risc0-build = "2.3.1"
 
 [[bin]]
 name = "encrypt-demo"