diff --git a/Cargo.toml b/Cargo.toml
index 37bd847..3ff94ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,14 +25,15 @@ hex-literal = "0.3"
 iso7816 = "0.1"
 serde = { version = "1", default-features = false, features = ["derive"] }
 trussed = { version = "0.1", features = ["serde-extensions"] }
-trussed-auth = { version = "0.2" }
+trussed-auth = { version = "0.3" }
 untrusted = "0.9"
 vpicc = { version = "0.1.0", optional = true }
 log = "0.4"
 heapless-bytes = "0.3.0"
 subtle = { version = "2", default-features = false }
 trussed-rsa-alloc = { version = "0.1.0", features = ["raw"], optional = true }
-trussed-staging = { version = "0.1.0", features = ["chunked", "encrypted-chunked"]}
+trussed-chunked = "0.1.0"
+trussed-staging = { version = "0.3.0", features = ["chunked"], default-features = false }
 
 [dev-dependencies]
 littlefs2 = "0.3.2"
@@ -75,10 +76,12 @@ log-warn = []
 log-error = []
 
 [patch.crates-io]
-trussed = { git = "https://github.com/nitrokey/trussed" , tag = "v0.1.0-nitrokey.11" }
-trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth.git", tag = "v0.2.2"}
-trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", tag = "v0.1.0"}
-trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging", tag = "v0.1.0" }
+trussed = { git = "https://github.com/nitrokey/trussed" , tag = "v0.1.0-nitrokey.18" }
+littlefs2 = { git = "https://github.com/trussed-dev/littlefs2.git", rev = "ebd27e49ca321089d01d8c9b169c4aeb58ceeeca" }
+trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth.git", tag = "v0.3.0"}
+trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", rev = "9732a9a3e98af72112286afdc9b7174c66c2869a" }
+trussed-chunked = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "chunked-v0.1.0" }
+trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "v0.3.0" }
 apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch", tag = "v0.1.2-nitrokey.2" }
 trussed-usbip = { git = "https://github.com/Nitrokey/pc-usbip-runner.git", tag = "v0.0.1-nitrokey.1" }
 usbd-ccid = { git = "https://github.com/Nitrokey/usbd-ccid", tag = "v0.2.0-nitrokey.1" }
diff --git a/src/lib.rs b/src/lib.rs
index 4bfd537..a8e43fe 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -22,7 +22,7 @@ pub mod state;
 mod tlv;
 
 pub use piv_types::{AsymmetricAlgorithms, Pin, Puk};
-use trussed_staging::streaming::ChunkedClient;
+use trussed_chunked::ChunkedClient;
 
 #[cfg(feature = "virt")]
 pub mod virt;
diff --git a/src/state.rs b/src/state.rs
index 4209d70..6051b0d 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -11,7 +11,7 @@ use trussed::{
     syscall, try_syscall,
     types::{KeyId, KeySerialization, Location, Mechanism, PathBuf, StorageAttributes},
 };
-use trussed_staging::streaming::utils;
+use trussed_chunked::utils;
 
 use crate::piv_types::CardHolderUniqueIdentifier;
 use crate::reply::Reply;
diff --git a/src/virt.rs b/src/virt.rs
index 5061559..864ab45 100644
--- a/src/virt.rs
+++ b/src/virt.rs
@@ -12,9 +12,10 @@ pub mod dispatch {
         types::{Bytes, Context, Location},
     };
     use trussed_auth::{AuthBackend, AuthContext, AuthExtension, MAX_HW_KEY_LEN};
+    use trussed_chunked::ChunkedExtension;
     #[cfg(feature = "rsa")]
     use trussed_rsa_alloc::SoftwareRsa;
-    use trussed_staging::{streaming::ChunkedExtension, StagingBackend, StagingContext};
+    use trussed_staging::{StagingBackend, StagingContext};
 
     /// Backends used by opcard
     pub const BACKENDS: &[BackendId<Backend>] = &[