diff --git a/Cargo.lock b/Cargo.lock
index f5b733e..f95ca9c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 3
 [[package]]
 name = "admin-app"
 version = "0.1.0"
-source = "git+https://github.com/Nitrokey/admin-app.git?tag=v0.1.0-nitrokey.8#8d4aa588ccd9599e82cafff478169578724a3bae"
+source = "git+https://github.com/Nitrokey/admin-app.git?branch=extensions#0ba0e766cba65a1fe7b0865f343de589e4202d82"
 dependencies = [
  "apdu-dispatch",
  "cbor-smol",
@@ -17,7 +17,7 @@ dependencies = [
  "serde",
  "strum_macros",
  "trussed",
- "trussed-staging",
+ "trussed-manage",
 ]
 
 [[package]]
@@ -1724,6 +1724,15 @@ dependencies = [
  "trussed",
 ]
 
+[[package]]
+name = "trussed-manage"
+version = "0.1.0"
+source = "git+https://github.com/trussed-dev/trussed-staging.git?tag=manage-v0.1.0#5fc00717e6aa3f43d4f72fd3bd589f2de3a89b98"
+dependencies = [
+ "serde",
+ "trussed",
+]
+
 [[package]]
 name = "trussed-rsa-alloc"
 version = "0.1.0"
@@ -1740,8 +1749,8 @@ dependencies = [
 
 [[package]]
 name = "trussed-staging"
-version = "0.1.0"
-source = "git+https://github.com/Nitrokey/trussed-staging.git?rev=6e70fc4db31b92c413d56e28c6d3683a87384d46#6e70fc4db31b92c413d56e28c6d3683a87384d46"
+version = "0.2.0"
+source = "git+https://github.com/trussed-dev/trussed-staging.git?tag=v0.2.0#5fc00717e6aa3f43d4f72fd3bd589f2de3a89b98"
 dependencies = [
  "delog",
  "littlefs2",
@@ -1749,6 +1758,7 @@ dependencies = [
  "serde",
  "serde-byte-array",
  "trussed",
+ "trussed-manage",
 ]
 
 [[package]]
@@ -1871,6 +1881,7 @@ dependencies = [
  "trussed",
  "trussed-auth",
  "trussed-hkdf",
+ "trussed-manage",
  "trussed-rsa-alloc",
  "trussed-staging",
  "trussed-usbip",
@@ -2050,8 +2061,3 @@ dependencies = [
  "quote",
  "syn 2.0.52",
 ]
-
-[[patch.unused]]
-name = "trussed-hmacsha256p256"
-version = "0.1.0"
-source = "git+https://github.com/Nitrokey/trussed-hmacsha256p256.git?rev=9a12feb358437628844b844cddd08e2de0c36b3c#9a12feb358437628844b844cddd08e2de0c36b3c"
diff --git a/Cargo.toml b/Cargo.toml
index 940cf8b..9b5c531 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,6 @@ apdu-dispatch = "0.1"
 trussed = "0.1.0"
 pretty_env_logger = { version = "0.4.0", optional = true }
 trussed-rsa-alloc = { version = "0.1.0", optional = true }
-trussed-staging = { version = "0.1.0"}
 
 # For hmacsha256p256
 hmac = { version = "0.12", default-features = false, optional = true}
@@ -42,6 +41,8 @@ clap-num = "1.0.0"
 delog = { version = "0.1.6", features = ["std-log"] }
 fido-authenticator = {version = "0.1.1", features = ["dispatch", "log-all"]}
 trussed-hkdf = { version = "0.1.0" }
+trussed-manage = { version = "0.1.0" }
+trussed-staging = { version = "0.2.0" }
 trussed-usbip = { version = "0.0.1", features = ["ctaphid"], default-features = false }
 admin-app = { version = "0.1", features = ["log-all"] }
 
@@ -66,7 +67,7 @@ apdu-peek = []
 
 # Support P256 key derivation from HMAC
 # Uses custom backend extension
-hmacsha256p256 = ["hmac", "sha2"]
+hmacsha256p256 = ["trussed/serde-extensions", "hmac", "sha2"]
 
 # Allow to inject raw key data with specified type into the Trussed key store. Needed for OpenPGP support to use Kind::P256.
 # Uses custom backend extension
@@ -95,7 +96,7 @@ ctaphid-dispatch = { git = "https://github.com/Nitrokey/ctaphid-dispatch", tag =
 #apdu-dispatch = { git = "https://github.com/Nitrokey/apdu-dispatch.git", branch="sz-multiple-apps" }
 
 # forked
-admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.8" }
+admin-app = { git = "https://github.com/Nitrokey/admin-app.git", branch = "extensions" }
 fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.11" }
 serde-indexed = { git = "https://github.com/sosthene-nitrokey/serde-indexed.git", rev = "5005d23cb4ee8622e62188ea0f9466146f851f0d" }
 
@@ -109,12 +110,12 @@ usbd-ctaphid = { git = "https://github.com/Nitrokey/usbd-ctaphid", tag = "v0.1.0
 
 # unreleased crates
 trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth", rev = "62235294bd63977bbb88eb01e7ac44b8010eb450" }
+trussed-manage = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "manage-v0.1.0" }
 trussed-hkdf = { git = "https://github.com/Nitrokey/trussed-hkdf-backend.git", tag = "v0.1.0" }
 trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", rev = "2f51478f0861ff8db19fdd5290f023ab6f4c2fb9" }
+trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "v0.2.0" }
 trussed-usbip = { git = "https://github.com/Nitrokey/pc-usbip-runner", tag = "v0.0.1-nitrokey.1" }
-trussed-staging = { git = "https://github.com/Nitrokey/trussed-staging.git", rev = "6e70fc4db31b92c413d56e28c6d3683a87384d46" }
 
 # Local development
 #trussed = { path = "../trussed" }
 #trussed-rsa-alloc = { path = "../trussed-rsa-backend" }
-#trussed-staging = { path = "../trussed-staging" }
diff --git a/examples/usbip/main.rs b/examples/usbip/main.rs
index d6d8267..a6788c3 100644
--- a/examples/usbip/main.rs
+++ b/examples/usbip/main.rs
@@ -8,7 +8,7 @@ const LOCATION_FOR_SIMULATION: Location = Location::Internal;
 
 mod dispatch {
     use trussed_hkdf::HkdfExtension;
-    use trussed_staging::manage::ManageExtension;
+    use trussed_manage::ManageExtension;
     use trussed_staging::StagingBackend;
     use trussed_staging::StagingContext;
     use webcrypt::hmacsha256p256::HmacSha256P256Extension;
@@ -459,7 +459,7 @@ impl trussed_usbip::Apps<'static, VirtClient, dispatch::Dispatch> for Apps {
             },
         );
         let data = AdminData::new(Variant::Usbip);
-        let admin = admin_app::App::without_config(
+        let admin = admin_app::App::with_default_config(
             builder.build("admin", &[BackendId::Core]),
             [0; 16],
             0,