diff --git a/client/.eslintrc.json b/client/.eslintrc.json
index a2a9b3488b..63589f5eea 100644
--- a/client/.eslintrc.json
+++ b/client/.eslintrc.json
@@ -212,6 +212,7 @@
           "onloadend",
           "onopen",
           "openapi",
+          "openbis",
           "papermill",
           "pathname",
           "pdfjs",
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
index c2d877e42b..758f2bfacd 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
@@ -32,8 +32,8 @@ import {
 import KeywordBadge from "~/components/keywords/KeywordBadge";
 import KeywordContainer from "~/components/keywords/KeywordContainer";
 import ChevronFlippedIcon from "../../../../components/icons/ChevronFlippedIcon";
-import { WarnAlert } from "../../../../components/Alert";
 import { Loader } from "../../../../components/Loader";
+import { InfoAlert, WarnAlert } from "../../../../components/Alert";
 import useAppDispatch from "../../../../utils/customHooks/useAppDispatch.hook";
 import useAppSelector from "../../../../utils/customHooks/useAppSelector.hook";
 import { slugFromTitle } from "../../../../utils/helpers/HelperFunctions";
@@ -49,7 +49,10 @@ import type {
   AddCloudStorageState,
   CloudStorageDetails,
 } from "../../../project/components/cloudStorage/projectCloudStorage.types";
-import { getSchemaOptions } from "../../../project/utils/projectCloudStorage.utils";
+import {
+  getSchema,
+  getSchemaOptions,
+} from "../../../project/utils/projectCloudStorage.utils";
 import type { Project } from "../../../projectsV2/api/projectV2.api";
 import { ProjectNamespaceControl } from "../../../projectsV2/fields/ProjectNamespaceFormField";
 import SlugPreviewFormField from "../../../projectsV2/fields/SlugPreviewFormField";
@@ -294,16 +297,19 @@ export function DataConnectorMount({
   const { validationResult } = useAppSelector(
     (state) => state.dataConnectorFormSlice
   );
-  const options = getSchemaOptions(
+  const schema = getSchema(schemata, flatDataConnector.schema);
+  const schemaOptions = getSchemaOptions(
     schemata,
     true,
     flatDataConnector.schema,
     flatDataConnector.provider
   );
   const secretFields =
-    options == null
+    schemaOptions == null
       ? []
-      : Object.values(options).filter((o) => o && o.convertedType === "secret");
+      : Object.values(schemaOptions).filter(
+          (o) => o && o.convertedType === "secret"
+        );
   const hasPasswordFieldWithInput = secretFields.some(
     (o) => flatDataConnector.options && flatDataConnector.options[o.name]
   );
@@ -514,6 +520,7 @@ export function DataConnectorMount({
                       field.onChange(e);
                       onFieldValueChange("readOnly", !!e.target.value);
                     }}
+                    disabled={schema?.forceReadOnly ?? false}
                   />
                   <Label
                     for="data-connector-readonly-true"
@@ -535,6 +542,7 @@ export function DataConnectorMount({
                       field.onChange(e);
                       onFieldValueChange("readOnly", false);
                     }}
+                    disabled={schema?.forceReadOnly ?? false}
                   />
                   <Label
                     for="data-connector-readonly-false"
@@ -548,16 +556,26 @@ export function DataConnectorMount({
             )}
             rules={{ required: true }}
           />
-          {!flatDataConnector.readOnly && (
+          {schema?.forceReadOnly ? (
             <div className="mt-1">
-              <WarnAlert dismissible={false}>
+              <InfoAlert dismissible={false} timeout={0}>
                 <p className="mb-0">
-                  You are mounting this storage in read-write mode. If you have
-                  read-only access, please select &quot;Read Only&quot; to
-                  prevent errors with some storage types.
+                  This cloud storage only supports read-only access.
                 </p>
-              </WarnAlert>
+              </InfoAlert>
             </div>
+          ) : (
+            !flatDataConnector.readOnly && (
+              <div className="mt-1">
+                <WarnAlert dismissible={false}>
+                  <p className="mb-0">
+                    You are mounting this storage in read-write mode. If you
+                    have read-only access, please select &quot;Read Only&quot;
+                    to prevent errors with some storage types.
+                  </p>
+                </WarnAlert>
+              </div>
+            )
           )}
           <div className={cx("form-text", "text-muted")}>
             Select &quot;Read Only&quot; to mount the storage without write
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalFooter.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalFooter.tsx
index 0ad57d3d75..ba789e3419 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalFooter.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalFooter.tsx
@@ -34,6 +34,7 @@ import {
 
 import {
   findSensitive,
+  getSchemaOptions,
   hasProviderShortlist,
 } from "../../../project/utils/projectCloudStorage.utils";
 
@@ -307,10 +308,32 @@ function DataConnectorCreateFooter({
   ]);
 
   // Visual elements
-  const disableContinueButton =
-    cloudStorageState.step === 1 &&
-    (!flatDataConnector.schema ||
-      (schemaRequiresProvider && !flatDataConnector.provider));
+  const disableContinueButton = useMemo(() => {
+    return (
+      (cloudStorageState.step === 1 &&
+        (!flatDataConnector.schema ||
+          (schemaRequiresProvider && !flatDataConnector.provider))) ||
+      (cloudStorageState.step === 2 &&
+        !getSchemaOptions(
+          schemata,
+          true,
+          flatDataConnector.schema,
+          flatDataConnector.provider
+        )?.every((o) => {
+          return (
+            !o.required ||
+            (flatDataConnector.options && flatDataConnector.options[o.name])
+          );
+        }))
+    );
+  }, [
+    cloudStorageState.step,
+    flatDataConnector.schema,
+    schemaRequiresProvider,
+    flatDataConnector.provider,
+    schemata,
+    flatDataConnector.options,
+  ]);
 
   const isAddResultLoading = createResult.isLoading;
   const actionError = createResult.error;
@@ -490,10 +513,32 @@ function DataConnectorEditFooter({
   }, [dispatch, updateResult]);
 
   // Visual elements
-  const disableContinueButton =
-    cloudStorageState.step === 1 &&
-    (!flatDataConnector.schema ||
-      (schemaRequiresProvider && !flatDataConnector.provider));
+  const disableContinueButton = useMemo(() => {
+    return (
+      (cloudStorageState.step === 1 &&
+        (!flatDataConnector.schema ||
+          (schemaRequiresProvider && !flatDataConnector.provider))) ||
+      (cloudStorageState.step === 2 &&
+        !getSchemaOptions(
+          schemata,
+          true,
+          flatDataConnector.schema,
+          flatDataConnector.provider
+        )?.every((o) => {
+          return (
+            !o.required ||
+            (flatDataConnector.options && flatDataConnector.options[o.name])
+          );
+        }))
+    );
+  }, [
+    cloudStorageState.step,
+    flatDataConnector.schema,
+    schemaRequiresProvider,
+    flatDataConnector.provider,
+    schemata,
+    flatDataConnector.options,
+  ]);
 
   const isModifyResultLoading = updateResult.isLoading;
   const actionError = updateResult.error;
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal/dataConnectorModalButtons.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal/dataConnectorModalButtons.tsx
index 6e26050e6e..8f0eca59ce 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorModal/dataConnectorModalButtons.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModal/dataConnectorModalButtons.tsx
@@ -176,6 +176,7 @@ export function DataConnectorModalContinueButton({
           continueId="add-data-connector-continue"
           step={cloudStorageState.step}
           testId="test-data-connector"
+          disableContinueButton={disableContinueButton}
           editDataConnector={addOrEditStorage}
         />
         {disableContinueButton && (
@@ -183,11 +184,7 @@ export function DataConnectorModalContinueButton({
             placement="top"
             target={`${continueButtonId}-div`}
           >
-            {!flatDataConnector.schema
-              ? "Please select a storage type"
-              : selectedSchemaHasAccessMode
-              ? "Please select a mode or change storage type"
-              : "Please select a provider or change storage type"}
+            Please fill out all fields labeled as required
           </UncontrolledTooltip>
         )}
       </div>
@@ -211,10 +208,19 @@ export function DataConnectorModalContinueButton({
             id="add-data-connector-continue-button"
             data-cy="add-data-connector-continue-button"
             className={cx("btn-primary")}
+            disabled={disableContinueButton}
             onClick={addOrEditStorage}
           >
             <PencilSquare className={cx("bi", "me-1")} /> Update connector
           </Button>
+          {disableContinueButton && (
+            <UncontrolledTooltip
+              placement="top"
+              target="add-data-connector-continue-div"
+            >
+              Please fill out all fields labeled as required
+            </UncontrolledTooltip>
+          )}
         </div>
       </div>
     );
@@ -294,12 +300,14 @@ interface TestConnectionAndContinueButtonsProps
   continueId: string;
   step: number;
   testId: string;
+  disableContinueButton: boolean;
   editDataConnector?: () => void;
 }
 function TestConnectionAndContinueButtons({
   continueId,
   step,
   testId,
+  disableContinueButton,
   editDataConnector,
 }: TestConnectionAndContinueButtonsProps) {
   const dispatch = useAppDispatch();
@@ -395,7 +403,7 @@ function TestConnectionAndContinueButtons({
         color={testConnectionColor}
         id={buttonTestId}
         data-cy={buttonTestId}
-        disabled={validationResult.isLoading}
+        disabled={disableContinueButton || validationResult.isLoading}
         onClick={() => validateConnection()}
       >
         {testConnectionContent}
diff --git a/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx b/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
index 822221ab8f..1af2a51e14 100644
--- a/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
+++ b/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
@@ -34,6 +34,7 @@ import {
 } from "react-bootstrap-icons";
 import { Control, Controller, FieldValues, useForm } from "react-hook-form";
 import {
+  Badge,
   Button,
   Input,
   InputGroup,
@@ -43,13 +44,14 @@ import {
   UncontrolledTooltip,
 } from "reactstrap";
 
-import { WarnAlert } from "../../../../components/Alert";
+import { InfoAlert, WarnAlert } from "../../../../components/Alert";
 import { ExternalLink } from "../../../../components/ExternalLinks";
 import useAppSelector from "../../../../utils/customHooks/useAppSelector.hook";
 import type { DataConnectorSecret } from "../../../dataConnectorsV2/api/data-connectors.api";
 import { hasSchemaAccessMode } from "../../../dataConnectorsV2/components/dataConnector.utils";
 import {
   convertFromAdvancedConfig,
+  getSchema,
   getSchemaOptions,
   getSchemaProviders,
   getSchemaStorage,
@@ -192,8 +194,8 @@ interface AddStorageAdvancedForm {
   configuration: string;
 }
 export function AddStorageAdvanced({
-  storage,
   setStorage,
+  storage,
 }: AddStorageStepProps) {
   const {
     control,
@@ -231,6 +233,9 @@ export function AddStorageAdvanced({
   return (
     <form className="form-rk-green" data-cy="cloud-storage-edit-advanced">
       <div className="mb-3">
+        <Label className="form-label" for="sourcePath">
+          {sourcePathHelp.label}
+        </Label>
         <Controller
           name="sourcePath"
           control={control}
@@ -249,9 +254,6 @@ export function AddStorageAdvanced({
             />
           )}
         />
-        <Label className="form-label" for="sourcePath">
-          Source path
-        </Label>
         <div className={cx("form-text", "text-muted")}>
           {sourcePathHelp.help}
         </div>
@@ -400,6 +402,14 @@ function CheckboxOptionItem({
   );
 }
 
+function BadgeRequired() {
+  return (
+    <Badge className={cx("rounded-pill", "ms-1")} color="secondary">
+      required
+    </Badge>
+  );
+}
+
 interface PasswordOptionItemProps {
   control: Control<FieldValues, any>; // eslint-disable-line @typescript-eslint/no-explicit-any
   defaultValue: string | undefined;
@@ -434,7 +444,7 @@ function PasswordOptionItem({
   const tooltipContainerId = `option-is-secret-${option.name}`;
   return (
     <>
-      <label htmlFor={option.name}>
+      <Label htmlFor={option.name}>
         {option.friendlyName ?? option.name}{" "}
         <div id={tooltipContainerId} className="d-inline">
           <KeyFill className={cx("bi", "ms-1")} />
@@ -442,6 +452,7 @@ function PasswordOptionItem({
             className={cx("bi", "ms-1", "text-warning")}
           />
         </div>
+        {option.required && <BadgeRequired />}
         <UncontrolledTooltip placement="top" target={tooltipContainerId}>
           {isV2 ? (
             <span>
@@ -458,7 +469,7 @@ function PasswordOptionItem({
             </span>
           )}
         </UncontrolledTooltip>
-      </label>
+      </Label>
 
       <InputGroup>
         <Controller
@@ -582,8 +593,10 @@ function InputOptionItem({
       : option.friendlyName ?? option.name;
   return (
     <>
-      <label htmlFor={option.name}>{inputName}</label>
-
+      <Label htmlFor={option.name}>
+        {inputName}
+        {option.required && <BadgeRequired />}
+      </Label>
       <Controller
         name={option.name}
         control={control}
@@ -1010,6 +1023,26 @@ export function AddStorageOptions({
     storage.schema ?? ""
   );
 
+  const moreOptionsThanInTheShortList = useMemo(() => {
+    const allOptions = getSchemaOptions(
+      schema,
+      false,
+      storage.schema,
+      storage.provider
+    );
+    const shortListOptions = getSchemaOptions(
+      schema,
+      true,
+      storage.schema,
+      storage.provider
+    );
+    return (
+      allOptions &&
+      shortListOptions &&
+      allOptions.length > shortListOptions.length
+    );
+  }, [schema, storage.schema, storage.provider]);
+
   return (
     <form className="form-rk-green" data-cy="cloud-storage-edit-options">
       {!dataConnectorId && <h5 className="fw-bold">Connection information</h5>}
@@ -1020,7 +1053,7 @@ export function AddStorageOptions({
       {!hasAccessMode && sourcePath}
       {optionItems}
       {hasAccessMode && sourcePath}
-      {advancedOptions}
+      {moreOptionsThanInTheShortList && advancedOptions}
     </form>
   );
 }
@@ -1101,6 +1134,17 @@ export function AddStorageMount({
     (o) => storage.options && storage.options[o.name]
   );
 
+  const selectedSchema = getSchema(
+    useMemo(
+      () => getSchemaStorage(schema, !state.showAllSchema, storage.schema),
+      [schema, state.showAllSchema, storage.schema]
+    ),
+    storage.schema
+  );
+  if (selectedSchema?.forceReadOnly) {
+    storage.readOnly = true;
+  }
+
   return (
     <form className="form-rk-green" data-cy="cloud-storage-edit-mount">
       <h5>Final details</h5>
@@ -1199,20 +1243,31 @@ export function AddStorageMount({
               }}
               value=""
               checked={storage.readOnly ?? false}
+              readOnly={selectedSchema?.forceReadOnly ?? false}
             />
           )}
           rules={{ required: true }}
         />
-        {!storage.readOnly && (
+        {selectedSchema?.forceReadOnly ? (
           <div className="mt-1">
-            <WarnAlert dismissible={false}>
+            <InfoAlert dismissible={false} timeout={0}>
               <p className="mb-0">
-                You are mounting this storage in read-write mode. If you have
-                read-only access, please check the box to prevent errors with
-                some storage types.
+                This cloud storage only supports read-only access.
               </p>
-            </WarnAlert>
+            </InfoAlert>
           </div>
+        ) : (
+          !storage.readOnly && (
+            <div className="mt-1">
+              <WarnAlert dismissible={false}>
+                <p className="mb-0">
+                  You are mounting this storage in read-write mode. If you have
+                  read-only access, please check the box to prevent errors with
+                  some storage types.
+                </p>
+              </WarnAlert>
+            </div>
+          )
         )}
         <div className={cx("form-text", "text-muted")}>
           Check this box to mount the storage in read-only mode. You should
diff --git a/client/src/features/project/components/cloudStorage/CloudStorageModal.tsx b/client/src/features/project/components/cloudStorage/CloudStorageModal.tsx
index 76cc75bcf2..464a7d125a 100644
--- a/client/src/features/project/components/cloudStorage/CloudStorageModal.tsx
+++ b/client/src/features/project/components/cloudStorage/CloudStorageModal.tsx
@@ -28,6 +28,7 @@ import ScrollableModal from "../../../../components/modal/ScrollableModal";
 import {
   findSensitive,
   getCurrentStorageDetails,
+  getSchemaOptions,
   getSchemaProviders,
   hasProviderShortlist,
 } from "../../utils/projectCloudStorage.utils";
@@ -336,10 +337,28 @@ export default function CloudStorageModal({
   );
 
   // Visual elements
-  const disableContinueButton =
-    state.step === 1 &&
-    (!storageDetails.schema ||
-      (schemaRequiresProvider && !storageDetails.provider));
+  const disableContinueButton = useMemo(() => {
+    return (
+      (state.step === 1 &&
+        (!storageDetails.schema ||
+          (schemaRequiresProvider && !storageDetails.provider))) ||
+      (state.step === 2 &&
+        !(
+          schema &&
+          getSchemaOptions(
+            schema,
+            true,
+            storageDetails.schema,
+            storageDetails.provider
+          )?.every((o) => {
+            return (
+              !o.required ||
+              (storageDetails.options && storageDetails.options[o.name])
+            );
+          })
+        ))
+    );
+  }, [state.step, storageDetails, schemaRequiresProvider, schema]);
 
   const isAddResultLoading = addResult.isLoading;
   const isModifyResultLoading = modifyResult.isLoading;
@@ -399,6 +418,7 @@ export default function CloudStorageModal({
           storageId={storageId}
           success={success}
           validationSucceeded={validationSucceeded}
+          disableContinueButton={disableContinueButton}
           projectId={projectId}
         />
       </ModalBody>
diff --git a/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx b/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx
index 4c1b4d5604..f2b1a5b565 100644
--- a/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx
+++ b/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx
@@ -109,6 +109,7 @@ export interface AddCloudStorageBodyContentProps
   storageDetails: CloudStorageDetails;
   success: boolean;
   validationSucceeded: boolean;
+  disableContinueButton: boolean;
   projectId?: string;
 }
 export function AddCloudStorageBodyContent({
@@ -241,15 +242,14 @@ export function AddCloudStorageContinueButton({
           testIsFailure={validationResult.isError}
           testIsOngoing={validationResult.isLoading}
           testIsSuccess={validationResult.isSuccess}
+          disableContinueButton={disableContinueButton}
         />
         {disableContinueButton && (
           <UncontrolledTooltip
             placement="top"
             target={`${continueButtonId}-div`}
           >
-            {!storageDetails.schema
-              ? "Please select a storage type"
-              : "Please select a provider or change storage type"}
+            Please fill out all fields labeled as required
           </UncontrolledTooltip>
         )}
       </div>
@@ -398,6 +398,7 @@ interface TestConnectionAndContinueButtonsProps {
   testIsFailure: boolean;
   testIsOngoing: boolean;
   testIsSuccess: boolean;
+  disableContinueButton: boolean;
 }
 function TestConnectionAndContinueButtons({
   actionState,
@@ -410,6 +411,7 @@ function TestConnectionAndContinueButtons({
   testIsFailure,
   testIsOngoing,
   testIsSuccess,
+  disableContinueButton,
 }: TestConnectionAndContinueButtonsProps) {
   const buttonTestId = `${testId}-button`;
   const divTestId = `${testId}-div`;
@@ -438,7 +440,7 @@ function TestConnectionAndContinueButtons({
         color={testConnectionColor}
         id={buttonTestId}
         data-cy={buttonTestId}
-        disabled={testIsOngoing}
+        disabled={disableContinueButton || testIsOngoing}
         onClick={() => actionTest()}
       >
         {testConnectionContent}
diff --git a/client/src/features/project/components/cloudStorage/projectCloudStorage.constants.ts b/client/src/features/project/components/cloudStorage/projectCloudStorage.constants.ts
index 835c715cd3..2dccb52237 100644
--- a/client/src/features/project/components/cloudStorage/projectCloudStorage.constants.ts
+++ b/client/src/features/project/components/cloudStorage/projectCloudStorage.constants.ts
@@ -74,6 +74,11 @@ export const CLOUD_STORAGE_OVERRIDE = {
       description: "Cloud storage service for the Swiss university community",
       position: 4,
     },
+    openbis: {
+      name: "openBIS",
+      forceReadOnly: true,
+      position: 6,
+    },
   } as Record<string, Partial<CloudStorageOverride>>,
 };
 
@@ -223,12 +228,12 @@ export const CLOUD_STORAGE_MOUNT_PATH_HELP = {
   polybox: {
     help: "Specify a path to a sub folder to connect to. When left blank, the connection will be made to the default (root) folder.",
     placeholder: "'/' or 'optional-sub-folder(s)/'",
-    label: "Sub path (optional)",
+    label: "Sub path",
   },
   switchDrive: {
     help: "Specify a path to a sub folder to connect to. When left blank, the connection will be made to the default (root) folder.",
     placeholder: "'/' or 'optional-sub-folder(s)/'",
-    label: "Sub path (optional)",
+    label: "Sub path",
   },
   generic: {
     help:
@@ -246,6 +251,7 @@ export const CLOUD_STORAGE_SCHEMA_SHORTLIST = [
   "webdav",
   "azureblob",
   "sftp",
+  "openbis",
 ];
 
 export const CLOUD_STORAGE_PROVIDERS_SHORTLIST = {
diff --git a/client/src/features/project/components/cloudStorage/projectCloudStorage.types.ts b/client/src/features/project/components/cloudStorage/projectCloudStorage.types.ts
index 684ebd9b99..e3a96fb6f5 100644
--- a/client/src/features/project/components/cloudStorage/projectCloudStorage.types.ts
+++ b/client/src/features/project/components/cloudStorage/projectCloudStorage.types.ts
@@ -63,6 +63,7 @@ export interface CloudStorageSchemaOption extends RCloneOption {
 export interface CloudStorageSchema extends RCloneEntry {
   hide?: boolean;
   position?: number;
+  forceReadOnly?: boolean; // ? Forces read-only access e.g. for storage that do not support write access
   options: CloudStorageSchemaOption[];
 }
 
diff --git a/client/src/features/project/utils/projectCloudStorage.utils.ts b/client/src/features/project/utils/projectCloudStorage.utils.ts
index e165fc58a7..7b4e71410d 100644
--- a/client/src/features/project/utils/projectCloudStorage.utils.ts
+++ b/client/src/features/project/utils/projectCloudStorage.utils.ts
@@ -155,6 +155,7 @@ export function getSchemaStorage(
             name: override.name ?? element.name,
             description: override.description ?? element.description,
             position: override.position ?? element.position,
+            forceReadOnly: override.forceReadOnly ?? element.forceReadOnly,
           });
         }
       } else {
@@ -240,6 +241,22 @@ export function hasProviderShortlist(targetProvider?: string): boolean {
   return false;
 }
 
+export function getSchema(schema: CloudStorageSchema[], targetSchema?: string) {
+  if (!targetSchema) return;
+  const currentSchema = schema.find((s) => s.prefix === targetSchema);
+  const override = CLOUD_STORAGE_OVERRIDE.storage[targetSchema];
+  if (currentSchema && !override.hide) {
+    return {
+      ...currentSchema,
+      name: override.name ?? currentSchema.name,
+      description: override.description ?? currentSchema.description,
+      position: override.position ?? currentSchema.position,
+      forceReadOnly: override.forceReadOnly ?? currentSchema.forceReadOnly,
+    };
+  }
+  return currentSchema;
+}
+
 export function getSchemaOptions(
   schema: CloudStorageSchema[],
   shortList = false,
@@ -248,7 +265,7 @@ export function getSchemaOptions(
   flags = { override: true, convertType: true, filterHidden: true }
 ): CloudStorageSchemaOption[] | undefined {
   if (!targetSchema) return;
-  const storage = schema.find((s) => s.prefix === targetSchema);
+  const storage = getSchema(schema, targetSchema);
   if (!storage) return;
 
   const optionsOverridden = flags.override
diff --git a/tests/cypress/e2e/projectSettings.spec.ts b/tests/cypress/e2e/projectSettings.spec.ts
index 0bfcc35ba8..e9412d536d 100644
--- a/tests/cypress/e2e/projectSettings.spec.ts
+++ b/tests/cypress/e2e/projectSettings.spec.ts
@@ -288,7 +288,8 @@ describe("Cloud storage settings page", () => {
   });
 
   it("can update an existing storage", () => {
-    fixtures.versions().cloudStorageStar().testCloudStorage();
+    fixtures.getStorageSchema();
+    fixtures.versions().cloudStorage().testCloudStorage();
     fixtures.patchCloudStorage();
     cy.visit("/projects/e2e/local-test-project/settings/storage");
     cy.wait("@getNotebooksVersions");
@@ -419,7 +420,10 @@ describe("Cloud storage settings page", () => {
       .click();
     cy.getDataCy("cloud-storage-edit-next-button").should("be.visible").click();
 
+    cy.getDataCy("test-cloud-storage-button").should("be.disabled");
     cy.get("#sourcePath").should("have.value", "").type("bucket/my-source");
+    cy.getDataCy("test-cloud-storage-button").should("be.disabled");
+    cy.get("#url").type("https://example.com"); // Because this field is required.
     cy.getDataCy("test-cloud-storage-button").should("be.visible").click();
     cy.getDataCy("add-cloud-storage-continue-button")
       .should("be.visible")
diff --git a/tests/cypress/fixtures/cloudStorage/storage-schema-s3.json b/tests/cypress/fixtures/cloudStorage/storage-schema-s3.json
index c318e72538..0d3411fa79 100644
--- a/tests/cypress/fixtures/cloudStorage/storage-schema-s3.json
+++ b/tests/cypress/fixtures/cloudStorage/storage-schema-s3.json
@@ -4281,7 +4281,7 @@
         ],
         "short_opt": "",
         "hide": 0,
-        "required": true,
+        "required": false,
         "is_password": false,
         "no_prefix": false,
         "advanced": false,
@@ -4522,6 +4522,55 @@
         "exclusive": false,
         "type": "string"
       }
-    ]
+    ],
+    "command_help": null,
+    "aliases": null,
+    "hide": false,
+    "metadata_info": null
+  },
+  {
+    "name": "openbis",
+    "description": "openBIS",
+    "prefix": "openbis",
+    "options": [
+      {
+        "name": "host",
+        "help": "openBIS host to connect to.\n\nE.g. \"openbis-eln-lims.ethz.ch\".",
+        "provider": "",
+        "default": "",
+        "short_opt": "",
+        "hide": 0,
+        "required": true,
+        "is_password": false,
+        "no_prefix": false,
+        "advanced": false,
+        "exclusive": false,
+        "sensitive": false,
+        "default_str": "",
+        "value_str": "",
+        "type": "string"
+      },
+      {
+        "name": "session_token",
+        "help": "openBIS session token",
+        "provider": "",
+        "default": "",
+        "short_opt": "",
+        "hide": 0,
+        "required": true,
+        "is_password": true,
+        "no_prefix": false,
+        "advanced": false,
+        "exclusive": false,
+        "sensitive": true,
+        "default_str": "",
+        "value_str": "",
+        "type": "string"
+      }
+    ],
+    "command_help": null,
+    "aliases": null,
+    "hide": false,
+    "metadata_info": null
   }
 ]
diff --git a/tests/cypress/fixtures/cloudStorage/storage-schema.json b/tests/cypress/fixtures/cloudStorage/storage-schema.json
index e257ec3e77..9b91f52779 100644
--- a/tests/cypress/fixtures/cloudStorage/storage-schema.json
+++ b/tests/cypress/fixtures/cloudStorage/storage-schema.json
@@ -4281,7 +4281,7 @@
         ],
         "short_opt": "",
         "hide": 0,
-        "required": true,
+        "required": false,
         "is_password": false,
         "no_prefix": false,
         "advanced": false,
@@ -4447,7 +4447,7 @@
         "examples": null,
         "short_opt": "",
         "hide": 0,
-        "required": true,
+        "required": false,
         "is_password": false,
         "no_prefix": false,
         "advanced": false,
@@ -4671,7 +4671,7 @@
         "examples": null,
         "short_opt": "",
         "hide": 0,
-        "required": true,
+        "required": false,
         "is_password": false,
         "no_prefix": false,
         "advanced": false,
@@ -5064,5 +5064,50 @@
     "aliases": null,
     "hide": false,
     "metadata_info": null
+  },
+  {
+    "name": "openbis",
+    "description": "openBIS",
+    "prefix": "openbis",
+    "options": [
+      {
+        "name": "host",
+        "help": "openBIS host to connect to.\n\nE.g. \"openbis-eln-lims.ethz.ch\".",
+        "provider": "",
+        "default": "",
+        "short_opt": "",
+        "hide": 0,
+        "required": true,
+        "is_password": false,
+        "no_prefix": false,
+        "advanced": false,
+        "exclusive": false,
+        "sensitive": false,
+        "default_str": "",
+        "value_str": "",
+        "type": "string"
+      },
+      {
+        "name": "session_token",
+        "help": "openBIS session token",
+        "provider": "",
+        "default": "",
+        "short_opt": "",
+        "hide": 0,
+        "required": false,
+        "is_password": true,
+        "no_prefix": false,
+        "advanced": false,
+        "exclusive": false,
+        "sensitive": true,
+        "default_str": "",
+        "value_str": "",
+        "type": "string"
+      }
+    ],
+    "command_help": null,
+    "aliases": null,
+    "hide": false,
+    "metadata_info": null
   }
 ]
diff --git a/tests/cypress/fixtures/dataConnector/data-connector.json b/tests/cypress/fixtures/dataConnector/data-connector.json
index 5398bd2081..7d80423ee8 100644
--- a/tests/cypress/fixtures/dataConnector/data-connector.json
+++ b/tests/cypress/fixtures/dataConnector/data-connector.json
@@ -44,5 +44,40 @@
     "created_by": { "id": "user1-uuid" },
     "visibility": "public",
     "description": "Example storage description"
+  },
+  {
+    "id": "ULID-2",
+    "name": "openbis",
+    "namespace": "user1-uuid",
+    "slug": "openbis",
+    "storage": {
+      "storage_type": "openbis",
+      "configuration": {
+        "host": "openbis-eln-lims.ethz.ch",
+        "type": "openbis",
+        "session_token": "<sensitive>"
+      },
+      "source_path": "/",
+      "target_path": "external_storage/openbis",
+      "readonly": true,
+      "sensitive_fields": [
+        {
+          "name": "session_token",
+          "help": "openBIS session token",
+          "provider": "",
+          "default": "",
+          "default_str": "",
+          "required": true,
+          "sensitive": true,
+          "advanced": false,
+          "exclusive": false,
+          "type": "string"
+        }
+      ]
+    },
+    "creation_date": "2023-11-15T09:55:59Z",
+    "created_by": { "id": "user1-uuid" },
+    "visibility": "private",
+    "description": "openBIS storage description"
   }
 ]
diff --git a/tests/cypress/support/renkulab-fixtures/cloudStorage.ts b/tests/cypress/support/renkulab-fixtures/cloudStorage.ts
index bf5958dea3..d5cbb33b0e 100644
--- a/tests/cypress/support/renkulab-fixtures/cloudStorage.ts
+++ b/tests/cypress/support/renkulab-fixtures/cloudStorage.ts
@@ -77,16 +77,6 @@ export function CloudStorage<T extends FixturesConstructor>(Parent: T) {
       return this;
     }
 
-    cloudStorageStar(args?: SimpleFixture) {
-      const {
-        fixture = "cloudStorage/cloud-storage.json",
-        name = "getCloudStorage",
-      } = args ?? {};
-      const response = { fixture };
-      cy.intercept("GET", "/api/data/storage*", response).as(name);
-      return this;
-    }
-
     cloudStorageSPecific(args?: SimpleFixture) {
       const {
         fixture = "cloudStorage/cloud-storage.json",