diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal.tsx
index 4738ec206..6eb43bc50 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorModal.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModal.tsx
@@ -59,7 +59,6 @@ import {
 import {
   AddCloudStorageContinueButton,
   AddCloudStorageBackButton,
-  AddCloudStorageBodyContent,
   AddCloudStorageConnectionTestResult,
   AddCloudStorageHeaderContent,
 } from "../../project/components/cloudStorage/cloudStorageModalComponents";
@@ -72,6 +71,8 @@ import {
 
 import styles from "../../project/components/cloudStorage/CloudStorage.module.scss";
 
+import DataConnectorModalBody from "./DataConnectorModalBody";
+
 interface DataConnectorModalProps {
   currentStorage?:
     | CloudStorage
@@ -490,7 +491,7 @@ export default function DataConnectorModal({
       </ModalHeader>
 
       <ModalBody data-cy="cloud-storage-edit-body">
-        <AddCloudStorageBodyContent
+        <DataConnectorModalBody
           addResultStorageName={addResultStorageName}
           credentialSaveStatus={credentialSaveStatus}
           isV2={true}
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModalBody.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModalBody.tsx
new file mode 100644
index 000000000..c572402e5
--- /dev/null
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModalBody.tsx
@@ -0,0 +1,157 @@
+/*!
+ * Copyright 2024 - Swiss Data Science Center (SDSC)
+ * A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
+ * Eidgenössische Technische Hochschule Zürich (ETHZ).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import cx from "classnames";
+
+import { Loader } from "../../../components/Loader";
+import { RtkOrNotebooksError } from "../../../components/errors/RtkErrorAlert";
+
+import { CLOUD_STORAGE_TOTAL_STEPS } from "../../project/components/cloudStorage/projectCloudStorage.constants";
+import type {
+  AddCloudStorageState,
+  CloudStorageDetails,
+  CloudStorageSchema,
+} from "../../project/components/cloudStorage/projectCloudStorage.types";
+import {
+  AddCloudStorageSuccessAlert,
+  type AddCloudStorageBodyContentProps,
+} from "../../project/components/cloudStorage/cloudStorageModalComponents";
+import {
+  AddStorageAdvanced,
+  AddStorageAdvancedToggle,
+  AddStorageMount,
+  AddStorageOptions,
+  AddStorageType,
+} from "../../project/components/cloudStorage/AddOrEditCloudStorage";
+import type { CloudStorageSecretGet } from "../../projectsV2/api/storagesV2.api";
+
+interface AddOrEditCloudStorageProps {
+  schema: CloudStorageSchema[];
+  setStorage: (newDetails: Partial<CloudStorageDetails>) => void;
+  setState: (newState: Partial<AddCloudStorageState>) => void;
+  state: AddCloudStorageState;
+  storage: CloudStorageDetails;
+  storageSecrets: CloudStorageSecretGet[];
+}
+
+interface AddOrEditCloudStoragePropsV2 extends AddOrEditCloudStorageProps {
+  validationSucceeded: boolean;
+}
+
+export default function DataConnectorModalBody({
+  addResultStorageName,
+  credentialSaveStatus,
+  redraw,
+  schema,
+  schemaError,
+  schemaIsFetching,
+  setStateSafe,
+  setStorageDetailsSafe,
+  state,
+  storageDetails,
+  storageId,
+  storageSecrets,
+  success,
+  validationSucceeded,
+}: AddCloudStorageBodyContentProps) {
+  if (redraw) return <Loader />;
+  if (success) {
+    return (
+      <AddCloudStorageSuccessAlert
+        {...{ addResultStorageName, storageId, credentialSaveStatus }}
+      />
+    );
+  }
+  if (schemaIsFetching || !schema) return <Loader />;
+  if (schemaError) return <RtkOrNotebooksError error={schemaError} />;
+  return (
+    <>
+      {!storageId && (
+        <p>
+          Add published datasets from data repositories for use in your project.
+          Or, connect to cloud storage to read and write custom data.
+        </p>
+      )}
+      <AddOrEditCloudStorageV2
+        schema={schema}
+        setState={setStateSafe}
+        setStorage={setStorageDetailsSafe}
+        state={state}
+        storage={storageDetails}
+        storageSecrets={storageSecrets}
+        validationSucceeded={validationSucceeded}
+      />
+    </>
+  );
+}
+
+function AddOrEditCloudStorageV2({
+  schema,
+  setStorage,
+  setState,
+  state,
+  storage,
+  storageSecrets,
+  validationSucceeded,
+}: AddOrEditCloudStoragePropsV2) {
+  const ContentByStep =
+    state.step >= 0 && state.step <= CLOUD_STORAGE_TOTAL_STEPS
+      ? mapStepToElement[state.step]
+      : null;
+
+  if (ContentByStep)
+    return (
+      <>
+        <div className={cx("d-flex", "justify-content-end")}>
+          <AddStorageAdvancedToggle state={state} setState={setState} />
+        </div>
+        <ContentByStep
+          schema={schema}
+          state={state}
+          storage={storage}
+          setState={setState}
+          setStorage={setStorage}
+          storageSecrets={storageSecrets}
+          isV2={true}
+          validationSucceeded={validationSucceeded}
+        />
+      </>
+    );
+  return <p>Error - not implemented yet</p>;
+}
+
+// *** Add storage: helpers *** //
+interface AddStorageStepProps {
+  schema: CloudStorageSchema[];
+  setStorage: (newDetails: Partial<CloudStorageDetails>) => void;
+  setState: (newState: Partial<AddCloudStorageState>) => void;
+  state: AddCloudStorageState;
+  storage: CloudStorageDetails;
+  storageSecrets: CloudStorageSecretGet[];
+  isV2?: boolean;
+  validationSucceeded: boolean;
+}
+
+const mapStepToElement: {
+  [key: number]: React.ComponentType<AddStorageStepProps>;
+} = {
+  0: AddStorageAdvanced,
+  1: AddStorageType,
+  2: AddStorageOptions,
+  3: AddStorageMount,
+};
diff --git a/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx b/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
index d58f3436f..f70e5071f 100644
--- a/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
+++ b/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
@@ -113,44 +113,6 @@ export default function AddOrEditCloudStorage({
   return <p>Error - not implemented yet</p>;
 }
 
-interface AddOrEditCloudStoragePropsV2 extends AddOrEditCloudStorageProps {
-  validationSucceeded: boolean;
-}
-
-export function AddOrEditCloudStorageV2({
-  schema,
-  setStorage,
-  setState,
-  state,
-  storage,
-  storageSecrets,
-  validationSucceeded,
-}: AddOrEditCloudStoragePropsV2) {
-  const ContentByStep =
-    state.step >= 0 && state.step <= CLOUD_STORAGE_TOTAL_STEPS
-      ? mapStepToElement[state.step]
-      : null;
-
-  if (ContentByStep)
-    return (
-      <>
-        <div className={cx("d-flex", "justify-content-end")}>
-          <AddStorageAdvancedToggle state={state} setState={setState} />
-        </div>
-        <ContentByStep
-          schema={schema}
-          state={state}
-          storage={storage}
-          setState={setState}
-          setStorage={setStorage}
-          storageSecrets={storageSecrets}
-          isV2={true}
-          validationSucceeded={validationSucceeded}
-        />
-      </>
-    );
-  return <p>Error - not implemented yet</p>;
-}
 interface AddStorageAdvancedToggleProps {
   setState: (newState: Partial<AddCloudStorageState>) => void;
   state: AddCloudStorageState;
diff --git a/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx b/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx
index 6e76b1fe3..2e580a141 100644
--- a/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx
+++ b/client/src/features/project/components/cloudStorage/cloudStorageModalComponents.tsx
@@ -33,9 +33,7 @@ import { Button, UncontrolledTooltip } from "reactstrap";
 import { SuccessAlert } from "../../../../components/Alert";
 import { Loader } from "../../../../components/Loader";
 import { RtkOrNotebooksError } from "../../../../components/errors/RtkErrorAlert";
-import AddOrEditCloudStorage, {
-  AddOrEditCloudStorageV2,
-} from "./AddOrEditCloudStorage";
+import AddOrEditCloudStorage from "./AddOrEditCloudStorage";
 import { useTestCloudStorageConnectionMutation } from "./projectCloudStorage.api";
 import { CLOUD_STORAGE_TOTAL_STEPS } from "./projectCloudStorage.constants";
 import {
@@ -95,7 +93,7 @@ export function AddCloudStorageBackButton({
   );
 }
 
-interface AddCloudStorageBodyContentProps
+export interface AddCloudStorageBodyContentProps
   extends AddCloudStorageHeaderContentProps {
   addResultStorageName: string | undefined;
   credentialSaveStatus: CredentialSaveStatus;
@@ -116,7 +114,6 @@ interface AddCloudStorageBodyContentProps
 export function AddCloudStorageBodyContent({
   addResultStorageName,
   credentialSaveStatus,
-  isV2,
   redraw,
   schema,
   schemaError,
@@ -126,9 +123,7 @@ export function AddCloudStorageBodyContent({
   state,
   storageDetails,
   storageId,
-  storageSecrets,
   success,
-  validationSucceeded,
 }: AddCloudStorageBodyContentProps) {
   if (redraw) return <Loader />;
   if (success) {
@@ -140,36 +135,15 @@ export function AddCloudStorageBodyContent({
   }
   if (schemaIsFetching || !schema) return <Loader />;
   if (schemaError) return <RtkOrNotebooksError error={schemaError} />;
-  if (!isV2) {
-    return (
-      <AddOrEditCloudStorage
-        schema={schema}
-        setState={setStateSafe}
-        setStorage={setStorageDetailsSafe}
-        state={state}
-        storage={storageDetails}
-        storageSecrets={[]}
-      />
-    );
-  }
   return (
-    <>
-      {!storageId && (
-        <p>
-          Add published datasets from data repositories for use in your project.
-          Or, connect to cloud storage to read and write custom data.
-        </p>
-      )}
-      <AddOrEditCloudStorageV2
-        schema={schema}
-        setState={setStateSafe}
-        setStorage={setStorageDetailsSafe}
-        state={state}
-        storage={storageDetails}
-        storageSecrets={storageSecrets}
-        validationSucceeded={validationSucceeded}
-      />
-    </>
+    <AddOrEditCloudStorage
+      schema={schema}
+      setState={setStateSafe}
+      setStorage={setStorageDetailsSafe}
+      state={state}
+      storage={storageDetails}
+      storageSecrets={[]}
+    />
   );
 }
 
@@ -347,7 +321,7 @@ type AddCloudStorageSuccessAlertProps = Pick<
   "addResultStorageName" | "credentialSaveStatus" | "storageId"
 >;
 
-function AddCloudStorageSuccessAlert({
+export function AddCloudStorageSuccessAlert({
   addResultStorageName,
   credentialSaveStatus,
   storageId,