diff --git a/Cargo.nix b/Cargo.nix
index 4693964a..a6947066 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -1945,9 +1945,6 @@ in
     version = "1.0.1";
     registry = "unknown";
     src = fetchCrateLocal workspaceSrc;
-    features = builtins.concatLists [
-      (lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/garage_api_k2v" || rootFeatures' ? "garage/k2v" || rootFeatures' ? "garage_api_k2v/default") "default")
-    ];
     dependencies = {
       async_trait = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".async-trait."0.1.77" { profileName = "__noProfile"; }).out;
       base64 = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".base64."0.21.7" { inherit profileName; }).out;
@@ -2085,7 +2082,7 @@ in
     src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
       (lib.optional (rootFeatures' ? "garage_model/default") "default")
-      (lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/garage_api_k2v" || rootFeatures' ? "garage/k2v" || rootFeatures' ? "garage_api_k2v/default" || rootFeatures' ? "garage_model/k2v") "k2v")
+      [ "k2v" ]
       (lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/lmdb" || rootFeatures' ? "garage_model/default" || rootFeatures' ? "garage_model/lmdb") "lmdb")
       (lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/sqlite" || rootFeatures' ? "garage_model/default" || rootFeatures' ? "garage_model/sqlite") "sqlite")
     ];
@@ -2226,7 +2223,7 @@ in
     registry = "unknown";
     src = fetchCrateLocal workspaceSrc;
     features = builtins.concatLists [
-      (lib.optional (rootFeatures' ? "garage/default" || rootFeatures' ? "garage/garage_api_k2v" || rootFeatures' ? "garage/k2v" || rootFeatures' ? "garage_api_k2v/default" || rootFeatures' ? "garage_model/k2v" || rootFeatures' ? "garage_util/k2v") "k2v")
+      [ "k2v" ]
     ];
     dependencies = {
       arc_swap = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".arc-swap."1.6.0" { inherit profileName; }).out;
diff --git a/src/api/admin/Cargo.toml b/src/api/admin/Cargo.toml
index 55767dcf..adddf306 100644
--- a/src/api/admin/Cargo.toml
+++ b/src/api/admin/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
-description = "S3 API server crate for the Garage object store"
+description = "Admin API server crate for the Garage object store"
 repository = "https://git.deuxfleurs.fr/Deuxfleurs/garage"
 readme = "../../README.md"
 
@@ -19,6 +19,7 @@ garage_table.workspace = true
 garage_util.workspace = true
 garage_rpc.workspace = true
 garage_api_common.workspace = true
+
 argon2.workspace = true
 async-trait.workspace = true
 err-derive.workspace = true
diff --git a/src/api/common/Cargo.toml b/src/api/common/Cargo.toml
index eea43efe..842662c4 100644
--- a/src/api/common/Cargo.toml
+++ b/src/api/common/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
-description = "S3 API server crate for the Garage object store"
+description = "Common functions for the API server crates for the Garage object store"
 repository = "https://git.deuxfleurs.fr/Deuxfleurs/garage"
 readme = "../../README.md"
 
@@ -17,6 +17,7 @@ path = "lib.rs"
 garage_model.workspace = true
 garage_table.workspace = true
 garage_util.workspace = true
+
 async-trait.workspace = true
 bytes.workspace = true
 chrono.workspace = true
diff --git a/src/api/k2v/Cargo.toml b/src/api/k2v/Cargo.toml
index 01376020..d4e26efa 100644
--- a/src/api/k2v/Cargo.toml
+++ b/src/api/k2v/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.1"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
-description = "S3 API server crate for the Garage object store"
+description = "K2V API server crate for the Garage object store"
 repository = "https://git.deuxfleurs.fr/Deuxfleurs/garage"
 readme = "../../README.md"
 
@@ -14,10 +14,11 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_model.workspace = true
+garage_model = { workspace = true, features = [ "k2v" ] }
 garage_table.workspace = true
-garage_util.workspace = true
+garage_util = { workspace = true, features = [ "k2v" ] }
 garage_api_common.workspace = true
+
 async-trait.workspace = true
 base64.workspace = true
 err-derive.workspace = true
@@ -35,6 +36,3 @@ serde.workspace = true
 serde_json.workspace = true
 
 opentelemetry.workspace = true
-
-[features]
-default = [ "garage_util/k2v", "garage_model/k2v" ]