diff --git a/api/swagger.yml b/api/swagger.yml
index 039303747f9..ebe89ca37a1 100644
--- a/api/swagger.yml
+++ b/api/swagger.yml
@@ -186,7 +186,7 @@ components:
           type: string
         storage_id:
           type: string
-          description: Unique identifier of the underlying data store
+          description: Unique identifier of the underlying data store. *EXPERIMENTAL*
         storage_namespace:
           type: string
           description: Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")
@@ -269,7 +269,7 @@ components:
           pattern: "^[a-z0-9][a-z0-9-]{2,62}$"
         storage_id:
           type: string
-          description: Unique identifier of the underlying data store
+          description: Unique identifier of the underlying data store. *EXPERIMENTAL*
         storage_namespace:
           type: string
           description: 'Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")'
diff --git a/clients/java/api/openapi.yaml b/clients/java/api/openapi.yaml
index 458f93d2741..1691867a53f 100644
--- a/clients/java/api/openapi.yaml
+++ b/clients/java/api/openapi.yaml
@@ -7516,7 +7516,7 @@ components:
         default_branch:
           type: string
         storage_id:
-          description: Unique identifier of the underlying data store
+          description: Unique identifier of the underlying data store. *EXPERIMENTAL*
           type: string
         storage_namespace:
           description: Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")
@@ -7634,7 +7634,7 @@ components:
           pattern: "^[a-z0-9][a-z0-9-]{2,62}$"
           type: string
         storage_id:
-          description: Unique identifier of the underlying data store
+          description: Unique identifier of the underlying data store. *EXPERIMENTAL*
           type: string
         storage_namespace:
           description: Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")
diff --git a/clients/java/docs/Repository.md b/clients/java/docs/Repository.md
index eb00c5451e9..289de4f72ef 100644
--- a/clients/java/docs/Repository.md
+++ b/clients/java/docs/Repository.md
@@ -10,7 +10,7 @@
 |**id** | **String** |  |  |
 |**creationDate** | **Long** | Unix Epoch in seconds |  |
 |**defaultBranch** | **String** |  |  |
-|**storageId** | **String** | Unique identifier of the underlying data store |  [optional] |
+|**storageId** | **String** | Unique identifier of the underlying data store. *EXPERIMENTAL* |  [optional] |
 |**storageNamespace** | **String** | Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\") |  |
 |**readOnly** | **Boolean** | Whether the repository is a read-only repository- not relevant for bare repositories |  [optional] |
 
diff --git a/clients/java/docs/RepositoryCreation.md b/clients/java/docs/RepositoryCreation.md
index d104df63524..c448d3a7afd 100644
--- a/clients/java/docs/RepositoryCreation.md
+++ b/clients/java/docs/RepositoryCreation.md
@@ -8,7 +8,7 @@
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
 |**name** | **String** |  |  |
-|**storageId** | **String** | Unique identifier of the underlying data store |  [optional] |
+|**storageId** | **String** | Unique identifier of the underlying data store. *EXPERIMENTAL* |  [optional] |
 |**storageNamespace** | **String** | Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\") |  |
 |**defaultBranch** | **String** |  |  [optional] |
 |**sampleData** | **Boolean** |  |  [optional] |
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Repository.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Repository.java
index 82f960d76c8..6f09633ee7c 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/Repository.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/Repository.java
@@ -149,7 +149,7 @@ public Repository storageId(String storageId) {
   }
 
    /**
-   * Unique identifier of the underlying data store
+   * Unique identifier of the underlying data store. *EXPERIMENTAL*
    * @return storageId
   **/
   @javax.annotation.Nullable
diff --git a/clients/java/src/main/java/io/lakefs/clients/sdk/model/RepositoryCreation.java b/clients/java/src/main/java/io/lakefs/clients/sdk/model/RepositoryCreation.java
index dbfa5f29e41..f290d6f1922 100644
--- a/clients/java/src/main/java/io/lakefs/clients/sdk/model/RepositoryCreation.java
+++ b/clients/java/src/main/java/io/lakefs/clients/sdk/model/RepositoryCreation.java
@@ -107,7 +107,7 @@ public RepositoryCreation storageId(String storageId) {
   }
 
    /**
-   * Unique identifier of the underlying data store
+   * Unique identifier of the underlying data store. *EXPERIMENTAL*
    * @return storageId
   **/
   @javax.annotation.Nullable
diff --git a/clients/python/docs/Repository.md b/clients/python/docs/Repository.md
index 34c8b4b83ff..342c310af69 100644
--- a/clients/python/docs/Repository.md
+++ b/clients/python/docs/Repository.md
@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **id** | **str** |  | 
 **creation_date** | **int** | Unix Epoch in seconds | 
 **default_branch** | **str** |  | 
-**storage_id** | **str** | Unique identifier of the underlying data store | [optional] 
+**storage_id** | **str** | Unique identifier of the underlying data store. *EXPERIMENTAL* | [optional] 
 **storage_namespace** | **str** | Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\") | 
 **read_only** | **bool** | Whether the repository is a read-only repository- not relevant for bare repositories | [optional] 
 
diff --git a/clients/python/docs/RepositoryCreation.md b/clients/python/docs/RepositoryCreation.md
index dca25858a08..c81cb9b89cb 100644
--- a/clients/python/docs/RepositoryCreation.md
+++ b/clients/python/docs/RepositoryCreation.md
@@ -6,7 +6,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **str** |  | 
-**storage_id** | **str** | Unique identifier of the underlying data store | [optional] 
+**storage_id** | **str** | Unique identifier of the underlying data store. *EXPERIMENTAL* | [optional] 
 **storage_namespace** | **str** | Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\") | 
 **default_branch** | **str** |  | [optional] 
 **sample_data** | **bool** |  | [optional] [default to False]
diff --git a/clients/python/lakefs_sdk/models/repository.py b/clients/python/lakefs_sdk/models/repository.py
index df34e6034ca..167425c6166 100644
--- a/clients/python/lakefs_sdk/models/repository.py
+++ b/clients/python/lakefs_sdk/models/repository.py
@@ -32,7 +32,7 @@ class Repository(BaseModel):
     id: StrictStr = Field(...)
     creation_date: StrictInt = Field(..., description="Unix Epoch in seconds")
     default_branch: StrictStr = Field(...)
-    storage_id: Optional[StrictStr] = Field(None, description="Unique identifier of the underlying data store")
+    storage_id: Optional[StrictStr] = Field(None, description="Unique identifier of the underlying data store. *EXPERIMENTAL*")
     storage_namespace: StrictStr = Field(..., description="Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\")")
     read_only: Optional[StrictBool] = Field(None, description="Whether the repository is a read-only repository- not relevant for bare repositories")
     __properties = ["id", "creation_date", "default_branch", "storage_id", "storage_namespace", "read_only"]
diff --git a/clients/python/lakefs_sdk/models/repository_creation.py b/clients/python/lakefs_sdk/models/repository_creation.py
index 88452c5edfe..fdf8fea11ed 100644
--- a/clients/python/lakefs_sdk/models/repository_creation.py
+++ b/clients/python/lakefs_sdk/models/repository_creation.py
@@ -30,7 +30,7 @@ class RepositoryCreation(BaseModel):
     RepositoryCreation
     """
     name: constr(strict=True) = Field(...)
-    storage_id: Optional[StrictStr] = Field(None, description="Unique identifier of the underlying data store")
+    storage_id: Optional[StrictStr] = Field(None, description="Unique identifier of the underlying data store. *EXPERIMENTAL*")
     storage_namespace: constr(strict=True) = Field(..., description="Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\")")
     default_branch: Optional[StrictStr] = None
     sample_data: Optional[StrictBool] = False
diff --git a/clients/rust/docs/Repository.md b/clients/rust/docs/Repository.md
index 8ed0507d956..8d3fec03d27 100644
--- a/clients/rust/docs/Repository.md
+++ b/clients/rust/docs/Repository.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **id** | **String** |  | 
 **creation_date** | **i64** | Unix Epoch in seconds | 
 **default_branch** | **String** |  | 
-**storage_id** | Option<**String**> | Unique identifier of the underlying data store | [optional]
+**storage_id** | Option<**String**> | Unique identifier of the underlying data store. *EXPERIMENTAL* | [optional]
 **storage_namespace** | **String** | Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\") | 
 **read_only** | Option<**bool**> | Whether the repository is a read-only repository- not relevant for bare repositories | [optional]
 
diff --git a/clients/rust/docs/RepositoryCreation.md b/clients/rust/docs/RepositoryCreation.md
index feed234e0ed..2640fb5d93f 100644
--- a/clients/rust/docs/RepositoryCreation.md
+++ b/clients/rust/docs/RepositoryCreation.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **String** |  | 
-**storage_id** | Option<**String**> | Unique identifier of the underlying data store | [optional]
+**storage_id** | Option<**String**> | Unique identifier of the underlying data store. *EXPERIMENTAL* | [optional]
 **storage_namespace** | **String** | Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\") | 
 **default_branch** | Option<**String**> |  | [optional]
 **sample_data** | Option<**bool**> |  | [optional][default to false]
diff --git a/clients/rust/src/models/repository.rs b/clients/rust/src/models/repository.rs
index c1917fe1b4e..a2efa25af57 100644
--- a/clients/rust/src/models/repository.rs
+++ b/clients/rust/src/models/repository.rs
@@ -19,7 +19,7 @@ pub struct Repository {
     pub creation_date: i64,
     #[serde(rename = "default_branch")]
     pub default_branch: String,
-    /// Unique identifier of the underlying data store
+    /// Unique identifier of the underlying data store. *EXPERIMENTAL*
     #[serde(rename = "storage_id", skip_serializing_if = "Option::is_none")]
     pub storage_id: Option<String>,
     /// Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\")
diff --git a/clients/rust/src/models/repository_creation.rs b/clients/rust/src/models/repository_creation.rs
index 43a0b4c1396..83ceb8ff873 100644
--- a/clients/rust/src/models/repository_creation.rs
+++ b/clients/rust/src/models/repository_creation.rs
@@ -14,7 +14,7 @@ use crate::models;
 pub struct RepositoryCreation {
     #[serde(rename = "name")]
     pub name: String,
-    /// Unique identifier of the underlying data store
+    /// Unique identifier of the underlying data store. *EXPERIMENTAL*
     #[serde(rename = "storage_id", skip_serializing_if = "Option::is_none")]
     pub storage_id: Option<String>,
     /// Filesystem URI to store the underlying data in (e.g. \"s3://my-bucket/some/path/\")
diff --git a/docs/assets/js/swagger.yml b/docs/assets/js/swagger.yml
index 039303747f9..ebe89ca37a1 100644
--- a/docs/assets/js/swagger.yml
+++ b/docs/assets/js/swagger.yml
@@ -186,7 +186,7 @@ components:
           type: string
         storage_id:
           type: string
-          description: Unique identifier of the underlying data store
+          description: Unique identifier of the underlying data store. *EXPERIMENTAL*
         storage_namespace:
           type: string
           description: Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")
@@ -269,7 +269,7 @@ components:
           pattern: "^[a-z0-9][a-z0-9-]{2,62}$"
         storage_id:
           type: string
-          description: Unique identifier of the underlying data store
+          description: Unique identifier of the underlying data store. *EXPERIMENTAL*
         storage_namespace:
           type: string
           description: 'Filesystem URI to store the underlying data in (e.g. "s3://my-bucket/some/path/")'