diff --git a/client/src/features/ProjectPageV2/ProjectPageContent/DataConnectors/ProjectConnectDataConnectorsModal.tsx b/client/src/features/ProjectPageV2/ProjectPageContent/DataConnectors/ProjectConnectDataConnectorsModal.tsx
index b287607777..eba07c111a 100644
--- a/client/src/features/ProjectPageV2/ProjectPageContent/DataConnectors/ProjectConnectDataConnectorsModal.tsx
+++ b/client/src/features/ProjectPageV2/ProjectPageContent/DataConnectors/ProjectConnectDataConnectorsModal.tsx
@@ -388,7 +388,7 @@ function ProjectLinkDataConnectorBodyAndFooter({
       </ModalBody>
 
       <ModalFooter className="border-top" data-cy="data-connector-edit-footer">
-        <Button color="outline-primary" onClick={toggle}>
+        <Button color="outline-primary" onClick={() => toggle()}>
           <XLg className={cx("bi", "me-1")} />
           Cancel
         </Button>
@@ -541,7 +541,7 @@ function ProjectDoiDataConnectorBodyAndFooter({
       </ModalBody>
 
       <ModalFooter className="border-top" data-cy="data-connector-edit-footer">
-        <Button color="outline-primary" onClick={toggle}>
+        <Button color="outline-primary" onClick={() => toggle()}>
           <XLg className={cx("bi", "me-1")} />
           Cancel
         </Button>
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorActions.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorActions.tsx
index 946c45bb9d..c3f2764f98 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorActions.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorActions.tsx
@@ -57,7 +57,6 @@ import {
 import useDataConnectorPermissions from "../utils/useDataConnectorPermissions.hook";
 
 import DataConnectorCredentialsModal from "./DataConnectorCredentialsModal";
-import DataConnectorModal from "./DataConnectorModal";
 import { getDataConnectorScope } from "./dataConnector.utils";
 
 interface DataConnectorRemoveModalProps {
@@ -366,6 +365,7 @@ function DataConnectorActionsInner({
   dataConnector,
   dataConnectorLink,
   toggleView,
+  toggleEdit,
 }: DataConnectorActionsProps) {
   const { id: dataConnectorId } = dataConnector;
   const scope = getDataConnectorScope(dataConnector.namespace);
@@ -394,7 +394,6 @@ function DataConnectorActionsInner({
     dataConnector.storage.sensitive_fields?.length > 0;
   const [isCredentialsOpen, setCredentialsOpen] = useState(false);
   const [isDeleteOpen, setIsDeleteOpen] = useState(false);
-  const [isEditOpen, setIsEditOpen] = useState(false);
   const [isUnlinkOpen, setIsUnlinkOpen] = useState(false);
   const onDelete = useCallback(() => {
     toggleView();
@@ -410,9 +409,7 @@ function DataConnectorActionsInner({
   const toggleDelete = useCallback(() => {
     setIsDeleteOpen((open) => !open);
   }, []);
-  const toggleEdit = useCallback(() => {
-    setIsEditOpen((open) => !open);
-  }, []);
+
   const toggleUnlink = useCallback(() => {
     setIsUnlinkOpen((open) => !open);
   }, []);
@@ -422,7 +419,7 @@ function DataConnectorActionsInner({
       ? [
           {
             key: "data-connector-edit",
-            onClick: toggleEdit,
+            onClick: () => toggleEdit(3),
             content: (
               <>
                 <Pencil className={cx("bi", "me-1")} />
@@ -430,6 +427,16 @@ function DataConnectorActionsInner({
               </>
             ),
           },
+          {
+            key: "data-connector-edit-connection",
+            onClick: () => toggleEdit(2),
+            content: (
+              <>
+                <Pencil className={cx("bi", "me-1")} />
+                Edit Connection Information
+              </>
+            ),
+          },
         ]
       : []),
     ...(requiresCredentials
@@ -516,12 +523,6 @@ function DataConnectorActionsInner({
   return (
     <>
       {actionsContent}
-      <DataConnectorModal
-        dataConnector={dataConnector}
-        isOpen={isEditOpen}
-        namespace={dataConnector.namespace}
-        toggle={toggleEdit}
-      />
       <DataConnectorCredentialsModal
         dataConnector={dataConnector}
         setOpen={setCredentialsOpen}
@@ -553,6 +554,7 @@ interface DataConnectorActionsProps {
   dataConnector: DataConnectorRead;
   dataConnectorLink?: DataConnectorToProjectLink;
   toggleView: () => void;
+  toggleEdit: (initialStep: number) => void;
 }
 
 export default function DataConnectorActions(props: DataConnectorActionsProps) {
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
index 5b0c74a858..c7dc41ad28 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
@@ -17,10 +17,11 @@
  */
 
 import cx from "classnames";
-import { useCallback } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { Globe, Lock } from "react-bootstrap-icons";
 import { Controller, useForm } from "react-hook-form";
-import { ButtonGroup, FormText, Input, Label } from "reactstrap";
+import { ButtonGroup, Collapse, Input, Label } from "reactstrap";
+import ChevronFlippedIcon from "../../../../components/icons/ChevronFlippedIcon";
 
 import { Loader } from "../../../../components/Loader";
 import { WarnAlert } from "../../../../components/Alert";
@@ -42,6 +43,7 @@ import {
   type AddStorageStepProps,
 } from "../../../project/components/cloudStorage/AddOrEditCloudStorage";
 import { ProjectNamespaceControl } from "../../../projectsV2/fields/ProjectNamespaceFormField";
+import SlugPreviewFormField from "../../../projectsV2/fields/SlugPreviewFormField";
 import type { DataConnectorSecret } from "../../api/data-connectors.api";
 import dataConnectorFormSlice from "../../state/dataConnectors.slice";
 
@@ -73,12 +75,6 @@ export default function DataConnectorModalBody({
   if (schemata.length < 1) return <Loader />;
   return (
     <>
-      {!flatDataConnector.dataConnectorId && (
-        <p className="text-body-secondary">
-          Add published datasets from data repositories for use in your project.
-          Or, connect to cloud storage to read and write custom data.
-        </p>
-      )}
       <AddOrEditDataConnector
         storageSecrets={storageSecrets}
         project={project}
@@ -125,6 +121,12 @@ function AddOrEditDataConnector({
   if (CloudStorageContentByStep)
     return (
       <>
+        {!flatDataConnector.dataConnectorId && cloudStorageState.step <= 1 && (
+          <p className="text-body-secondary">
+            Add published datasets from data repositories for use in your
+            project. Or, connect to cloud storage to read and write custom data.
+          </p>
+        )}
         <div className={cx("d-flex", "justify-content-end")}>
           <AddStorageAdvancedToggle
             state={cloudStorageState}
@@ -151,12 +153,14 @@ function AddOrEditDataConnector({
   if (DataConnectorContentByStep)
     return (
       <>
-        <div className={cx("d-flex", "justify-content-end")}>
-          <AddStorageAdvancedToggle
-            state={cloudStorageState}
-            setState={setState}
-          />
-        </div>
+        {!flatDataConnector.dataConnectorId && (
+          <div className={cx("d-flex", "justify-content-end")}>
+            <AddStorageAdvancedToggle
+              state={cloudStorageState}
+              setState={setState}
+            />
+          </div>
+        )}
         <DataConnectorContentByStep
           storageSecrets={storageSecrets}
           project={project}
@@ -188,11 +192,20 @@ export function DataConnectorMount() {
   const { cloudStorageState, flatDataConnector, schemata } = useAppSelector(
     (state) => state.dataConnectorFormSlice
   );
+  const [isAdvancedSettingOpen, setIsAdvancedSettingsOpen] = useState(false);
+  const toggleIsOpen = useCallback(
+    () =>
+      setIsAdvancedSettingsOpen(
+        (isAdvancedSettingOpen) => !isAdvancedSettingOpen
+      ),
+    []
+  );
   const {
     control,
-    formState: { errors, touchedFields },
+    formState: { dirtyFields, errors, touchedFields },
     setValue,
     getValues,
+    watch,
   } = useForm<DataConnectorMountForm>({
     mode: "onChange",
     defaultValues: {
@@ -268,10 +281,28 @@ export function DataConnectorMount() {
     (o) => flatDataConnector.options && flatDataConnector.options[o.name]
   );
 
+  const currentName = watch("name");
+  const currentSlug = watch("slug");
+  useEffect(() => {
+    dispatch(
+      dataConnectorFormSlice.actions.setFlatDataConnector({
+        flatDataConnector: { ...getValues() },
+      })
+    );
+  }, [currentSlug, getValues, dispatch]);
+  const resetUrl = useCallback(() => {
+    setValue("slug", slugFromTitle(currentName, true, true), {
+      shouldValidate: true,
+    });
+  }, [setValue, currentName]);
+  const dataConnectorId = flatDataConnector.dataConnectorId;
+  const parentPath = `/${flatDataConnector.namespace}/`;
   return (
     <form className="form-rk-green" data-cy="data-connector-edit-mount">
-      <h5>Final details</h5>
-      <p>We need a few more details to mount your data properly.</p>
+      {!dataConnectorId && <h5 className="fw-bold">Final details</h5>}
+      <p>
+        Set how your data connector displays in Renku and who can access it.
+      </p>
 
       <div className="mb-3">
         <Label className="form-label" for="name">
@@ -341,54 +372,21 @@ export function DataConnectorMount() {
         <div className="invalid-feedback">
           {errors.name?.message?.toString()}
         </div>
-        {flatDataConnector.namespace && flatDataConnector.slug ? (
-          <div className={cx("form-text", "text-muted")}>
-            The url for this data connector will be{" "}
-            <b>{`${flatDataConnector.namespace}/${flatDataConnector.slug}`}</b>.
-          </div>
-        ) : (
-          <div className={cx("form-text", "text-muted")}>
-            The owner and slug together form the url for this data connector.
-          </div>
-        )}
       </div>
 
       <div className="mb-3">
-        <Label className="form-label" for="data-connector-slug">
-          Slug
-        </Label>
-        <Controller
+        <SlugPreviewFormField
+          compact={true}
           control={control}
+          errors={errors}
           name="slug"
-          render={({ field }) => (
-            <Input
-              aria-describedby="data-connector-SlugHelp"
-              className={cx("form-control", errors.slug && "is-invalid")}
-              data-cy="data-connector-slug-input"
-              id="data-connector-slug"
-              type="text"
-              {...field}
-              onChange={(e) => {
-                field.onChange(e);
-                onFieldValueChange("slug", e.target.value);
-              }}
-            />
-          )}
-          rules={{
-            required: true,
-            maxLength: 99,
-            pattern:
-              /^(?!.*\.git$|.*\.atom$|.*[-._][-._].*)[a-z0-9][a-z0-9\-_.]*$/,
-          }}
+          resetFunction={resetUrl}
+          slug={currentSlug}
+          dirtyFields={dirtyFields}
+          label="Project URL"
+          entityName="data-connector"
+          parentPath={parentPath}
         />
-        <div className="invalid-feedback">
-          Please provide a slug consisting of lowercase letters, numbers, and
-          hyphens.
-        </div>
-        <FormText id="data-connector-SlugHelp" className="input-hint">
-          A short, machine-readable identifier for the data connector,
-          restricted to lowercase letters, numbers, and hyphens.
-        </FormText>
       </div>
 
       <div className="mb-3">
@@ -466,63 +464,44 @@ export function DataConnectorMount() {
       </div>
 
       <div className="mb-3">
-        <Label className="form-label" for="mountPoint">
-          Mount point
-        </Label>
-
-        <Controller
-          name="mountPoint"
-          control={control}
-          render={({ field }) => (
-            <input
-              id="mountPoint"
-              type="string"
-              {...field}
-              className={cx("form-control", errors.mountPoint && "is-invalid")}
-              data-cy="data-connector-mount-input"
-              onChange={(e) => {
-                field.onChange(e);
-                onFieldValueChange("mountPoint", e.target.value);
-              }}
-            />
-          )}
-          rules={{ required: true }}
-        />
-        <div className="invalid-feedback">Please provide a mount point.</div>
-        <div className={cx("form-text", "text-muted")}>
-          This is the name of the folder where you will find your external
-          storage in sessions. You should pick something different from the
-          folders used in the projects repository, and from folders mounted by
-          other storage services.
-        </div>
-      </div>
-
-      <div>
-        <Label className="form-label" for="readOnly">
-          Read-only
-        </Label>
-
         <Controller
           name="readOnly"
           control={control}
           render={({ field }) => (
-            <input
-              id="readOnly"
-              type="checkbox"
-              {...field}
-              className={cx(
-                "form-check-input",
-                "ms-1",
-                errors.readOnly && "is-invalid"
-              )}
-              data-cy="data-connector-readonly-input"
-              onChange={(e) => {
-                field.onChange(e);
-                onFieldValueChange("readOnly", e.target.checked);
-              }}
-              value=""
-              checked={flatDataConnector.readOnly ?? false}
-            />
+            <div className={cx("d-flex", "gap-2")}>
+              <Label className={cx("form-label", "mb-0")} for="readOnly">
+                Read-only
+              </Label>
+              <div
+                className={cx(
+                  "d-flex",
+                  "align-item-center",
+                  "form-check",
+                  "form-switch"
+                )}
+              >
+                <input
+                  id="readOnly"
+                  role="switch"
+                  type="checkbox"
+                  {...field}
+                  className={cx(
+                    "form-check-input",
+                    "rounded-pill",
+                    "my-auto",
+                    "me-2",
+                    errors.readOnly && "is-invalid"
+                  )}
+                  data-cy="data-connector-readonly-input"
+                  onChange={(e) => {
+                    field.onChange(e);
+                    onFieldValueChange("readOnly", e.target.checked);
+                  }}
+                  value=""
+                  checked={flatDataConnector.readOnly ?? false}
+                />
+              </div>
+            </div>
           )}
           rules={{ required: true }}
         />
@@ -544,6 +523,65 @@ export function DataConnectorMount() {
         </div>
       </div>
 
+      <div className="mb-3">
+        <button
+          className={cx(
+            "d-flex",
+            "align-items-center",
+            "w-100",
+            "bg-transparent",
+            "border-0",
+            "fw-bold",
+            "px-0"
+          )}
+          type="button"
+          onClick={toggleIsOpen}
+        >
+          Advanced settings
+          <ChevronFlippedIcon
+            className="ms-1"
+            flipped={isAdvancedSettingOpen}
+          />
+        </button>
+      </div>
+
+      <Collapse isOpen={isAdvancedSettingOpen}>
+        <div className="mb-3">
+          <Label className="form-label" for="mountPoint">
+            Mount point
+          </Label>
+
+          <Controller
+            name="mountPoint"
+            control={control}
+            render={({ field }) => (
+              <input
+                id="mountPoint"
+                type="string"
+                {...field}
+                className={cx(
+                  "form-control",
+                  errors.mountPoint && "is-invalid"
+                )}
+                data-cy="data-connector-mount-input"
+                onChange={(e) => {
+                  field.onChange(e);
+                  onFieldValueChange("mountPoint", e.target.value);
+                }}
+              />
+            )}
+            rules={{ required: true }}
+          />
+          <div className="invalid-feedback">Please provide a mount point.</div>
+          <div className={cx("form-text", "text-muted")}>
+            This is the name of the folder where you will find your external
+            storage in sessions. You should pick something different from the
+            folders used in the projects repository, and from folders mounted by
+            other storage services.
+          </div>
+        </div>
+      </Collapse>
+
       {flatDataConnector.dataConnectorId == null &&
         hasPasswordFieldWithInput &&
         validationResult?.isSuccess && (
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalFooter.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalFooter.tsx
index cc6fac81b1..8c88897b1e 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalFooter.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalFooter.tsx
@@ -66,6 +66,7 @@ interface DataConnectorModalFooterProps {
   isOpen: boolean;
   project?: Project;
   toggle: () => void;
+  initialStep?: number;
 }
 
 function DataConnectorCreateFooter({
@@ -354,34 +355,36 @@ function DataConnectorCreateFooter({
           setState={setStateSafe}
         />
       </div>
-      {!isResultLoading && !success && (
-        <Button
-          color="outline-danger"
-          data-cy="data-connector-edit-rest-button"
-          disabled={isActionOngoing}
-          onClick={() => {
-            reset();
-          }}
-        >
-          <ArrowCounterclockwise className={cx("bi", "me-1")} />
-          Reset
-        </Button>
-      )}
-      {!isResultLoading && (
-        <DataConnectorModalBackButton success={success} toggle={toggle} />
-      )}
-      {!success && (
-        <DataConnectorModalContinueButton
-          addButtonDisableReason={addButtonDisableReason}
-          addOrEditStorage={addStorage}
-          disableAddButton={disableAddButton}
-          disableContinueButton={!!disableContinueButton}
-          hasStoredCredentialsInConfig={false}
-          isResultLoading={isResultLoading}
-          dataConnectorId={null}
-          selectedSchemaHasAccessMode={!!schemaHasAccessModes}
-        />
-      )}
+      <div className={cx("d-flex", "gap-2")}>
+        {!isResultLoading && !success && (
+          <Button
+            color="outline-danger"
+            data-cy="data-connector-edit-rest-button"
+            disabled={isActionOngoing}
+            onClick={() => {
+              reset();
+            }}
+          >
+            <ArrowCounterclockwise className={cx("bi", "me-1")} />
+            Reset
+          </Button>
+        )}
+        {!isResultLoading && (
+          <DataConnectorModalBackButton success={success} toggle={toggle} />
+        )}
+        {!success && (
+          <DataConnectorModalContinueButton
+            addButtonDisableReason={addButtonDisableReason}
+            addOrEditStorage={addStorage}
+            disableAddButton={disableAddButton}
+            disableContinueButton={!!disableContinueButton}
+            hasStoredCredentialsInConfig={false}
+            isResultLoading={isResultLoading}
+            dataConnectorId={null}
+            selectedSchemaHasAccessMode={!!schemaHasAccessModes}
+          />
+        )}
+      </div>
     </>
   );
 }
@@ -395,6 +398,7 @@ function DataConnectorEditFooter({
   dataConnector,
   isOpen,
   toggle,
+  initialStep,
 }: DataConnectorEditFooterProps) {
   const dataConnectorId = dataConnector.id;
   const dispatch = useAppDispatch();
@@ -410,18 +414,6 @@ function DataConnectorEditFooter({
     success,
   } = useAppSelector((state) => state.dataConnectorFormSlice);
 
-  // Enhanced setters
-  const setStateSafe = useCallback(
-    (newState: Partial<AddCloudStorageState>) => {
-      dispatch(
-        dataConnectorFormSlice.actions.setCloudStorageState({
-          cloudStorageState: newState,
-        })
-      );
-    },
-    [dispatch]
-  );
-
   // Mutations
   const [updateDataConnector, updateResult] =
     usePatchDataConnectorsByDataConnectorIdMutation();
@@ -541,12 +533,13 @@ function DataConnectorEditFooter({
           <RtkOrNotebooksError error={actionError} />
         </div>
       )}
-      <div className={cx("d-flex", "flex-grow-1")}>
-        <AddStorageBreadcrumbNavbar
-          state={cloudStorageState}
-          setState={setStateSafe}
+      {!isResultLoading && (
+        <DataConnectorModalBackButton
+          success={success}
+          toggle={toggle}
+          initialStep={initialStep}
         />
-      </div>
+      )}
       {!isResultLoading && !success && (
         <Button
           color="outline-danger"
@@ -560,9 +553,6 @@ function DataConnectorEditFooter({
           Reset
         </Button>
       )}
-      {!isResultLoading && (
-        <DataConnectorModalBackButton success={success} toggle={toggle} />
-      )}
       {!success && (
         <DataConnectorModalContinueButton
           addButtonDisableReason={addButtonDisableReason}
@@ -584,6 +574,7 @@ export default function DataConnectorModalFooter({
   isOpen,
   project,
   toggle,
+  initialStep,
 }: DataConnectorModalFooterProps) {
   if (dataConnector) {
     return (
@@ -592,6 +583,7 @@ export default function DataConnectorModalFooter({
         isOpen={isOpen}
         project={project}
         toggle={toggle}
+        initialStep={initialStep}
       />
     );
   }
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal/dataConnectorModalButtons.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal/dataConnectorModalButtons.tsx
index 68d43cf14a..fdd493dd2a 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorModal/dataConnectorModalButtons.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModal/dataConnectorModalButtons.tsx
@@ -52,10 +52,12 @@ interface DataConnectorModalBackButtonProps
   extends DataConnectorModalForwardBackButtonProps {
   success: boolean;
   toggle: () => void;
+  initialStep?: number;
 }
 export function DataConnectorModalBackButton({
   success,
   toggle,
+  initialStep,
 }: DataConnectorModalBackButtonProps) {
   const { cloudStorageState, isActionOngoing } = useAppSelector(
     (state) => state.dataConnectorFormSlice
@@ -74,26 +76,28 @@ export function DataConnectorModalBackButton({
       </Button>
     );
   return (
-    <Button
-      color="outline-primary"
-      data-cy="data-connector-edit-back-button"
-      disabled={isActionOngoing}
-      onClick={() => {
-        dispatch(
-          dataConnectorFormSlice.actions.setCloudStorageState({
-            cloudStorageState: {
-              step: cloudStorageState.advancedMode
-                ? 0
-                : cloudStorageState.step - 1,
-            },
-            validationResult: null,
-          })
-        );
-      }}
-    >
-      <ChevronLeft className={cx("bi", "me-1")} />
-      Back
-    </Button>
+    (!initialStep || initialStep === 2) && (
+      <Button
+        color="outline-primary"
+        data-cy="data-connector-edit-back-button"
+        disabled={isActionOngoing}
+        onClick={() => {
+          dispatch(
+            dataConnectorFormSlice.actions.setCloudStorageState({
+              cloudStorageState: {
+                step: cloudStorageState.advancedMode
+                  ? 0
+                  : cloudStorageState.step - 1,
+              },
+              validationResult: null,
+            })
+          );
+        }}
+      >
+        <ChevronLeft className={cx("bi", "me-1")} />
+        Back
+      </Button>
+    )
   );
 }
 
@@ -172,6 +176,7 @@ export function DataConnectorModalContinueButton({
           continueId="add-data-connector-continue"
           step={cloudStorageState.step}
           testId="test-data-connector"
+          editDataConnector={addOrEditStorage}
         />
         {disableContinueButton && (
           <UncontrolledTooltip
@@ -262,11 +267,13 @@ interface TestConnectionAndContinueButtonsProps
   continueId: string;
   step: number;
   testId: string;
+  editDataConnector?: () => void;
 }
 function TestConnectionAndContinueButtons({
   continueId,
   step,
   testId,
+  editDataConnector,
 }: TestConnectionAndContinueButtonsProps) {
   const dispatch = useAppDispatch();
   const { flatDataConnector, isActionOngoing, validationResultIsCurrent } =
@@ -367,22 +374,81 @@ function TestConnectionAndContinueButtons({
 
   const buttonContinueId = `${continueId}-button`;
   const divContinueId = `${continueId}-div`;
-  const continueContent = validationResult.isSuccess ? (
-    <>
-      Continue <ChevronRight className="bi" />
-    </>
-  ) : validationResult.isError ? (
-    <>
-      Skip Test <ChevronRight className="bi" />
-    </>
+  const dataConnectorId = flatDataConnector.dataConnectorId;
+  const continueContent =
+    dataConnectorId ? null : validationResult.isSuccess ? (
+      <>
+        Continue <ChevronRight className="bi" />
+      </>
+    ) : validationResult.isError ? (
+      <>
+        Skip Test <ChevronRight className="bi" />
+      </>
+    ) : null;
+
+  const updateContent = dataConnectorId ? (
+    validationResult.isSuccess ? (
+      <>
+        <PencilSquare className={cx("bi", "me-1")} /> Update connector
+      </>
+    ) : (
+      <>
+        <PencilSquare className={cx("bi", "me-1")} /> Skip Test and Save
+      </>
+    )
   ) : null;
   const continueColorClass = validationResult.isSuccess
     ? "btn-primary"
     : validationResult.isError
     ? "btn-outline-danger"
     : "btn-primary";
-  const continueSection =
-    !validationResult.isError && !validationResult.isSuccess ? null : (
+  const continueSection = dataConnectorId ? null : !validationResult.isError &&
+    !validationResult.isSuccess ? null : (
+    <div id={divContinueId} className={cx("d-inline-block", "ms-2")}>
+      <Button
+        color=""
+        id={buttonContinueId}
+        data-cy={buttonContinueId}
+        className={cx(continueColorClass)}
+        disabled={validationResult.isLoading}
+        onClick={() => {
+          dispatch(
+            dataConnectorFormSlice.actions.setValidationResult({
+              validationResult: {
+                isSuccess: validationResult.isSuccess,
+                isError: validationResult.isError,
+                error: validationResult.error,
+              },
+            })
+          );
+          if (validationResult.isError || validationResult.isSuccess) {
+            validationResult.reset();
+          }
+          dispatch(
+            dataConnectorFormSlice.actions.setCloudStorageState({
+              cloudStorageState: {
+                step: step === 0 ? CLOUD_STORAGE_TOTAL_STEPS : step + 1,
+                completedSteps:
+                  step === 0 ? CLOUD_STORAGE_TOTAL_STEPS - 1 : step,
+              },
+            })
+          );
+        }}
+      >
+        {continueContent}
+      </Button>
+      {validationResult.isError && (
+        <UncontrolledTooltip placement="top" target={divContinueId}>
+          The connection is not working as configured. You can make changes and
+          try again, or skip and continue.
+        </UncontrolledTooltip>
+      )}
+    </div>
+  );
+
+  const saveSection =
+    !dataConnectorId || !editDataConnector ? null : !validationResult.isError &&
+      !validationResult.isSuccess ? null : (
       <div id={divContinueId} className={cx("d-inline-block", "ms-2")}>
         <Button
           color=""
@@ -390,36 +456,14 @@ function TestConnectionAndContinueButtons({
           data-cy={buttonContinueId}
           className={cx(continueColorClass)}
           disabled={validationResult.isLoading}
-          onClick={() => {
-            dispatch(
-              dataConnectorFormSlice.actions.setValidationResult({
-                validationResult: {
-                  isSuccess: validationResult.isSuccess,
-                  isError: validationResult.isError,
-                  error: validationResult.error,
-                },
-              })
-            );
-            if (validationResult.isError || validationResult.isSuccess) {
-              validationResult.reset();
-            }
-            dispatch(
-              dataConnectorFormSlice.actions.setCloudStorageState({
-                cloudStorageState: {
-                  step: step === 0 ? CLOUD_STORAGE_TOTAL_STEPS : step + 1,
-                  completedSteps:
-                    step === 0 ? CLOUD_STORAGE_TOTAL_STEPS - 1 : step,
-                },
-              })
-            );
-          }}
+          onClick={() => editDataConnector()}
         >
-          {continueContent}
+          {updateContent}
         </Button>
         {validationResult.isError && (
           <UncontrolledTooltip placement="top" target={divContinueId}>
             The connection is not working as configured. You can make changes
-            and try again, or skip and continue.
+            and try again, or skip and save.
           </UncontrolledTooltip>
         )}
       </div>
@@ -429,6 +473,7 @@ function TestConnectionAndContinueButtons({
     <div className="d-inline-block">
       {testConnectionSection}
       {continueSection}
+      {saveSection}
     </div>
   );
 }
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal/index.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal/index.tsx
index 3ceb0fca81..d8ec3268c2 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorModal/index.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModal/index.tsx
@@ -54,6 +54,7 @@ export function DataConnectorModalBodyAndFooter({
   namespace,
   project,
   toggle,
+  initialStep,
 }: DataConnectorModalProps) {
   const dataConnectorId = dataConnector?.id ?? null;
   // Fetch available schema when users open the modal
@@ -81,7 +82,7 @@ export function DataConnectorModalBodyAndFooter({
       dataConnector != null
         ? {
             ...EMPTY_CLOUD_STORAGE_STATE,
-            step: 2,
+            step: initialStep ?? 2,
             completedSteps: CLOUD_STORAGE_TOTAL_STEPS,
           }
         : EMPTY_CLOUD_STORAGE_STATE;
@@ -92,7 +93,7 @@ export function DataConnectorModalBodyAndFooter({
         schemata: schemata ?? [],
       })
     );
-  }, [dataConnector, dispatch, namespace, project, schemata]);
+  }, [dataConnector, dispatch, namespace, project, schemata, initialStep]);
 
   // Visual elements
   return (
@@ -116,6 +117,7 @@ export function DataConnectorModalBodyAndFooter({
           isOpen={isOpen}
           project={project}
           toggle={toggle}
+          initialStep={initialStep}
         />
       </ModalFooter>
     </>
@@ -145,7 +147,8 @@ interface DataConnectorModalProps {
   isOpen: boolean;
   namespace?: string;
   project?: Project;
-  toggle: () => void;
+  toggle: (initialStep?: number) => void;
+  initialStep?: number;
 }
 export default function DataConnectorModal({
   dataConnector = null,
@@ -153,6 +156,7 @@ export default function DataConnectorModal({
   namespace,
   project,
   toggle: originalToggle,
+  initialStep,
 }: DataConnectorModalProps) {
   const dataConnectorId = dataConnector?.id ?? null;
   const scope = getDataConnectorScope(dataConnector?.namespace);
@@ -179,7 +183,10 @@ export default function DataConnectorModal({
       toggle={toggle}
     >
       <ModalHeader toggle={toggle} data-cy="data-connector-edit-header">
-        <DataConnectorModalHeader dataConnectorId={dataConnectorId} />
+        <DataConnectorModalHeader
+          dataConnectorId={dataConnectorId}
+          initialStep={initialStep}
+        />
       </ModalHeader>
       {!isLoadingPermissions &&
       dataConnectorId != null &&
@@ -194,6 +201,7 @@ export default function DataConnectorModal({
                 namespace,
                 project,
                 toggle,
+                initialStep,
               }}
             />
           }
@@ -226,14 +234,17 @@ export default function DataConnectorModal({
 
 interface DataConnectorModalHeaderProps {
   dataConnectorId: string | null;
+  initialStep?: number;
 }
 export function DataConnectorModalHeader({
   dataConnectorId,
+  initialStep,
 }: DataConnectorModalHeaderProps) {
   return (
     <>
       <Database className={cx("bi", "me-1")} />{" "}
       {dataConnectorId ? "Edit" : "Add"} data connector
+      {!initialStep ? "" : initialStep === 2 ? " connection information" : ""}
     </>
   );
 }
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorView.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorView.tsx
index 55dc1933b0..e5258fa706 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorView.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorView.tsx
@@ -17,7 +17,7 @@
  */
 import { skipToken } from "@reduxjs/toolkit/query";
 import cx from "classnames";
-import { useMemo, useRef } from "react";
+import { useCallback, useMemo, useRef, useState } from "react";
 import {
   Folder,
   Gear,
@@ -26,11 +26,13 @@ import {
   Journals,
   Key,
   Lock,
+  Pencil,
   PersonBadge,
 } from "react-bootstrap-icons";
 import { Link, generatePath } from "react-router";
 import {
   Badge,
+  Button,
   Offcanvas,
   OffcanvasBody,
   UncontrolledTooltip,
@@ -41,6 +43,7 @@ import { Loader } from "../../../components/Loader";
 import LazyRenkuMarkdown from "../../../components/markdown/LazyRenkuMarkdown";
 import { ABSOLUTE_ROUTES } from "../../../routing/routes.constants";
 import { toCapitalized } from "../../../utils/helpers/HelperFunctions";
+import PermissionsGuard from "../../permissionsV2/PermissionsGuard";
 import { CredentialMoreInfo } from "../../project/components/cloudStorage/CloudStorageItem";
 import {
   CLOUD_STORAGE_SENSITIVE_FIELD_TOKEN,
@@ -56,6 +59,7 @@ import type {
   DataConnectorToProjectLink,
 } from "../api/data-connectors.api";
 import { useGetDataConnectorsByDataConnectorIdSecretsQuery } from "../api/data-connectors.enhanced-api";
+import useDataConnectorPermissions from "../utils/useDataConnectorPermissions.hook";
 import { DATA_CONNECTORS_VISIBILITY_WARNING } from "./dataConnector.constants";
 import {
   getDataConnectorScope,
@@ -63,6 +67,7 @@ import {
   useGetDataConnectorSource,
 } from "./dataConnector.utils";
 import DataConnectorActions from "./DataConnectorActions";
+import DataConnectorModal from "./DataConnectorModal";
 import useDataConnectorProjects from "./useDataConnectorProjects.hook";
 
 const SECTION_CLASSES = [
@@ -94,6 +99,7 @@ interface DataConnectorViewProps {
   dataConnectorLink?: DataConnectorToProjectLink;
   showView: boolean;
   toggleView: () => void;
+  toggleEdit: (initialStep?: number) => void;
   dataConnectorPotentiallyInaccessible?: boolean;
 }
 export default function DataConnectorView({
@@ -102,7 +108,15 @@ export default function DataConnectorView({
   showView,
   toggleView,
   dataConnectorPotentiallyInaccessible = false,
-}: DataConnectorViewProps) {
+}: Omit<DataConnectorViewProps, "toggleEdit">) {
+  const [isEditOpen, setIsEditOpen] = useState(false);
+  const [initialStep, setInitialStep] = useState(2);
+
+  const toggleEdit = useCallback((initialStep?: number) => {
+    if (initialStep) setInitialStep(initialStep);
+    setIsEditOpen((open) => !open);
+  }, []);
+
   return (
     <Offcanvas
       toggle={toggleView}
@@ -121,7 +135,7 @@ export default function DataConnectorView({
           ></button>
         </div>
         <DataConnectorViewHeader
-          {...{ dataConnector, dataConnectorLink, toggleView }}
+          {...{ dataConnector, dataConnectorLink, toggleView, toggleEdit }}
         />
         <DataConnectorViewMetadata
           dataConnector={dataConnector}
@@ -129,10 +143,20 @@ export default function DataConnectorView({
             dataConnectorPotentiallyInaccessible
           }
         />
-        <DataConnectorViewConfiguration dataConnector={dataConnector} />
-        <DataConnectorViewProjects dataConnector={dataConnector} />
+        <DataConnectorViewConfiguration
+          dataConnector={dataConnector}
+          toggleEdit={toggleEdit}
+        />
         <DataConnectorViewAccess dataConnector={dataConnector} />
+        <DataConnectorViewProjects dataConnector={dataConnector} />
       </OffcanvasBody>
+      <DataConnectorModal
+        dataConnector={dataConnector}
+        isOpen={isEditOpen}
+        namespace={dataConnector.namespace}
+        toggle={toggleEdit}
+        initialStep={initialStep}
+      />
     </Offcanvas>
   );
 }
@@ -187,7 +211,7 @@ function DataConnectorViewAccess({
         {anySensitiveField &&
           requiredCredentials &&
           requiredCredentials.length > 0 && (
-            <div className="mt-3">
+            <div className={cx("mb-4", "mt-3")}>
               <p className={cx("fw-bold", "m-0")}>Required credentials</p>
               <table
                 className={cx(
@@ -243,11 +267,6 @@ function DataConnectorViewAccess({
               </table>
             </div>
           )}
-        <DataConnectorPropertyValue title="Access mode">
-          {storageDefinition.readonly
-            ? "Force Read-only"
-            : "Allow Read-Write (requires adequate privileges on the storage)"}
-        </DataConnectorPropertyValue>
       </div>
     </section>
   );
@@ -255,27 +274,84 @@ function DataConnectorViewAccess({
 
 function DataConnectorViewConfiguration({
   dataConnector,
-}: Pick<DataConnectorViewProps, "dataConnector">) {
+  toggleEdit,
+}: Pick<DataConnectorViewProps, "dataConnector" | "toggleEdit">) {
   const storageDefinition = dataConnector.storage;
+  const { permissions } = useDataConnectorPermissions({
+    dataConnectorId: dataConnector.id,
+  });
+  const credentialFieldDefinitions = useMemo(
+    () =>
+      getCredentialFieldDefinitions({
+        storage: storageDefinition,
+        sensitive_fields: storageDefinition.sensitive_fields,
+      }),
+    [storageDefinition]
+  );
+  const requiredCredentials = useMemo(
+    () =>
+      credentialFieldDefinitions?.filter((field) => field.requiredCredential),
+    [credentialFieldDefinitions]
+  );
+  const nonRequiredCredentialConfigurationKeys = Object.keys(
+    storageDefinition.configuration
+  ).filter((k) => !requiredCredentials?.some((f) => f.name === k));
+  const scope = useMemo(
+    () => getDataConnectorScope(dataConnector.namespace),
+    [dataConnector.namespace]
+  );
+  const hasAccessMode = useMemo(
+    () => STORAGES_WITH_ACCESS_MODE.includes(storageDefinition.storage_type),
+    [storageDefinition.storage_type]
+  );
 
   return (
     <section
       className={cx(SECTION_CLASSES)}
       data-cy="data-connector-configuration-section"
     >
-      <div>
-        <h4 className="mb-4">
+      <div className={cx("d-flex", "justify-content-between", "mb-4")}>
+        <h4>
           <Gear className={cx("bi", "me-1")} />
-          Configuration
+          {scope === "global" ? "Configuration" : "Connection Information"}
         </h4>
+        <PermissionsGuard
+          disabled={null}
+          enabled={
+            <>
+              <Button
+                color="outline-primary"
+                id="modify-data-connection-button"
+                onClick={() => toggleEdit(2)}
+                size="sm"
+                tabIndex={0}
+              >
+                <Pencil className="bi" />
+              </Button>
+              <UncontrolledTooltip target="modify-data-connection-button">
+                Modify connection information
+              </UncontrolledTooltip>
+            </>
+          }
+          requestedPermission="write"
+          userPermissions={permissions}
+        />
       </div>
+      {scope !== "global" &&
+        nonRequiredCredentialConfigurationKeys.map((key) => {
+          const title =
+            key == "provider" && hasAccessMode ? "Mode" : toCapitalized(key);
+          const value = storageDefinition.configuration[key]?.toString() ?? "";
+          return (
+            <DataConnectorPropertyValue key={key} title={title}>
+              {value}
+            </DataConnectorPropertyValue>
+          );
+        })}
       <div>
         <DataConnectorPropertyValue title="Source path">
           {storageDefinition.source_path}
         </DataConnectorPropertyValue>
-        <DataConnectorPropertyValue title={<MountPointHead />}>
-          {storageDefinition.target_path}
-        </DataConnectorPropertyValue>
       </div>
     </section>
   );
@@ -285,15 +361,18 @@ function DataConnectorViewHeader({
   dataConnector,
   dataConnectorLink,
   toggleView,
+  toggleEdit,
 }: Omit<DataConnectorViewProps, "showView">) {
   return (
     <div className="mb-4">
+      <span className={cx("small", "text-muted", "me-3")}>Data connector</span>
       <div>
         <div className={cx("float-end", "mt-1", "ms-1")}>
           <DataConnectorActions
             dataConnector={dataConnector}
             dataConnectorLink={dataConnectorLink}
             toggleView={toggleView}
+            toggleEdit={toggleEdit}
           />
         </div>
         <h2 className={cx("m-0", "text-break")} data-cy="data-connector-title">
@@ -313,7 +392,7 @@ function DataConnectorViewProjects({
       className={cx(SECTION_CLASSES)}
       data-cy="data-connector-projects-section"
     >
-      <h4>
+      <h4 className="mb-4">
         <Folder className={cx("bi", "me-1")} />
         Projects
       </h4>
@@ -360,22 +439,6 @@ function DataConnectorViewMetadata({
   dataConnectorPotentiallyInaccessible,
 }: DataConnectorViewMetadataProps) {
   const storageDefinition = dataConnector.storage;
-  const credentialFieldDefinitions = useMemo(
-    () =>
-      getCredentialFieldDefinitions({
-        storage: storageDefinition,
-        sensitive_fields: storageDefinition.sensitive_fields,
-      }),
-    [storageDefinition]
-  );
-  const requiredCredentials = useMemo(
-    () =>
-      credentialFieldDefinitions?.filter((field) => field.requiredCredential),
-    [credentialFieldDefinitions]
-  );
-  const nonRequiredCredentialConfigurationKeys = Object.keys(
-    storageDefinition.configuration
-  ).filter((k) => !requiredCredentials?.some((f) => f.name === k));
   const { data: namespace, isLoading: isLoadingNamespace } =
     useGetNamespacesByNamespaceSlugQuery(
       dataConnector.namespace
@@ -409,11 +472,6 @@ function DataConnectorViewMetadata({
     [dataConnector.namespace, namespace, scope]
   );
 
-  const hasAccessMode = useMemo(
-    () => STORAGES_WITH_ACCESS_MODE.includes(storageDefinition.storage_type),
-    [storageDefinition.storage_type]
-  );
-
   const identifier = useMemo(
     () =>
       scope === "global"
@@ -448,6 +506,12 @@ function DataConnectorViewMetadata({
         </div>
       </DataConnectorPropertyValue>
 
+      {dataConnector.description && (
+        <DataConnectorPropertyValue title="Description">
+          <LazyRenkuMarkdown markdownText={dataConnector.description} />
+        </DataConnectorPropertyValue>
+      )}
+
       {scope === "global" ? (
         <>
           <DataConnectorPropertyValue title="Source">
@@ -554,23 +618,14 @@ function DataConnectorViewMetadata({
         </DataConnectorPropertyValue>
       )}
 
-      {dataConnector.description && (
-        <DataConnectorPropertyValue title="Description">
-          <LazyRenkuMarkdown markdownText={dataConnector.description} />
-        </DataConnectorPropertyValue>
-      )}
-
-      {scope !== "global" &&
-        nonRequiredCredentialConfigurationKeys.map((key) => {
-          const title =
-            key == "provider" && hasAccessMode ? "Mode" : toCapitalized(key);
-          const value = storageDefinition.configuration[key]?.toString() ?? "";
-          return (
-            <DataConnectorPropertyValue key={key} title={title}>
-              {value}
-            </DataConnectorPropertyValue>
-          );
-        })}
+      <DataConnectorPropertyValue title={<MountPointHead />}>
+        {storageDefinition.target_path}
+      </DataConnectorPropertyValue>
+      <DataConnectorPropertyValue title="Access mode">
+        {storageDefinition.readonly
+          ? "Force Read-only"
+          : "Allow Read-Write (requires adequate privileges on the storage)"}
+      </DataConnectorPropertyValue>
     </section>
   );
 }
diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorsBoxListDisplay.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorsBoxListDisplay.tsx
index 7a6b9514e0..28bdbfe50b 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorsBoxListDisplay.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorsBoxListDisplay.tsx
@@ -116,6 +116,7 @@ export default function DataConnectorBoxListDisplay({
         action
         className={cx("cursor-pointer", "link-primary", "text-body")}
         onClick={toggleDetails}
+        data-cy="data-connector-item"
       >
         <Row className={cx("align-items-center", "g-2")}>
           <Col className={cx("d-flex", "flex-column")}>
diff --git a/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx b/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
index 8baf2b3b68..822221ab8f 100644
--- a/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
+++ b/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
@@ -45,8 +45,9 @@ import {
 
 import { 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.ts";
+import { hasSchemaAccessMode } from "../../../dataConnectorsV2/components/dataConnector.utils";
 import {
   convertFromAdvancedConfig,
   getSchemaOptions,
@@ -872,7 +873,10 @@ export function AddStorageOptions({
     storage.provider
   );
   const { control, setValue, getValues } = useForm();
-
+  const { flatDataConnector } = useAppSelector(
+    (state) => state.dataConnectorFormSlice
+  );
+  const dataConnectorId = flatDataConnector.dataConnectorId;
   const onFieldValueChange = (
     option: string,
     value: string | number | boolean
@@ -1008,7 +1012,7 @@ export function AddStorageOptions({
 
   return (
     <form className="form-rk-green" data-cy="cloud-storage-edit-options">
-      <h5>Options</h5>
+      {!dataConnectorId && <h5 className="fw-bold">Connection information</h5>}
       <p>
         Please fill in all the options required to connect to your storage. Mind
         that the specific fields required depend on your storage configuration.
diff --git a/client/src/features/project/components/cloudStorage/AddStorageBreadcrumbNavbar.tsx b/client/src/features/project/components/cloudStorage/AddStorageBreadcrumbNavbar.tsx
index c996816297..a489f70775 100644
--- a/client/src/features/project/components/cloudStorage/AddStorageBreadcrumbNavbar.tsx
+++ b/client/src/features/project/components/cloudStorage/AddStorageBreadcrumbNavbar.tsx
@@ -48,7 +48,9 @@ export default function AddStorageBreadcrumbNavbar({
       return (
         <BreadcrumbItem active={active} key={stepNumber}>
           {active ? (
-            <>{mapStepToName[stepNumber]}</>
+            <span className={cx(active && "fw-bold", "align-self-end")}>
+              {mapStepToName[stepNumber]}
+            </span>
           ) : (
             <>
               <Button
@@ -79,7 +81,7 @@ export default function AddStorageBreadcrumbNavbar({
 
 const mapStepToName: { [key: number]: string } = {
   0: "Advanced configuration",
-  1: "Storage",
-  2: "Options",
-  3: "Mount",
+  1: "Storage type",
+  2: "Connection",
+  3: "Final details",
 };
diff --git a/client/src/features/projectsV2/fields/formField.types.ts b/client/src/features/projectsV2/fields/formField.types.ts
index 05ea6c26ee..60441d2e0b 100644
--- a/client/src/features/projectsV2/fields/formField.types.ts
+++ b/client/src/features/projectsV2/fields/formField.types.ts
@@ -32,7 +32,7 @@ export interface SlugPreviewFormFieldProps<T extends FieldValues>
   parentPath: string;
   slug: string;
   label: string;
-  entityName: "project" | "group";
+  entityName: "project" | "group" | "data-connector";
   dirtyFields: Partial<
     Readonly<{
       name?: boolean | undefined;
diff --git a/tests/cypress/e2e/groupV2.spec.ts b/tests/cypress/e2e/groupV2.spec.ts
index 3104a8c996..da4cb600c8 100644
--- a/tests/cypress/e2e/groupV2.spec.ts
+++ b/tests/cypress/e2e/groupV2.spec.ts
@@ -343,11 +343,9 @@ describe("Work with group data connectors", () => {
     cy.getDataCy("add-data-connector-continue-button").contains("Skip").click();
     cy.getDataCy("data-connector-edit-mount").within(() => {
       cy.get("#name").type("example storage without credentials");
-      cy.get("#data-connector-slug").should(
-        "have.value",
-        "example-storage-without-credentials"
-      );
-      cy.get("#data-connector-slug")
+      cy.getDataCy("data-connector-slug-toggle").click();
+      cy.getDataCy("data-connector-slug-input")
+        .should("have.value", "example-storage-without-credentials")
         .clear()
         .type("example-storage-no-credentials");
     });
@@ -368,13 +366,13 @@ describe("Work with group data connectors", () => {
       .patchDataConnector({ namespace: "test-2-group-v2" });
     cy.contains("test 2 group-v2").should("be.visible").click();
     cy.wait("@readGroupV2");
-    cy.contains("public-storage").should("be.visible").click();
+
+    cy.getDataCy("data-connector-name")
+      .first()
+      .should("contain.text", "public-storage")
+      .click();
     cy.getDataCy("data-connector-edit").should("be.visible").click();
     // Fill out the details
-    cy.getDataCy("test-data-connector-button").click();
-    cy.getDataCy("add-data-connector-continue-button")
-      .contains("Continue")
-      .click();
     cy.getDataCy("data-connector-edit-update-button").click();
     cy.wait("@patchDataConnector");
     cy.getDataCy("data-connector-edit-body").should(
diff --git a/tests/cypress/e2e/groupV2DataConnectorCredentials.spec.ts b/tests/cypress/e2e/groupV2DataConnectorCredentials.spec.ts
index 700dbccd0c..402d95b6cb 100644
--- a/tests/cypress/e2e/groupV2DataConnectorCredentials.spec.ts
+++ b/tests/cypress/e2e/groupV2DataConnectorCredentials.spec.ts
@@ -264,18 +264,29 @@ describe("Set up data connectors with credentials", () => {
       })
       .dataConnectorSecrets({
         fixture: "dataConnector/data-connector-secrets-empty.json",
+        name: "getDataConnectorSecretsEmpty",
       });
 
     cy.visit("/g/test-2-group-v2");
-    cy.wait("@readGroupV2");
-    cy.wait("@listDataConnectors");
+    cy.wait(["@readGroupV2", "@listDataConnectors"]);
     // Credentials should not yet be stored
-    cy.getDataCy("data-connector-name").contains("example storage").click();
-    cy.wait("@getDataConnectorSecrets");
-    cy.getDataCy("data-connector-title").should(
-      "contain.text",
-      "example storage"
-    );
+    cy.getDataCy("data-connector-item")
+      .should("be.visible")
+      .and("have.length.at.least", 1);
+    cy.getDataCy("data-connector-name")
+      .first()
+      .contains("example storage")
+      .click()
+      .then(() => {
+        cy.hash().should("include", "data-connector-");
+        cy.getDataCy("data-connector-metadata-section").should("be.visible");
+      });
+
+    cy.wait("@getDataConnectorSecretsEmpty");
+    cy.getDataCy("data-connector-title")
+      .first()
+      .should("contain.text", "example storage");
+
     cy.getDataCy("access_key_id-value").should(
       "contain.text",
       "Requires credentials"
@@ -333,7 +344,7 @@ describe("Set up data connectors with credentials", () => {
       fixture: "cloudStorage/storage-schema-s3.json",
     });
     openDataConnectorMenu();
-    cy.getDataCy("data-connector-edit").click();
+    cy.getDataCy("data-connector-edit-connection").click();
     cy.getDataCy("data-connector-edit-modal")
       .find("#access_key_id")
       .invoke("attr", "value")
diff --git a/tests/cypress/e2e/projectV2setup.spec.ts b/tests/cypress/e2e/projectV2setup.spec.ts
index 828104086a..d5780c6849 100644
--- a/tests/cypress/e2e/projectV2setup.spec.ts
+++ b/tests/cypress/e2e/projectV2setup.spec.ts
@@ -360,7 +360,6 @@ describe("Set up data connectors", () => {
     cy.getDataCy("project-data-controller-mode-link").click();
     cy.get("#data-connector-identifier").type("user1-uuid/example-storage");
     cy.getDataCy("link-data-connector-button").click();
-    cy.wait("@getDataConnectorByNamespaceAndSlugNotFound");
     cy.contains(
       "Data connector with identifier 'user1-uuid/example-storage' does not exist or you do not have access to it."
     ).should("be.visible");
@@ -505,10 +504,6 @@ describe("Set up data connectors", () => {
     cy.contains("example storage").should("be.visible").click();
     cy.getDataCy("data-connector-edit").should("be.visible").click();
     // Fill out the details
-    cy.getDataCy("test-data-connector-button").click();
-    cy.getDataCy("add-data-connector-continue-button")
-      .contains("Continue")
-      .click();
     cy.getDataCy("data-connector-edit-update-button").click();
     cy.wait("@patchDataConnector");
     cy.getDataCy("data-connector-edit-body").should(