diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 857138412..76249061f 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -6982,8 +6982,9 @@ rec {
         features = {
           "default" = [ "otlp" ];
           "otlp" = [ "tvix-tracing/otlp" ];
+          "xp-store-composition-cli" = [ "tvix-store/xp-composition-cli" ];
         };
-        resolvedDefaultFeatures = [ "default" "otlp" ];
+        resolvedDefaultFeatures = [ "default" "otlp" "xp-store-composition-cli" ];
       };
       "nibble_vec" = rec {
         crateName = "nibble_vec";
@@ -15709,8 +15710,9 @@ rec {
         ];
         features = {
           "tracy" = [ "tvix-tracing/tracy" ];
+          "xp-store-composition-cli" = [ "tvix-store/xp-composition-cli" ];
         };
-        resolvedDefaultFeatures = [ "default" "tracy" ];
+        resolvedDefaultFeatures = [ "default" "tracy" "xp-store-composition-cli" ];
       };
       "tvix-eval" = rec {
         crateName = "tvix-eval";
diff --git a/tvix/cli/Cargo.toml b/tvix/cli/Cargo.toml
index d13cd17cb..1d4507ce5 100644
--- a/tvix/cli/Cargo.toml
+++ b/tvix/cli/Cargo.toml
@@ -34,3 +34,4 @@ expect-test = { workspace = true }
 [features]
 default = []
 tracy = ["tvix-tracing/tracy"]
+xp-store-composition-cli = ["tvix-store/xp-composition-cli"]
diff --git a/tvix/docs/src/castore/store-configuration.md b/tvix/docs/src/castore/store-configuration.md
index af476dd47..91015e6b5 100644
--- a/tvix/docs/src/castore/store-configuration.md
+++ b/tvix/docs/src/castore/store-configuration.md
@@ -54,7 +54,7 @@ today, using the existing CLI entrypoints, you can enable the
 
 With `cargo`, this can be enabled by passing
 `--features tvix-store/xp-composition-cli` to a `cargo build` / `cargo run`
-invocation.
+invocation. [^1]
 
 If enabled, CLI entrypoints get a `--experimental-store-composition` arg, which
 accepts a TOML file describing a composition for all three stores (causing the
@@ -171,3 +171,6 @@ public_keys = ["cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="]
 blob_service = "root"
 directory_service = "root"
 ```
+
+
+[^1]: In some leaf binary crates, this can also be controlled via the `xp-store-composition-cli` feature in the leaf crate itself.
diff --git a/tvix/nar-bridge/Cargo.toml b/tvix/nar-bridge/Cargo.toml
index ac23b5973..79d65f77c 100644
--- a/tvix/nar-bridge/Cargo.toml
+++ b/tvix/nar-bridge/Cargo.toml
@@ -39,6 +39,7 @@ tonic-build = { workspace = true }
 [features]
 default = ["otlp"]
 otlp = ["tvix-tracing/otlp"]
+xp-store-composition-cli = ["tvix-store/xp-composition-cli"]
 
 [dev-dependencies]
 hex-literal = { workspace = true }