diff --git a/llama_stack/distribution/datatypes.py b/llama_stack/distribution/datatypes.py
index 8139895ef..3a4806e27 100644
--- a/llama_stack/distribution/datatypes.py
+++ b/llama_stack/distribution/datatypes.py
@@ -139,7 +139,7 @@ One or more providers to use for each API. The same provider_type (e.g., meta-re
 can be instantiated multiple times (with different configs) if necessary.
 """,
     )
-    distribution_registry_store: Optional[KVStoreConfig] = Field(
+    metadata_store: Optional[KVStoreConfig] = Field(
         default=None,
         description="""
 Configuration for the persistence store used by the distribution registry. If not specified,
diff --git a/llama_stack/distribution/server/server.py b/llama_stack/distribution/server/server.py
index 636da3916..2560f4070 100644
--- a/llama_stack/distribution/server/server.py
+++ b/llama_stack/distribution/server/server.py
@@ -282,8 +282,8 @@ def main(
 
     app = FastAPI()
     # instantiate kvstore for storing and retrieving distribution metadata
-    if config.distribution_registry_store:
-        dist_kvstore = asyncio.run(kvstore_impl(config.distribution_registry_store))
+    if config.metadata_store:
+        dist_kvstore = asyncio.run(kvstore_impl(config.metadata_store))
     else:
         dist_kvstore = asyncio.run(
             kvstore_impl(