diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index c66cb4c0675d..ddd0be915265 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -1269,6 +1269,22 @@ export interface paths {
          */
         delete: operations["delete_user_notification_api_notifications__notification_id__delete"];
     };
+    "/api/object_store_instances": {
+        /** Get a list of persisted object store instances defined by the requesting user. */
+        get: operations["object_stores__instances_index"];
+        /** Create a user-bound object store. */
+        post: operations["object_stores__create_instance"];
+    };
+    "/api/object_store_instances/{user_object_store_id}": {
+        /** Get a list of persisted object store instances defined by the requesting user. */
+        get: operations["object_stores__instances_get"];
+        /** Update or upgrade user object store instance. */
+        put: operations["object_stores__instances_update"];
+    };
+    "/api/object_store_templates": {
+        /** Get a list of object store templates available to build user defined object stores from */
+        get: operations["object_stores__templates_index"];
+    };
     "/api/object_stores": {
         /** Get a list of (currently only concrete) object stores configured with this Galaxy instance. */
         get: operations["index_api_object_stores_get"];
@@ -2393,7 +2409,7 @@ export interface components {
                       | "more_stable"
                       | "less_stable"
                   )
-                | ("cloud" | "quota" | "no_quota" | "restricted");
+                | ("cloud" | "quota" | "no_quota" | "restricted" | "user_defined");
         };
         /** BasicRoleModel */
         BasicRoleModel: {
@@ -3076,6 +3092,25 @@ export interface components {
             /** Store Dict */
             store_dict?: Record<string, never> | null;
         };
+        /** CreateInstancePayload */
+        CreateInstancePayload: {
+            /** Description */
+            description?: string | null;
+            /** Name */
+            name: string;
+            /** Secrets */
+            secrets: {
+                [key: string]: string | undefined;
+            };
+            /** Template Id */
+            template_id: string;
+            /** Template Version */
+            template_version: number;
+            /** Variables */
+            variables: {
+                [key: string]: (string | boolean | number) | undefined;
+            };
+        };
         /** CreateInvocationsFromStorePayload */
         CreateInvocationsFromStorePayload: {
             /**
@@ -8906,6 +8941,57 @@ export interface components {
              */
             up_to_date: boolean;
         };
+        /** ObjectStoreTemplateSecret */
+        ObjectStoreTemplateSecret: {
+            /** Help */
+            help: string | null;
+            /** Name */
+            name: string;
+        };
+        /** ObjectStoreTemplateSummaries */
+        ObjectStoreTemplateSummaries: components["schemas"]["ObjectStoreTemplateSummary"][];
+        /** ObjectStoreTemplateSummary */
+        ObjectStoreTemplateSummary: {
+            /** Badges */
+            badges: components["schemas"]["BadgeDict"][];
+            /** Description */
+            description: string | null;
+            /**
+             * Hidden
+             * @default false
+             */
+            hidden?: boolean;
+            /** Id */
+            id: string;
+            /** Name */
+            name: string | null;
+            /** Secrets */
+            secrets?: components["schemas"]["ObjectStoreTemplateSecret"][] | null;
+            /**
+             * Type
+             * @enum {string}
+             */
+            type: "s3" | "azure_blob" | "disk" | "generic_s3";
+            /** Variables */
+            variables?: components["schemas"]["ObjectStoreTemplateVariable"][] | null;
+            /**
+             * Version
+             * @default 0
+             */
+            version?: number;
+        };
+        /** ObjectStoreTemplateVariable */
+        ObjectStoreTemplateVariable: {
+            /** Help */
+            help: string | null;
+            /** Name */
+            name: string;
+            /**
+             * Type
+             * @enum {string}
+             */
+            type: "string" | "boolean" | "integer";
+        };
         /** Organization */
         Organization: {
             /**
@@ -10571,6 +10657,24 @@ export interface components {
             visible?: boolean | null;
             [key: string]: unknown | undefined;
         };
+        /** UpdateInstancePayload */
+        UpdateInstancePayload: {
+            /** Description */
+            description?: string | null;
+            /** Name */
+            name?: string | null;
+            /** Variables */
+            variables: {
+                [key: string]: (string | boolean | number) | undefined;
+            } | null;
+        };
+        /** UpdateInstanceSecretPayload */
+        UpdateInstanceSecretPayload: {
+            /** Secret Name */
+            secret_name: string;
+            /** Secret Value */
+            secret_value: string;
+        };
         /** UpdateLibraryFolderPayload */
         UpdateLibraryFolderPayload: {
             /**
@@ -10662,6 +10766,19 @@ export interface components {
                 [key: string]: components["schemas"]["NotificationCategorySettings"] | undefined;
             };
         };
+        /** UpgradeInstancePayload */
+        UpgradeInstancePayload: {
+            /** Secrets */
+            secrets: {
+                [key: string]: string | undefined;
+            };
+            /** Template Version */
+            template_version: number;
+            /** Variables */
+            variables: {
+                [key: string]: (string | boolean | number) | undefined;
+            };
+        };
         /** UrlDataElement */
         UrlDataElement: {
             /** Md5 */
@@ -10730,6 +10847,39 @@ export interface components {
              */
             enabled: boolean;
         };
+        /** UserConcreteObjectStoreModel */
+        UserConcreteObjectStoreModel: {
+            /** Badges */
+            badges: components["schemas"]["BadgeDict"][];
+            /** Description */
+            description?: string | null;
+            /** Device */
+            device?: string | null;
+            /** Id */
+            id: number;
+            /** Name */
+            name?: string | null;
+            /** Object Store Id */
+            object_store_id?: string | null;
+            /** Private */
+            private: boolean;
+            quota: components["schemas"]["QuotaModel"];
+            /** Secrets */
+            secrets: string[];
+            /** Template Id */
+            template_id: string;
+            /** Template Version */
+            template_version: number;
+            /**
+             * Type
+             * @enum {string}
+             */
+            type: "s3" | "azure_blob" | "disk" | "generic_s3";
+            /** Variables */
+            variables: {
+                [key: string]: (string | boolean | number) | undefined;
+            } | null;
+        };
         /** UserCreationPayload */
         UserCreationPayload: {
             /**
@@ -18540,6 +18690,142 @@ export interface operations {
             };
         };
     };
+    object_stores__instances_index: {
+        /** Get a list of persisted object store instances defined by the requesting user. */
+        parameters?: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["UserConcreteObjectStoreModel"][];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    object_stores__create_instance: {
+        /** Create a user-bound object store. */
+        parameters?: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+        };
+        requestBody: {
+            content: {
+                "application/json": components["schemas"]["CreateInstancePayload"];
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["UserConcreteObjectStoreModel"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    object_stores__instances_get: {
+        /** Get a list of persisted object store instances defined by the requesting user. */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+            /** @description The model ID for a persisted UserObjectStore object. */
+            path: {
+                user_object_store_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["UserConcreteObjectStoreModel"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    object_stores__instances_update: {
+        /** Update or upgrade user object store instance. */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+            /** @description The model ID for a persisted UserObjectStore object. */
+            path: {
+                user_object_store_id: string;
+            };
+        };
+        requestBody: {
+            content: {
+                "application/json":
+                    | components["schemas"]["UpdateInstanceSecretPayload"]
+                    | components["schemas"]["UpgradeInstancePayload"]
+                    | components["schemas"]["UpdateInstancePayload"];
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["UserConcreteObjectStoreModel"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    object_stores__templates_index: {
+        /** Get a list of object store templates available to build user defined object stores from */
+        parameters?: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+        };
+        responses: {
+            /** @description A list of the configured object store templates. */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["ObjectStoreTemplateSummaries"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     index_api_object_stores_get: {
         /** Get a list of (currently only concrete) object stores configured with this Galaxy instance. */
         parameters?: {