diff --git a/components/apps/Cargo.toml b/components/apps/Cargo.toml
index 97da67ef..f0ff6c9a 100644
--- a/components/apps/Cargo.toml
+++ b/components/apps/Cargo.toml
@@ -76,10 +76,11 @@ se050 = ["dep:se05x", "trussed-se050-backend", "trussed-se050-manage", "admin-ap
 # backends
 backend-auth = ["trussed-auth"]
 backend-rsa = ["trussed-rsa-alloc"]
+backend-software-hpke = ["trussed-staging/hpke"]
 
 log-all = ["admin-app/log-all", "fido-authenticator?/log-all", "secrets-app?/log-all", "webcrypt?/log-all", "opcard?/log-all", "provisioner-app?/log-all"]
 
-trussed-usbip-ccid = ["trussed-usbip/ccid", "trussed-staging/hpke"]
+trussed-usbip-ccid = ["trussed-usbip/ccid", "backend-software-hpke"]
 
 factory-reset = ["admin-app/factory-reset"]
 
diff --git a/components/apps/src/dispatch.rs b/components/apps/src/dispatch.rs
index b7d3262e..022a6389 100644
--- a/components/apps/src/dispatch.rs
+++ b/components/apps/src/dispatch.rs
@@ -323,9 +323,7 @@ impl<T: Twi, D: Delay> ExtensionDispatch for Dispatch<T, D> {
                         resources,
                     )
                 }
-                #[cfg(feature = "piv-authenticator")]
-                // Don't use staging hpke if se050 is available
-                #[cfg(not(feature = "se050"))]
+                #[cfg(feature = "backend-software-hpke")]
                 Extension::Hpke => ExtensionImpl::<HpkeExtension>::extension_request_serialized(
                     &mut self.staging,
                     &mut ctx.core,