From ec224b158ce1f9869e24e7025156ba6ef43763f7 Mon Sep 17 00:00:00 2001
From: Andrea Cordoba <dandrea.cordoba@gmail.com>
Date: Tue, 26 May 2026 07:51:12 +0200
Subject: [PATCH 1/3] feat: submit a job

---
 .../dashboardV2/DashboardV2Sessions.tsx       |  24 +-
 client/src/features/logsDisplay/LogsModal.tsx |  17 +-
 .../projectsV2/api/projectV2.openapi.json     |   2 +-
 .../sessionsV2/SessionList/SessionCard.tsx    |  52 +-
 .../SessionList/SessionLauncherCard.tsx       |   1 +
 .../SessionList/SessionLauncherDisplay.tsx    |   9 +-
 .../sessionsV2/SessionStyles.constants.ts     |  42 ++
 .../sessionsV2/SessionView/SessionView.tsx    |  14 +-
 client/src/features/sessionsV2/SessionsV2.tsx |   8 +-
 .../api/computeResources.openapi.json         |  32 +-
 .../SessionButton/ActiveSessionButton.tsx     | 305 ++++++----
 .../SessionModals/SubmitJobModal.tsx          | 520 ++++++++++++++++++
 .../SessionModals/useSubmitJobForm.ts         |  85 +++
 .../SessionStatus/SessionStatus.tsx           | 168 ++++--
 .../components/SubmitJobLauncherAction.tsx    |  18 +-
 .../features/sessionsV2/session.constants.tsx |  41 +-
 .../src/features/sessionsV2/session.utils.ts  | 158 +++++-
 .../features/sessionsV2/sessionsV2.types.ts   |  22 +-
 tests/cypress/e2e/projectV2SubmitJob.spec.ts  | 122 ++++
 .../sessions-with-submission-id.json          |  25 +
 20 files changed, 1467 insertions(+), 198 deletions(-)
 create mode 100644 client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx
 create mode 100644 client/src/features/sessionsV2/components/SessionModals/useSubmitJobForm.ts
 create mode 100644 tests/cypress/e2e/projectV2SubmitJob.spec.ts
 create mode 100644 tests/cypress/fixtures/projectV2/sessions-with-submission-id.json

diff --git a/client/src/features/dashboardV2/DashboardV2Sessions.tsx b/client/src/features/dashboardV2/DashboardV2Sessions.tsx
index cad92358f8..db4a14ca91 100644
--- a/client/src/features/dashboardV2/DashboardV2Sessions.tsx
+++ b/client/src/features/dashboardV2/DashboardV2Sessions.tsx
@@ -22,6 +22,7 @@ import cx from "classnames";
 import { generatePath, Link } from "react-router";
 import { Col, ListGroup, Row } from "reactstrap";
 
+import { sessionLauncherKindToCategory } from "~/features/sessionsV2/session.utils.ts";
 import RtkOrDataServicesError from "../../components/errors/RtkOrDataServicesError";
 import { Loader } from "../../components/Loader";
 import { ABSOLUTE_ROUTES } from "../../routing/routes.constants";
@@ -112,10 +113,10 @@ interface DashboardSessionProps {
 function DashboardSession({ session }: DashboardSessionProps) {
   const { project_id: projectId, launcher_id: launcherId } = session;
   const { data: project } = useGetProjectsByProjectIdQuery(
-    projectId ? { projectId } : skipToken,
+    projectId ? { projectId } : skipToken
   );
   const { data: launcher } = useGetProjectSessionLauncherQuery(
-    launcherId ? { launcherId } : skipToken,
+    launcherId ? { launcherId } : skipToken
   );
 
   const projectUrl = project
@@ -124,10 +125,10 @@ function DashboardSession({ session }: DashboardSessionProps) {
         slug: project.slug,
       })
     : projectId
-      ? generatePath(ABSOLUTE_ROUTES.v2.projects.showById, {
-          id: projectId,
-        })
-      : ABSOLUTE_ROUTES.v2.index;
+    ? generatePath(ABSOLUTE_ROUTES.v2.projects.showById, {
+        id: projectId,
+      })
+    : ABSOLUTE_ROUTES.v2.index;
   const showSessionUrl = project
     ? generatePath(ABSOLUTE_ROUTES.v2.projects.show.sessions.show, {
         namespace: project.namespace,
@@ -136,7 +137,8 @@ function DashboardSession({ session }: DashboardSessionProps) {
       })
     : ABSOLUTE_ROUTES.v2.index;
 
-  const sessionStyles = getSessionStatusStyles(session);
+  const launcherCategory = sessionLauncherKindToCategory(session.session_type);
+  const sessionStyles = getSessionStatusStyles(session, launcherCategory);
   const state = session.status.state;
 
   return (
@@ -151,7 +153,7 @@ function DashboardSession({ session }: DashboardSessionProps) {
           "gap-3",
           "link-primary",
           "text-body",
-          "text-decoration-none",
+          "text-decoration-none"
         )}
         to={{ pathname: projectUrl }}
       >
@@ -165,7 +167,7 @@ function DashboardSession({ session }: DashboardSessionProps) {
                   "cursor-pointer",
                   "d-inline-block",
                   "link-primary",
-                  "text-body",
+                  "text-body"
                 )}
                 data-cy="list-session-link"
               >
@@ -176,7 +178,7 @@ function DashboardSession({ session }: DashboardSessionProps) {
                       {launcher?.environment?.name}
                     </>
                   ) : (
-                    (projectId ?? "Unknown")
+                    projectId ?? "Unknown"
                   )}
                 </h4>
               </Col>
@@ -195,7 +197,7 @@ function DashboardSession({ session }: DashboardSessionProps) {
               "mt-2",
               "d-block",
               "d-sm-flex",
-              "gap-5",
+              "gap-5"
             )}
             xs={12}
           >
diff --git a/client/src/features/logsDisplay/LogsModal.tsx b/client/src/features/logsDisplay/LogsModal.tsx
index 196515147b..bccdd99a65 100644
--- a/client/src/features/logsDisplay/LogsModal.tsx
+++ b/client/src/features/logsDisplay/LogsModal.tsx
@@ -100,10 +100,13 @@ export default function LogsModal({
               "fs-4",
               "fst-italic",
               "mb-0",
-              getSessionStatusStyles({
-                status: { state: sessionState },
-                image: "url",
-              })["textColorCard"],
+              getSessionStatusStyles(
+                {
+                  status: { state: sessionState },
+                  image: "url",
+                },
+                "session"
+              )["textColorCard"]
             )}
           >
             Session status: {sessionState}
@@ -217,7 +220,7 @@ function TabbedLogs({ data, defaultTab }: TabbedLogsProps) {
   }, [data, defaultTab]);
 
   const [activeTab, setActiveTab] = useState<string>(
-    sortedLogs.at(0)?.tab ?? "",
+    sortedLogs.at(0)?.tab ?? ""
   );
 
   const preRef = useRef<HTMLPreElement>(null);
@@ -301,7 +304,7 @@ function ModalFooterButtons({
   const [isDownloading, triggerDownload] = useDownloadLogs(
     name,
     refetch,
-    downloadQueryTrigger,
+    downloadQueryTrigger
   );
   const canDownload =
     !isFetching &&
@@ -350,7 +353,7 @@ function ModalFooterButtons({
 function useDownloadLogs(
   name: string,
   refetch: LogsQuery["refetch"],
-  downloadQueryTrigger: DownloadLogsLazyQueryTrigger | undefined | null,
+  downloadQueryTrigger: DownloadLogsLazyQueryTrigger | undefined | null
 ): [boolean, () => void] {
   const [isDownloading, setIsDownloading] = useState<boolean>(false);
 
diff --git a/client/src/features/projectsV2/api/projectV2.openapi.json b/client/src/features/projectsV2/api/projectV2.openapi.json
index 60e3fe95d0..81114656e2 100644
--- a/client/src/features/projectsV2/api/projectV2.openapi.json
+++ b/client/src/features/projectsV2/api/projectV2.openapi.json
@@ -1197,7 +1197,7 @@
         "description": "A container image",
         "type": "string",
         "maxLength": 500,
-        "pattern": "^[a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*(\\/[a-z0-9]+((\\.|_|__|-+)[a-z0-9]+)*)*(:[a-zA-Z0-9_][a-zA-Z0-9._-]{0,127}|@sha256:[a-fA-F0-9]{64}){0,1}$",
+        "minLength": 3,
         "example": "renku/renkulab-py:3.10-0.18.1"
       },
       "DefaultUrl": {
diff --git a/client/src/features/sessionsV2/SessionList/SessionCard.tsx b/client/src/features/sessionsV2/SessionList/SessionCard.tsx
index eb8a767673..16cbcbc1bf 100644
--- a/client/src/features/sessionsV2/SessionList/SessionCard.tsx
+++ b/client/src/features/sessionsV2/SessionList/SessionCard.tsx
@@ -19,6 +19,7 @@
 import cx from "classnames";
 import { Col, Row } from "reactstrap";
 
+import { getLauncherCategoryDefinition } from "~/features/sessionsV2/session.utils.ts";
 import { Project } from "../../projectsV2/api/projectV2.api";
 import ActiveSessionButton from "../components/SessionButton/ActiveSessionButton";
 import {
@@ -27,18 +28,24 @@ import {
   SessionStatusV2Label,
 } from "../components/SessionStatus/SessionStatus";
 import { getShowSessionUrlByProject } from "../SessionsV2";
-import { SessionV2 } from "../sessionsV2.types";
+import { LauncherCategory, SessionV2 } from "../sessionsV2.types";
 
 import styles from "./Session.module.scss";
 
 interface SessionCardProps {
   project: Project;
   session?: SessionV2;
+  launcherCategory: LauncherCategory;
 }
-export default function SessionCard({ project, session }: SessionCardProps) {
+export default function SessionCard({
+  project,
+  session,
+  launcherCategory,
+}: SessionCardProps) {
   if (!session) return null;
 
-  const stylesPerSession = getSessionStatusStyles(session);
+  const stylesPerSession = getSessionStatusStyles(session, launcherCategory);
+  const launcherDefinition = getLauncherCategoryDefinition(launcherCategory);
 
   return (
     <div
@@ -47,16 +54,24 @@ export default function SessionCard({ project, session }: SessionCardProps) {
         `bg-${stylesPerSession.bgColor}`,
         `bg-opacity-${stylesPerSession.bgOpacity}`,
         "p-0",
-        "pb-3",
+        "pb-3"
       )}
     >
-      <img
-        src={stylesPerSession.sessionLine}
-        className={cx("position-absolute", styles.SessionLine)}
-        alt="Session line indicator"
-        loading="lazy"
-      />
-      <div className={cx("ms-5", "px-3", "pt-3")}>
+      {launcherCategory === "session" && (
+        <img
+          src={stylesPerSession.sessionLine}
+          className={cx("position-absolute", styles.SessionLine)}
+          alt="Session line indicator"
+          loading="lazy"
+        />
+      )}
+      <div
+        className={cx(
+          launcherCategory === "session" ? "ms-5" : "ms-2",
+          "px-3",
+          "pt-3"
+        )}
+      >
         <Row className="g-2">
           <Col xs={12} xl="auto">
             <Row className="g-2">
@@ -67,11 +82,14 @@ export default function SessionCard({ project, session }: SessionCardProps) {
                   "d-inline-block",
                   "link-primary",
                   "text-body",
-                  "mt-1",
+                  "mt-1"
                 )}
               >
                 <span className={cx("small", "text-muted", "me-3")}>
-                  Session
+                  <span className={cx("fw-bold")}>
+                    {launcherDefinition.text.display}
+                  </span>
+                  {session.submission_id ? `: ${session.submission_id}` : ""}
                 </span>
               </Col>
               <Col
@@ -79,7 +97,11 @@ export default function SessionCard({ project, session }: SessionCardProps) {
                 xs="12"
                 xl="auto"
               >
-                <SessionStatusV2Label session={session} variant="card" />
+                <SessionStatusV2Label
+                  session={session}
+                  variant="card"
+                  includeIcon={launcherCategory === "job"}
+                />
               </Col>
               <Col
                 xs="auto"
@@ -102,7 +124,7 @@ export default function SessionCard({ project, session }: SessionCardProps) {
                 session={session}
                 showSessionUrl={getShowSessionUrlByProject(
                   project,
-                  session.name,
+                  session.name
                 )}
               />
             </div>
diff --git a/client/src/features/sessionsV2/SessionList/SessionLauncherCard.tsx b/client/src/features/sessionsV2/SessionList/SessionLauncherCard.tsx
index 514adb2803..5f684bdc9b 100644
--- a/client/src/features/sessionsV2/SessionList/SessionLauncherCard.tsx
+++ b/client/src/features/sessionsV2/SessionList/SessionLauncherCard.tsx
@@ -369,6 +369,7 @@ export default function SessionLauncherCard({
                   key={`session-item-${session.name}`}
                   project={project}
                   session={session}
+                  launcherCategory={launcherCategory}
                 />
               ))}
           </div>
diff --git a/client/src/features/sessionsV2/SessionList/SessionLauncherDisplay.tsx b/client/src/features/sessionsV2/SessionList/SessionLauncherDisplay.tsx
index e48b7ba62e..a68da7d3e1 100644
--- a/client/src/features/sessionsV2/SessionList/SessionLauncherDisplay.tsx
+++ b/client/src/features/sessionsV2/SessionList/SessionLauncherDisplay.tsx
@@ -25,6 +25,7 @@ import { useGetSessionsQuery as useGetSessionsQueryV2 } from "../api/sessionsV2.
 import UpdateSessionLauncherMetadataModal from "../components/SessionModals/UpdateSessionLauncherMetadataModal";
 import UpdateSessionLauncherEnvironmentModal from "../components/SessionModals/UpdateSessionLauncherModal";
 import DeleteSessionV2Modal from "../DeleteSessionLauncherModal";
+import { SESSION_LAUNCHER_KIND } from "../sessionsV2.types";
 import SessionLaunchLinkModal from "../SessionView/SessionLaunchLinkModal";
 import { SessionView } from "../SessionView/SessionView";
 import SessionLauncherCard from "./SessionLauncherCard";
@@ -69,7 +70,9 @@ export function SessionLauncherDisplay({
     });
   }, [launcherHash, setHash]);
 
-  const { data: sessions } = useGetSessionsQueryV2({});
+  const { data: sessions } = useGetSessionsQueryV2({
+    sessionType: launcher.launcher_type,
+  });
 
   const filteredSessions = useMemo(
     () =>
@@ -95,7 +98,9 @@ export function SessionLauncherDisplay({
         toggleUpdateEnvironment={toggleUpdateEnvironment}
         toggleDelete={toggleDelete}
         toggleShareLink={
-          launcher.launcher_type === "interactive" ? toggleShareLink : undefined
+          launcher.launcher_type === SESSION_LAUNCHER_KIND.INTERACTIVE
+            ? toggleShareLink
+            : undefined
         }
         toggleSessionView={toggleSessionView}
       />
diff --git a/client/src/features/sessionsV2/SessionStyles.constants.ts b/client/src/features/sessionsV2/SessionStyles.constants.ts
index eabe384032..37212945f0 100644
--- a/client/src/features/sessionsV2/SessionStyles.constants.ts
+++ b/client/src/features/sessionsV2/SessionStyles.constants.ts
@@ -16,6 +16,13 @@
  * limitations under the License.
  */
 
+import {
+  Check2Circle,
+  ExclamationDiamond,
+  Gear,
+  Hourglass,
+} from "react-bootstrap-icons";
+
 import blockIcon from "../../styles/assets/block.svg";
 import failedIcon from "../../styles/assets/failed.svg";
 import lineBlock from "../../styles/assets/lineBlock.svg";
@@ -45,6 +52,7 @@ export const SESSION_STYLES = {
     borderColor: "border-warning",
     sessionLine: linePlaying,
     sessionIcon: playingIcon,
+    jobIcon: ExclamationDiamond,
   },
   SUCCESS: {
     textColorCard: "text-success-emphasis",
@@ -54,6 +62,7 @@ export const SESSION_STYLES = {
     borderColor: "border-success",
     sessionLine: linePlaying,
     sessionIcon: playingIcon,
+    jobIcon: Check2Circle,
   },
   HIBERNATED: {
     textColorCard: "text-dark-emphasis",
@@ -63,6 +72,7 @@ export const SESSION_STYLES = {
     borderColor: "border-dark-subtle",
     sessionLine: linePaused,
     sessionIcon: pausedIcon,
+    jobIcon: Hourglass,
   },
   FAILED: {
     textColorCard: "text-danger-emphasis",
@@ -72,6 +82,7 @@ export const SESSION_STYLES = {
     borderColor: "border-danger",
     sessionLine: lineFailed,
     sessionIcon: failedIcon,
+    jobIcon: ExclamationDiamond,
   },
   STOPPING: {
     textColorCard: "text-warning-emphasis",
@@ -81,6 +92,17 @@ export const SESSION_STYLES = {
     borderColor: "border-warning",
     sessionLine: lineStopped,
     sessionIcon: stoppedIcon,
+    jobIcon: Hourglass,
+  },
+  RUNNING_JOB: {
+    textColorCard: "text-warning-emphasis",
+    textColorList: "text-warning-emphasis",
+    bgColor: "warning",
+    bgOpacity: 10,
+    borderColor: "border-warning",
+    sessionLine: linePlaying,
+    sessionIcon: playingIcon,
+    jobIcon: Gear,
   },
   DEFAULT: {
     textColorCard: "text-warning-emphasis",
@@ -90,6 +112,7 @@ export const SESSION_STYLES = {
     borderColor: "border-warning",
     sessionLine: lineBlock,
     sessionIcon: blockIcon,
+    jobIcon: Gear,
   },
 } as const;
 
@@ -102,6 +125,15 @@ export const SESSION_TITLE = {
   [SESSION_STATES.SUCCEEDED]: "Session succeeded (TBD)",
   default: "Unknown status",
 };
+export const JOB_TITLE = {
+  [SESSION_STATES.RUNNING]: "My running job",
+  [SESSION_STATES.STARTING]: "My running job...",
+  [SESSION_STATES.STOPPING]: "Dismissing my job...",
+  [SESSION_STATES.HIBERNATED]: "Paused job",
+  [SESSION_STATES.FAILED]: "Errored job", //eslint-disable-line spellcheck/spell-checker
+  [SESSION_STATES.SUCCEEDED]: "Completed job",
+  default: "Unknown status",
+};
 
 export const SESSION_TITLE_DASHBOARD = {
   [SESSION_STATES.RUNNING]: "Running session",
@@ -112,3 +144,13 @@ export const SESSION_TITLE_DASHBOARD = {
   [SESSION_STATES.SUCCEEDED]: "Session succeeded (TBD)",
   default: "Unknown status",
 };
+
+export const JOB_TITLE_DASHBOARD = {
+  [SESSION_STATES.RUNNING]: "Running job",
+  [SESSION_STATES.STARTING]: "Submitting job",
+  [SESSION_STATES.STOPPING]: "Dismissing job...",
+  [SESSION_STATES.HIBERNATED]: "Paused job",
+  [SESSION_STATES.FAILED]: "Errored job", //eslint-disable-line spellcheck/spell-checker
+  [SESSION_STATES.SUCCEEDED]: "Completed job",
+  default: "Unknown status",
+};
diff --git a/client/src/features/sessionsV2/SessionView/SessionView.tsx b/client/src/features/sessionsV2/SessionView/SessionView.tsx
index f2d898e73b..72d6b908db 100644
--- a/client/src/features/sessionsV2/SessionView/SessionView.tsx
+++ b/client/src/features/sessionsV2/SessionView/SessionView.tsx
@@ -77,9 +77,10 @@ import { DEFAULT_URL } from "../session.constants";
 import {
   getLauncherCategory,
   getLauncherCategoryDefinition,
+  sessionLauncherKindToCategory,
 } from "../session.utils";
 import { getShowSessionUrlByProject, SessionV2Actions } from "../SessionsV2";
-import { SessionV2 } from "../sessionsV2.types";
+import { LauncherCategory, SessionV2 } from "../sessionsV2.types";
 import StartSessionButton from "../StartSessionButton";
 import EnvironmentItem from "./EnvironmentItem";
 import EnvVariablesCard from "./EnvVariablesCard";
@@ -128,9 +129,10 @@ function SessionCard({
   session: SessionV2;
   project: Project;
 }) {
+  const launcherCategory = sessionLauncherKindToCategory(session.session_type);
   return (
     <SessionCardContent
-      color={getSessionColor(session.status.state)}
+      color={getSessionColor(session.status.state, launcherCategory)}
       contentDescription={<SessionStatusV2Description session={session} />}
       contentLabel={<SessionStatusV2Badge session={session} />}
       contentSession={
@@ -193,17 +195,21 @@ function SessionCardNotRunning({
   );
 }
 
-function getSessionColor(state: string) {
+function getSessionColor(state: string, launcherCategory?: LauncherCategory) {
   return state === "running"
     ? "success"
-    : state === "starting"
+    : state === "starting" && launcherCategory === "session"
     ? "warning"
+    : state === "starting" && launcherCategory === "job"
+    ? "info"
     : state === "stopping"
     ? "warning"
     : state === "hibernated"
     ? "dark"
     : state === "failed"
     ? "danger"
+    : state === "succeeded"
+    ? "success"
     : "dark";
 }
 
diff --git a/client/src/features/sessionsV2/SessionsV2.tsx b/client/src/features/sessionsV2/SessionsV2.tsx
index 502f322145..7ebf610136 100644
--- a/client/src/features/sessionsV2/SessionsV2.tsx
+++ b/client/src/features/sessionsV2/SessionsV2.tsx
@@ -44,7 +44,7 @@ import { useGetSessionsQuery as useGetSessionsQueryV2 } from "./api/sessionsV2.a
 import { LauncherEnvironmentIcon } from "./components/SessionForm/LauncherEnvironmentIcon";
 import SessionLauncherCard from "./SessionList/SessionLauncherCard";
 import { SessionLauncherDisplay } from "./SessionList/SessionLauncherDisplay";
-import { SessionV2 } from "./sessionsV2.types";
+import { SESSION_LAUNCHER_KIND, SessionV2 } from "./sessionsV2.types";
 import { SessionView } from "./SessionView/SessionView";
 
 export function getShowSessionUrlByProject(
@@ -76,7 +76,9 @@ export default function SessionsV2({ project }: SessionsV2Props) {
     data: sessions,
     error: sessionsError,
     isLoading: isLoadingSessions,
-  } = useGetSessionsQueryV2({});
+  } = useGetSessionsQueryV2({
+    sessionType: SESSION_LAUNCHER_KIND.NON_INTERACTIVE,
+  });
 
   const isLoading = isLoadingLaunchers || isLoadingSessions;
   const error = launchersError || sessionsError;
@@ -110,7 +112,7 @@ export default function SessionsV2({ project }: SessionsV2Props) {
       <p className="text-body-secondary">
         {totalSessions > 0
           ? "Launchers are available to everyone who can see the project. Only you can see your running sessions and jobs."
-          : "Define interactive environments in which to do your work and share it  with others."}
+          : "Define interactive or not environments in which to do your work and share it  with others."}
       </p>
       {loading}
       {totalSessions > 0 && !isLoading && (
diff --git a/client/src/features/sessionsV2/api/computeResources.openapi.json b/client/src/features/sessionsV2/api/computeResources.openapi.json
index 49c011fdd0..b1cf539b6b 100644
--- a/client/src/features/sessionsV2/api/computeResources.openapi.json
+++ b/client/src/features/sessionsV2/api/computeResources.openapi.json
@@ -1723,6 +1723,9 @@
           },
           "node_affinities": {
             "$ref": "#/components/schemas/NodeAffinityList"
+          },
+          "quota_enforced": {
+            "$ref": "#/components/schemas/QuotaEnforced"
           }
         }
       },
@@ -1756,6 +1759,14 @@
           },
           "node_affinities": {
             "$ref": "#/components/schemas/NodeAffinityList"
+          },
+          "quota_enforced": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/QuotaEnforced"
+              }
+            ],
+            "default": false
           }
         },
         "required": [
@@ -1774,7 +1785,8 @@
           "memory": 2,
           "gpu": 0,
           "max_storage": 100,
-          "default_storage": 10
+          "default_storage": 10,
+          "quota_enforced": false
         }
       },
       "ResourceClassPatch": {
@@ -1841,6 +1853,14 @@
           },
           "id": {
             "$ref": "#/components/schemas/IntegerId"
+          },
+          "quota_enforced": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/QuotaEnforced"
+              }
+            ],
+            "default": false
           }
         },
         "required": [
@@ -1861,6 +1881,7 @@
           "gpu": 0,
           "max_storage": 100,
           "default_storage": 10,
+          "quota_enforced": false,
           "id": 1
         }
       },
@@ -1917,6 +1938,7 @@
             "gpu": 0,
             "max_storage": 100,
             "default_storage": 10,
+            "quota_enforced": true,
             "id": 1
           },
           {
@@ -1927,6 +1949,7 @@
             "gpu": 2,
             "max_storage": 10000,
             "default_storage": 10,
+            "quota_enforced": true,
             "id": 2
           }
         ]
@@ -1946,6 +1969,7 @@
             "gpu": 0,
             "max_storage": 100,
             "default_storage": 10,
+            "quota_enforced": true,
             "id": 1
           },
           {
@@ -1956,6 +1980,7 @@
             "gpu": 2,
             "max_storage": 10000,
             "default_storage": 10,
+            "quota_enforced": true,
             "id": 2
           }
         ]
@@ -2570,6 +2595,11 @@
         "description": "A default selection for resource classes or resource pools",
         "example": false
       },
+      "QuotaEnforced": {
+        "type": "boolean",
+        "description": "Whether sessions in this resource class should be hibernated when quota is exhausted",
+        "example": true
+      },
       "PublicFlag": {
         "type": "boolean",
         "description": "A resource pool whose classes can be accessed by anyone",
diff --git a/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx b/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx
index bf5c4f4566..ad60470171 100644
--- a/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx
+++ b/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx
@@ -57,6 +57,7 @@ import {
   usePatchSessionsBySessionIdMutation as usePatchSessionMutation,
   useDeleteSessionsBySessionIdMutation as useStopSessionMutation,
 } from "../../api/sessionsV2.api";
+import { sessionLauncherKindToCategory } from "../../session.utils";
 import {
   SessionResources,
   SessionStatus,
@@ -208,7 +209,7 @@ export default function ActiveSessionButton({
   const [showModalStopSession, setShowModalStopSession] = useState(false);
   const toggleStopSession = useCallback(
     () => setShowModalStopSession((show) => !show),
-    [],
+    []
   );
 
   // Handle modifying session
@@ -227,7 +228,7 @@ export default function ActiveSessionButton({
         });
       }
     },
-    [modifySession, onResumeSession, session.name, session.status.state],
+    [modifySession, onResumeSession, session.name, session.status.state]
   );
   useEffect(() => {
     if (errorModifySession) {
@@ -241,19 +242,19 @@ export default function ActiveSessionButton({
   const [showModalModifySession, setShowModalModifySession] = useState(false);
   const toggleModifySession = useCallback(
     () => setShowModalModifySession((show) => !show),
-    [],
+    []
   );
 
   const status = session.status.state;
   const failedScheduling =
     status === "failed" &&
     (!!session.status.message?.includes(
-      "The resource quota has been exceeded.",
+      "The resource quota has been exceeded."
     ) ||
       !!session.status.message?.includes(
         // TODO: fix spelling in notebooks
         // eslint-disable-next-line spellcheck/spell-checker
-        "Your session cannot be scheduled due to insufficent resources.",
+        "Your session cannot be scheduled due to insufficent resources."
       ));
 
   const buttonClassName = cx(
@@ -263,48 +264,24 @@ export default function ActiveSessionButton({
     "start-session-button",
     "py-1",
     "px-2",
-    "btn-outline-primary",
+    "btn-outline-primary"
   );
 
+  const launcherCategory = sessionLauncherKindToCategory(session.session_type);
+
   const defaultAction =
-    status === "stopping" || isStopping ? (
-      <Button color="primary" data-cy="stopping-btn" disabled>
-        <Loader className="me-1" inline size={16} />
-        Shutting down
-      </Button>
-    ) : isHibernating ? (
-      <Button color="primary" data-cy="stopping-btn" disabled>
-        <Loader className="me-1" inline size={16} />
-        Pausing
-      </Button>
-    ) : status === "starting" ? (
-      <Link
-        className={cx("btn", "btn-primary")}
-        data-cy="open-session"
-        to={showSessionUrl}
-      >
-        <ArrowRightCircle className={cx("bi", "me-1")} />
-        Open
-      </Link>
-    ) : status === "running" ? (
-      <>
-        <Button
-          color="outline-primary"
-          className={buttonClassName}
-          data-cy={
-            isUserLoggedIn ? "pause-session-button" : "delete-session-button"
-          }
-          onClick={isUserLoggedIn ? onHibernateSession : onStopSession}
-        >
-          {isUserLoggedIn ? (
-            <span className="align-self-start">
-              <PauseCircle className={cx("bi", "me-1")} />
-            </span>
-          ) : (
-            <Trash className={cx("bi", "me-1")} />
-          )}
-          {isUserLoggedIn ? "Pause" : "Delete"}
+    launcherCategory === "session" ? (
+      status === "stopping" || isStopping ? (
+        <Button color="primary" data-cy="stopping-btn" disabled>
+          <Loader className="me-1" inline size={16} />
+          Shutting down
+        </Button>
+      ) : isHibernating ? (
+        <Button color="primary" data-cy="stopping-btn" disabled>
+          <Loader className="me-1" inline size={16} />
+          Pausing
         </Button>
+      ) : status === "starting" ? (
         <Link
           className={cx("btn", "btn-primary")}
           data-cy="open-session"
@@ -313,74 +290,184 @@ export default function ActiveSessionButton({
           <ArrowRightCircle className={cx("bi", "me-1")} />
           Open
         </Link>
-      </>
-    ) : status === "hibernated" ? (
-      <Button
-        color="primary"
-        data-cy="resume-session-button"
-        disabled={isResuming}
-        onClick={onResumeSession}
-      >
-        {isResuming ? (
-          <>
-            <Loader className="me-1" inline size={16} />
-            Resuming
-          </>
-        ) : (
-          <>
-            <PlayFill className={cx("bi", "me-1")} />
-            Resume
-          </>
-        )}
-      </Button>
-    ) : failedScheduling ? (
-      <>
+      ) : status === "running" ? (
+        <>
+          <Button
+            color="outline-primary"
+            className={buttonClassName}
+            data-cy={
+              isUserLoggedIn ? "pause-session-button" : "delete-session-button"
+            }
+            onClick={isUserLoggedIn ? onHibernateSession : onStopSession}
+          >
+            {isUserLoggedIn ? (
+              <span className="align-self-start">
+                <PauseCircle className={cx("bi", "me-1")} />
+              </span>
+            ) : (
+              <Trash className={cx("bi", "me-1")} />
+            )}
+            {isUserLoggedIn ? "Pause" : "Delete"}
+          </Button>
+          <Link
+            className={cx("btn", "btn-primary")}
+            data-cy="open-session"
+            to={showSessionUrl}
+          >
+            <ArrowRightCircle className={cx("bi", "me-1")} />
+            Open
+          </Link>
+        </>
+      ) : status === "hibernated" ? (
+        <Button
+          color="primary"
+          data-cy="resume-session-button"
+          disabled={isResuming}
+          onClick={onResumeSession}
+        >
+          {isResuming ? (
+            <>
+              <Loader className="me-1" inline size={16} />
+              Resuming
+            </>
+          ) : (
+            <>
+              <PlayFill className={cx("bi", "me-1")} />
+              Resume
+            </>
+          )}
+        </Button>
+      ) : failedScheduling ? (
+        <>
+          <Button
+            color="outline-primary"
+            data-cy="show-logs-session-button"
+            onClick={toggleLogsModal}
+          >
+            <FileEarmarkText className={cx("bi", "me-1")} />
+            Get logs
+          </Button>
+          <Button
+            color="primary"
+            className={buttonClassName}
+            data-cy="modify-session-button"
+            onClick={toggleModifySession}
+          >
+            <Tools className={cx("bi", "me-1")} />
+            Modify
+          </Button>
+        </>
+      ) : (
+        <>
+          <Button
+            color="outline-primary"
+            data-cy={"show-logs-session-button"}
+            onClick={toggleLogsModal}
+          >
+            <FileEarmarkText className={cx("bi", "me-1")} />
+            Get logs
+          </Button>
+          <Button
+            color="primary"
+            data-cy={
+              isUserLoggedIn ? "pause-session-button" : "delete-session-button"
+            }
+            onClick={isUserLoggedIn ? onHibernateSession : onStopSession}
+          >
+            {isUserLoggedIn ? (
+              <span className="align-self-start">
+                <PauseCircle className={cx("bi", "me-1")} />
+              </span>
+            ) : (
+              <Trash className={cx("bi", "me-1")} />
+            )}
+            {isUserLoggedIn ? "Pause" : "Delete"}
+          </Button>
+        </>
+      )
+    ) : launcherCategory === "job" ? (
+      status === "stopping" || isStopping ? (
+        <Button color="primary" data-cy="stopping-btn" disabled>
+          <Loader className="me-1" inline size={16} />
+          Dismissing job
+        </Button>
+      ) : isHibernating ? (
+        <Button color="primary" data-cy="stopping-btn" disabled>
+          <Loader className="me-1" inline size={16} />
+          Pausing
+        </Button>
+      ) : status === "starting" ? (
+        <>
+          <Button
+            color="outline-primary"
+            data-cy="show-logs-session-button"
+            onClick={toggleLogsModal}
+          >
+            <FileEarmarkText className={cx("bi", "me-1")} />
+            Logs
+          </Button>
+        </>
+      ) : status === "running" ? (
         <Button
           color="outline-primary"
           data-cy="show-logs-session-button"
           onClick={toggleLogsModal}
         >
           <FileEarmarkText className={cx("bi", "me-1")} />
-          Get logs
+          Logs
         </Button>
+      ) : status === "hibernated" ? (
         <Button
           color="primary"
-          className={buttonClassName}
-          data-cy="modify-session-button"
-          onClick={toggleModifySession}
+          data-cy="resume-session-button"
+          disabled={isResuming}
+          onClick={onResumeSession}
         >
-          <Tools className={cx("bi", "me-1")} />
-          Modify
+          {isResuming ? (
+            <>
+              <Loader className="me-1" inline size={16} />
+              Resuming
+            </>
+          ) : (
+            <>
+              <PlayFill className={cx("bi", "me-1")} />
+              Resume
+            </>
+          )}
         </Button>
-      </>
-    ) : (
-      <>
+      ) : failedScheduling ? (
+        <>
+          <Button
+            color="outline-primary"
+            data-cy="show-logs-session-button"
+            onClick={toggleLogsModal}
+          >
+            <FileEarmarkText className={cx("bi", "me-1")} />
+            Get logs
+          </Button>
+        </>
+      ) : status === "succeeded" ? (
         <Button
           color="outline-primary"
-          data-cy={"show-logs-session-button"}
+          data-cy="show-logs-session-button"
           onClick={toggleLogsModal}
         >
           <FileEarmarkText className={cx("bi", "me-1")} />
-          Get logs
+          Logs
         </Button>
-        <Button
-          color="primary"
-          data-cy={
-            isUserLoggedIn ? "pause-session-button" : "delete-session-button"
-          }
-          onClick={isUserLoggedIn ? onHibernateSession : onStopSession}
-        >
-          {isUserLoggedIn ? (
-            <span className="align-self-start">
-              <PauseCircle className={cx("bi", "me-1")} />
-            </span>
-          ) : (
-            <Trash className={cx("bi", "me-1")} />
-          )}
-          {isUserLoggedIn ? "Pause" : "Delete"}
-        </Button>
-      </>
-    );
+      ) : (
+        <>
+          <Button
+            color="outline-primary"
+            data-cy={"show-logs-session-button"}
+            onClick={toggleLogsModal}
+          >
+            <FileEarmarkText className={cx("bi", "me-1")} />
+            Get logs
+          </Button>
+        </>
+      )
+    ) : null;
 
   const hibernateAction = status !== "stopping" &&
     (status !== "failed" || failedScheduling) &&
@@ -407,6 +494,13 @@ export default function ActiveSessionButton({
     </DropdownItem>
   );
 
+  const dismissAction = launcherCategory === "job" && (
+    <DropdownItem data-cy="delete-session-button" onClick={onStopSession}>
+      <XLg className={cx("bi", "me-1")} />
+      Dismiss job
+    </DropdownItem>
+  );
+
   const modifyAction = (status === "hibernated" || status === "failed") &&
     !isStopping &&
     !isHibernating &&
@@ -435,6 +529,27 @@ export default function ActiveSessionButton({
     </DropdownItem>
   );
 
+  if (launcherCategory === "job") {
+    return (
+      <div className={cx("d-flex", "flex-row", "gap-2")}>
+        <ButtonWithMenuV2
+          className={cx(className)}
+          color={"outline-primary"}
+          default={defaultAction}
+          preventPropagation
+          size="sm"
+        >
+          {dismissAction}
+        </ButtonWithMenuV2>
+        <SessionLogsModal
+          isOpen={showLogsModal}
+          sessionName={session.name}
+          toggle={toggleLogsModal}
+        />
+      </div>
+    );
+  }
+
   return (
     <div className={cx("d-flex", "flex-row", "gap-2")}>
       <ButtonWithMenuV2
@@ -617,7 +732,7 @@ function ModifySessionModalContent({
         toggleModal();
       };
     },
-    [currentSessionClass, onModifySession, toggleModal],
+    [currentSessionClass, onModifySession, toggleModal]
   );
 
   useEffect(() => {
diff --git a/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx b/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx
new file mode 100644
index 0000000000..7801c30556
--- /dev/null
+++ b/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx
@@ -0,0 +1,520 @@
+/*!
+ * Copyright 2026 - 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 { skipToken } from "@reduxjs/toolkit/query";
+import cx from "classnames";
+import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
+import { Controller, useForm } from "react-hook-form";
+import {
+  Button,
+  Form,
+  FormText,
+  Input,
+  Label,
+  Modal,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+} from "reactstrap";
+
+import { SuccessAlert, WarnAlert } from "~/components/Alert";
+import RtkOrDataServicesError from "~/components/errors/RtkOrDataServicesError";
+import { Loader } from "~/components/Loader";
+import useProjectPermissions from "~/features/ProjectPageV2/utils/useProjectPermissions.hook";
+import AppContext from "~/utils/context/appContext";
+import { DEFAULT_APP_PARAMS } from "~/utils/context/appParams.constants";
+import { useGetResourcePoolsQuery } from "../../api/computeResources.api";
+import {
+  useGetEnvironmentsByEnvironmentIdBuildsQuery as useGetBuildsQuery,
+  type SessionLauncher,
+} from "../../api/sessionLaunchersV2.api";
+import {
+  useGetSessionsImagesQuery,
+  useGetSessionsQuery,
+  usePostSessionsMutation,
+} from "../../api/sessionsV2.api";
+import { SUBMISSION_ID_VALIDATION_MESSAGE } from "../../session.constants";
+import {
+  buildJobSessionPostRequest,
+  generateSubmissionId,
+  getJSONStringArray,
+  getSubmitJobEnvironmentKindLabel,
+  isSubmissionIdTaken,
+  isValidJSONStringArray,
+  validateSubmissionId,
+} from "../../session.utils";
+import { BuildStatusDescription } from "../BuildStatusComponents";
+import SessionClassSelector from "../SessionClassSelector";
+import { LauncherEnvironmentIcon } from "../SessionForm/LauncherEnvironmentIcon";
+import {
+  ErrorOrNotAvailableResourcePools,
+  FetchingResourcePools,
+} from "./ResourceClassWarning";
+import {
+  getSubmitJobDefaultValues,
+  resolveDefaultResourceClass,
+  useSubmitJobEnvironmentFlags,
+  type SubmitJobForm,
+} from "./useSubmitJobForm";
+
+interface SubmitJobModalProps {
+  isOpen: boolean;
+  launcher: SessionLauncher;
+  toggle: () => void;
+}
+
+function SubmitJobJsonField({
+  control,
+  name,
+  label,
+  helpText,
+  info,
+  isOptional,
+  dataCy,
+  id,
+  rules,
+}: {
+  control: ReturnType<typeof useForm<SubmitJobForm>>["control"];
+  name: "command" | "args";
+  label: string;
+  helpText: string;
+  info: string;
+  isOptional?: boolean;
+  dataCy: string;
+  id: string;
+  rules?: Record<string, unknown>;
+}) {
+  return (
+    <div>
+      <Label className="form-label" for={id}>
+        {label}
+        {isOptional && (
+          <span className={cx("small", "text-muted", "ms-1")}>(Optional)</span>
+        )}
+      </Label>
+      <Controller
+        control={control}
+        name={name}
+        rules={{
+          validate: (value) => isValidJSONStringArray(value?.toString()),
+          ...rules,
+        }}
+        render={({ field, fieldState: { error } }) => (
+          <>
+            <textarea
+              className={cx("w-100 form-control", error && "is-invalid")}
+              data-cy={dataCy}
+              id={id}
+              rows={2}
+              {...field}
+            />
+            {error && (
+              <div className="invalid-feedback mt-0 d-block">
+                {error.message}
+              </div>
+            )}
+          </>
+        )}
+      />
+      <FormText tag="div">{helpText}</FormText>
+      {info && <FormText tag="div">{info}</FormText>}
+    </div>
+  );
+}
+
+export default function SubmitJobModal({
+  isOpen,
+  launcher,
+  toggle,
+}: SubmitJobModalProps) {
+  const submissionIdInputRef = useRef<HTMLInputElement>(null);
+  const { params } = useContext(AppContext);
+  const imageBuildersEnabled =
+    params?.IMAGE_BUILDERS_ENABLED ?? DEFAULT_APP_PARAMS.IMAGE_BUILDERS_ENABLED;
+  const { environment } = launcher;
+  const projectId = launcher.project_id;
+
+  const {
+    isCustomImageEnvironment,
+    isCodeEnvironment,
+    isExternalImageEnvironment,
+  } = useSubmitJobEnvironmentFlags(launcher);
+
+  const permissions = useProjectPermissions({ projectId });
+  const canWrite = permissions?.write === true;
+
+  const {
+    data: resourcePools,
+    isLoading: isLoadingResourcePools,
+    isError: isErrorResourcePools,
+  } = useGetResourcePoolsQuery({});
+
+  const {
+    data: sessions,
+    isLoading: isLoadingSessions,
+    isFetching: isFetchingSessions,
+  } = useGetSessionsQuery(isOpen ? {} : skipToken);
+
+  const { data: builds, isLoading: isLoadingBuilds } = useGetBuildsQuery(
+    isOpen && imageBuildersEnabled && isCodeEnvironment
+      ? { environmentId: environment.id }
+      : skipToken
+  );
+
+  const lastBuild = builds?.at(0);
+  const lastSuccessfulBuild = builds?.find(
+    (build) => build.status === "succeeded" && build.id !== lastBuild?.id
+  );
+  const useOldImage =
+    isCodeEnvironment &&
+    lastBuild?.status !== "succeeded" &&
+    !!lastSuccessfulBuild;
+
+  const { data: containerImage, isLoading: isLoadingContainerImage } =
+    useGetSessionsImagesQuery(
+      isOpen &&
+        isExternalImageEnvironment &&
+        environment.container_image != null
+        ? { imageUrl: environment.container_image }
+        : skipToken
+    );
+
+  const displayLaunchSession =
+    !isCodeEnvironment ||
+    (isCodeEnvironment && lastBuild?.status === "succeeded") ||
+    (isCodeEnvironment && containerImage?.accessible) ||
+    useOldImage;
+
+  const defaultValues = useMemo(
+    () => getSubmitJobDefaultValues(launcher),
+    [launcher]
+  );
+
+  const { control, handleSubmit, reset, setValue, watch } =
+    useForm<SubmitJobForm>({
+      defaultValues,
+    });
+
+  const [postSession, postSessionResult] = usePostSessionsMutation();
+
+  // eslint-disable-next-line react-hooks/incompatible-library
+  const watchResourceClass = watch("resourceClass");
+
+  useEffect(() => {
+    if (!isOpen) {
+      reset(defaultValues);
+      postSessionResult.reset();
+      return;
+    }
+    const defaultResourceClass = resolveDefaultResourceClass({
+      launcher,
+      resourcePools,
+    });
+    reset({
+      ...defaultValues,
+      resourceClass: defaultResourceClass,
+      diskStorage:
+        defaultResourceClass?.default_storage ??
+        launcher.disk_storage ??
+        undefined,
+      submissionId: generateSubmissionId(),
+    });
+    submissionIdInputRef.current?.focus();
+  }, [
+    defaultValues,
+    isOpen,
+    launcher,
+    postSessionResult,
+    reset,
+    resourcePools,
+  ]);
+
+  const launcherSessions = useMemo(
+    () =>
+      sessions?.filter(
+        (session) =>
+          session.launcher_id === launcher.id &&
+          session.project_id === projectId
+      ) ?? [],
+    [launcher.id, projectId, sessions]
+  );
+
+  const onSubmit = useCallback(
+    (data: SubmitJobForm) => {
+      if (!data.resourceClass) {
+        return;
+      }
+      const sessionPostRequest = buildJobSessionPostRequest({
+        launcher,
+        submissionId: data.submissionId,
+        resourceClass: data.resourceClass,
+        diskStorage: data.diskStorage,
+        args: data.args,
+      });
+      postSession({ sessionPostRequest });
+    },
+    [launcher, postSession]
+  );
+
+  const isLoadingPrerequisites =
+    isLoadingResourcePools ||
+    isLoadingSessions ||
+    isFetchingSessions ||
+    (isCodeEnvironment && isLoadingBuilds) ||
+    (isExternalImageEnvironment && isLoadingContainerImage);
+
+  const isSubmitDisabled =
+    !canWrite ||
+    !displayLaunchSession ||
+    isLoadingPrerequisites ||
+    !watchResourceClass ||
+    postSessionResult.isLoading;
+
+  const handleToggle = useCallback(() => {
+    toggle();
+  }, [toggle]);
+
+  const resourceClassSelector = isLoadingResourcePools ? (
+    <FetchingResourcePools />
+  ) : !resourcePools || resourcePools.length === 0 || isErrorResourcePools ? (
+    <ErrorOrNotAvailableResourcePools />
+  ) : (
+    <Controller
+      control={control}
+      name="resourceClass"
+      render={({ field: { onChange, value }, fieldState: { error } }) => (
+        <>
+          <SessionClassSelector
+            id="submitJobResourceClass"
+            currentSessionClass={value}
+            resourcePools={resourcePools}
+            onChange={(resourceClass) => {
+              onChange(resourceClass);
+              if (resourceClass) {
+                setValue("diskStorage", resourceClass.default_storage);
+              }
+            }}
+          />
+          {error && (
+            <div className={cx("small", "text-danger")}>
+              {error.message || "Please provide a valid resource class."}
+            </div>
+          )}
+        </>
+      )}
+      rules={{ required: "Please provide a resource class." }}
+    />
+  );
+
+  return (
+    <Modal
+      backdrop="static"
+      centered
+      data-cy="submit-job-modal"
+      isOpen={isOpen}
+      size="lg"
+      toggle={handleToggle}
+    >
+      <ModalHeader tag="h2" toggle={handleToggle}>
+        Review and submit Job
+      </ModalHeader>
+      <ModalBody>
+        {postSessionResult.isSuccess ? (
+          <SuccessAlert dismissible={false} timeout={0}>
+            <p className="fw-bold mb-1">
+              Job{" "}
+              {postSessionResult.data?.submission_id ??
+                watch("submissionId")?.trim()}{" "}
+              submitted successfully
+            </p>
+          </SuccessAlert>
+        ) : (
+          <Form noValidate onSubmit={handleSubmit(onSubmit)}>
+            {postSessionResult.error && (
+              <RtkOrDataServicesError
+                dismissible={false}
+                error={postSessionResult.error}
+              />
+            )}
+            <div className={cx("d-flex", "flex-column", "gap-3")}>
+              <div>
+                <h3
+                  className="fs-2 fw-bold mb-0"
+                  data-cy="submit-job-launcher-name"
+                >
+                  {launcher.name}
+                </h3>
+              </div>
+
+              <div
+                className={cx(
+                  "d-flex",
+                  "flex-wrap",
+                  "align-items-center",
+                  "gap-4"
+                )}
+                data-cy="submit-job-environment"
+              >
+                <span className={cx("text-muted", "small")}>
+                  <LauncherEnvironmentIcon launcher={launcher} />
+                  {getSubmitJobEnvironmentKindLabel(launcher)}
+                </span>
+                {isCodeEnvironment && (
+                  <BuildStatusDescription
+                    status={lastBuild?.status ?? lastSuccessfulBuild?.status}
+                    createdAt={
+                      lastBuild?.created_at ?? lastSuccessfulBuild?.created_at
+                    }
+                    completedAt={
+                      lastBuild?.status === "succeeded"
+                        ? lastBuild?.result?.completed_at
+                        : lastSuccessfulBuild?.status === "succeeded"
+                        ? lastSuccessfulBuild?.result?.completed_at
+                        : undefined
+                    }
+                  />
+                )}
+              </div>
+
+              {useOldImage && lastSuccessfulBuild && (
+                <WarnAlert
+                  className="mb-0"
+                  data-cy="submit-job-old-image-warning"
+                  dismissible={false}
+                >
+                  <p className="mb-1">
+                    The latest build failed or is not ready yet. This job will
+                    run using the last successfully built image.
+                  </p>
+                </WarnAlert>
+              )}
+
+              {isExternalImageEnvironment &&
+                !isLoadingContainerImage &&
+                containerImage?.accessible === false && (
+                  <WarnAlert className="mb-0" dismissible={false}>
+                    <p className="mb-0">
+                      Image accessibility could not be verified. You may still
+                      submit if your integration provides access at runtime.
+                    </p>
+                  </WarnAlert>
+                )}
+
+              <div className="mt-3">
+                <Label className="form-label" for="submitJobNickname">
+                  Submission ID
+                </Label>
+                <Controller
+                  control={control}
+                  name="submissionId"
+                  rules={{
+                    required: SUBMISSION_ID_VALIDATION_MESSAGE.required,
+                    validate: {
+                      format: (value) => validateSubmissionId(value),
+                      unique: (value) => {
+                        const formatResult = validateSubmissionId(value);
+                        if (formatResult !== true) {
+                          return formatResult;
+                        }
+                        if (
+                          isSubmissionIdTaken({
+                            sessions: launcherSessions,
+                            launcherId: launcher.id,
+                            projectId,
+                            submissionId: value,
+                          })
+                        ) {
+                          return SUBMISSION_ID_VALIDATION_MESSAGE.taken;
+                        }
+                        return true;
+                      },
+                    },
+                  }}
+                  render={({ field, fieldState: { error } }) => (
+                    <>
+                      <Input
+                        {...field}
+                        autoFocus
+                        className={cx(error && "is-invalid")}
+                        data-cy="submit-job-nickname-input"
+                        id="submitJobNickname"
+                        innerRef={submissionIdInputRef}
+                        type="text"
+                      />
+                      <div className="invalid-feedback">{error?.message}</div>
+                    </>
+                  )}
+                />
+                <FormText>
+                  Customize the identifier for your job (letters and numbers
+                  only, min 4 characters).
+                </FormText>
+              </div>
+
+              <div>
+                <Label className={cx("form-label", "me-2")}>Command:</Label>
+                <code className="user-select-all">
+                  {getJSONStringArray(launcher.environment?.command)}
+                </code>
+              </div>
+              <SubmitJobJsonField
+                control={control}
+                name="args"
+                label={
+                  isCustomImageEnvironment ? "Command Arguments CMD" : "Job Arg"
+                }
+                helpText='Please enter a valid JSON array format e.g. ["--arg1", "--arg2"]'
+                info=""
+                isOptional={isCustomImageEnvironment}
+                dataCy="submit-job-args-input"
+                id="submitJobArgs"
+              />
+              <div>
+                <Label className="form-label" for="submitJobResourceClass">
+                  Compute resources
+                </Label>
+                <div className="field-group">{resourceClassSelector}</div>
+              </div>
+            </div>
+          </Form>
+        )}
+      </ModalBody>
+      <ModalFooter>
+        <Button color="outline-primary" onClick={handleToggle}>
+          {postSessionResult.isSuccess ? "Close" : "Cancel"}
+        </Button>
+        {!postSessionResult.isSuccess && (
+          <Button
+            color="primary"
+            data-cy="submit-job-confirm-button"
+            disabled={isSubmitDisabled}
+            onClick={handleSubmit(onSubmit)}
+            type="submit"
+          >
+            {postSessionResult.isLoading ? (
+              <Loader className="me-1" inline size={16} />
+            ) : null}
+            Submit job
+          </Button>
+        )}
+      </ModalFooter>
+    </Modal>
+  );
+}
+
+export type { SubmitJobForm };
diff --git a/client/src/features/sessionsV2/components/SessionModals/useSubmitJobForm.ts b/client/src/features/sessionsV2/components/SessionModals/useSubmitJobForm.ts
new file mode 100644
index 0000000000..22381f246a
--- /dev/null
+++ b/client/src/features/sessionsV2/components/SessionModals/useSubmitJobForm.ts
@@ -0,0 +1,85 @@
+/*!
+ * Copyright 2026 - 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 { useMemo } from "react";
+
+import type {
+  ResourceClassWithId,
+  ResourcePoolWithIdFiltered,
+} from "../../api/computeResources.api";
+import type { SessionLauncher } from "../../api/sessionLaunchersV2.api";
+import {
+  getJSONStringArray,
+  getLauncherEnvironmentSelect,
+} from "../../session.utils";
+import type { EnvironmentSelectOption } from "../../sessionsV2.types";
+
+export interface SubmitJobForm {
+  submissionId: string;
+  command: string;
+  args: string;
+  resourceClass: ResourceClassWithId | undefined;
+  diskStorage: number | undefined;
+}
+
+export function getSubmitJobDefaultValues(
+  launcher: SessionLauncher
+): SubmitJobForm {
+  return {
+    submissionId: "",
+    command: getJSONStringArray(launcher.environment?.command) ?? "",
+    args: getJSONStringArray(launcher.environment?.args) ?? "",
+    resourceClass: undefined,
+    diskStorage: launcher.disk_storage ?? undefined,
+  };
+}
+
+export function resolveDefaultResourceClass({
+  launcher,
+  resourcePools,
+}: {
+  launcher: SessionLauncher;
+  resourcePools: ResourcePoolWithIdFiltered[] | undefined;
+}): ResourceClassWithId | undefined {
+  if (resourcePools == null || launcher.resource_class_id == null) {
+    return undefined;
+  }
+  return resourcePools
+    .flatMap((pool) => pool.classes)
+    .find((c) => c.id === launcher.resource_class_id && c.matching);
+}
+
+export function useSubmitJobEnvironmentFlags(launcher: SessionLauncher) {
+  const environmentSelect = getLauncherEnvironmentSelect(launcher);
+  const { environment } = launcher;
+
+  return useMemo(
+    () => ({
+      environmentSelect,
+      isGlobalEnvironment: environmentSelect === "global",
+      isCustomImageEnvironment: environmentSelect === "custom + image",
+      isCodeEnvironment: environmentSelect === "custom + build",
+      isExternalImageEnvironment:
+        environment.environment_kind === "CUSTOM" &&
+        environment.environment_image_source === "image",
+    }),
+    [environment, environmentSelect]
+  );
+}
+
+export type { EnvironmentSelectOption };
diff --git a/client/src/features/sessionsV2/components/SessionStatus/SessionStatus.tsx b/client/src/features/sessionsV2/components/SessionStatus/SessionStatus.tsx
index d36ecf06a3..706e7ad369 100644
--- a/client/src/features/sessionsV2/components/SessionStatus/SessionStatus.tsx
+++ b/client/src/features/sessionsV2/components/SessionStatus/SessionStatus.tsx
@@ -23,7 +23,7 @@ import {
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import cx from "classnames";
 import { ReactNode, useRef } from "react";
-import { CircleFill, Clock, Hourglass } from "react-bootstrap-icons";
+import { CircleFill, Clock, Hourglass, Icon } from "react-bootstrap-icons";
 import {
   Badge,
   PopoverBody,
@@ -31,16 +31,27 @@ import {
   UncontrolledPopover,
 } from "reactstrap";
 
+import {
+  getLauncherCategoryDefinition,
+  sessionLauncherKindToCategory,
+} from "~/features/sessionsV2/session.utils";
 import { Loader } from "../../../../components/Loader";
 import { TimeCaption } from "../../../../components/TimeCaption";
 import type { SessionLauncher } from "../../api/sessionLaunchersV2.api";
 import {
+  JOB_TITLE,
+  JOB_TITLE_DASHBOARD,
   SESSION_STATES,
   SESSION_STYLES,
   SESSION_TITLE,
   SESSION_TITLE_DASHBOARD,
 } from "../../SessionStyles.constants";
-import { SessionStatus, SessionV2 } from "../../sessionsV2.types";
+import {
+  LauncherCategory,
+  SessionLauncherKind,
+  SessionStatus,
+  SessionV2,
+} from "../../sessionsV2.types";
 
 interface PrettySessionErrorMessageProps {
   message: string | null | undefined;
@@ -115,6 +126,7 @@ export function SessionBadge({
 interface ActiveSessionV2Props {
   session: SessionV2;
   variant?: "card" | "list";
+  includeIcon?: boolean;
 }
 interface ActiveSessionDescV2Props extends ActiveSessionV2Props {
   showInfoDetails?: boolean;
@@ -126,26 +138,54 @@ interface ActiveSessionTitleV2Props {
 export function SessionStatusV2Badge({ session }: ActiveSessionV2Props) {
   const { status, image } = session;
   const state = status.state;
+  const launcherCategory = sessionLauncherKindToCategory(session.session_type);
+  const launcherDefinition = getLauncherCategoryDefinition(launcherCategory);
 
   const badge =
     state === "running" && !image ? (
       <SessionBadge className={cx("border-warning", "bg-warning-subtle")}>
         <CircleFill className={cx("bi", "me-1", "text-warning-emphasis")} />
-        <span className="text-warning-emphasis">Running Session</span>
+        <span className="text-warning-emphasis">
+          Running {launcherDefinition.text.display}
+        </span>
       </SessionBadge>
     ) : state === "running" ? (
       <SessionBadge className={cx("border-success", "bg-success-subtle")}>
         <CircleFill className={cx("bi", "me-1", "text-success-emphasis")} />
-        <span className="text-success-emphasis">Running Session</span>
+        <span className="text-success-emphasis">
+          Running {launcherDefinition.text.display}
+        </span>
       </SessionBadge>
-    ) : state === "starting" ? (
+    ) : state === "starting" && launcherCategory === "session" ? (
       <SessionBadge className={cx("border-warning", "bg-warning-subtle")}>
         <Loader
           size={12}
           className={cx("me-1", "text-warning-emphasis")}
           inline
         />
-        <span className="text-warning-emphasis">Launching Session</span>
+        <span className="text-warning-emphasis">
+          {launcherDefinition.text.state.starting}{" "}
+          {launcherDefinition.text.display}
+        </span>
+      </SessionBadge>
+    ) : state === "starting" && launcherCategory === "job" ? (
+      <SessionBadge className={cx("border-success", "bg-success-subtle")}>
+        <Loader
+          size={12}
+          className={cx("me-1", "text-success-emphasis")}
+          inline
+        />
+        <span className="text-success-emphasis">
+          {launcherDefinition.text.state.starting}{" "}
+          {launcherDefinition.text.display}
+        </span>
+      </SessionBadge>
+    ) : state === "succeeded" ? (
+      <SessionBadge className={cx("border-success", "bg-success-subtle")}>
+        <CircleFill className={cx("bi", "me-1", "text-success-emphasis")} />
+        <span className="text-success-emphasis">
+          Completed {launcherDefinition.text.display}
+        </span>
       </SessionBadge>
     ) : state === "stopping" ? (
       <SessionBadge className={cx("border-warning", "bg-warning-subtle")}>
@@ -154,12 +194,16 @@ export function SessionStatusV2Badge({ session }: ActiveSessionV2Props) {
           className={cx("me-1", "text-warning-emphasis")}
           inline
         />
-        <span className="text-warning-emphasis">Shutting down session</span>
+        <span className="text-warning-emphasis">
+          Shutting down {launcherDefinition.text.display}
+        </span>
       </SessionBadge>
     ) : state === "hibernated" ? (
       <SessionBadge className={cx("border-dark-subtle", "bg-light")}>
         <CircleFill className={cx("bi", "me-1", "text-light-emphasis")} />
-        <span className="text-dark-emphasis">Paused Session</span>
+        <span className="text-dark-emphasis">
+          Paused {launcherDefinition.text.display}
+        </span>
       </SessionBadge>
     ) : state === "failed" ? (
       <SessionBadge className={cx("border-danger", "bg-danger-subtle")}>
@@ -167,7 +211,9 @@ export function SessionStatusV2Badge({ session }: ActiveSessionV2Props) {
           className={cx("bi", "me-1", "text-danger-emphasis")}
           fontSize={16}
         />
-        <span className="text-danger-emphasis">Error in Session</span>
+        <span className="text-danger-emphasis">
+          Error in {launcherDefinition.text.display}
+        </span>
       </SessionBadge>
     ) : (
       <SessionBadge className={cx("border-warning", "bg-warning-subtle")}>
@@ -191,12 +237,16 @@ interface SessionStatusStyles {
   borderColor: string;
   sessionLine: string;
   sessionIcon: string;
+  jobIcon: Icon;
 }
 
-export function getSessionStatusStyles(session: {
-  status: { state: string };
-  image?: string;
-}): SessionStatusStyles {
+export function getSessionStatusStyles(
+  session: {
+    status: { state: string };
+    image?: string;
+  },
+  launcherCategory: LauncherCategory
+): SessionStatusStyles {
   const { status, image } = session;
   const state = status.state;
 
@@ -204,11 +254,16 @@ export function getSessionStatusStyles(session: {
     return image ? SESSION_STYLES.SUCCESS : SESSION_STYLES.WARNING;
   }
 
+  if (state === SESSION_STATES.STARTING && launcherCategory === "job") {
+    return SESSION_STYLES.RUNNING_JOB;
+  }
+
   const stateStyleMap: Record<string, SessionStatusStyles> = {
     [SESSION_STATES.STARTING]: SESSION_STYLES.WARNING,
     [SESSION_STATES.STOPPING]: SESSION_STYLES.STOPPING,
     [SESSION_STATES.HIBERNATED]: SESSION_STYLES.HIBERNATED,
     [SESSION_STATES.FAILED]: SESSION_STYLES.FAILED,
+    [SESSION_STATES.SUCCEEDED]: SESSION_STYLES.SUCCESS,
   };
 
   return stateStyleMap[state] ?? SESSION_STYLES.DEFAULT;
@@ -217,9 +272,11 @@ export function getSessionStatusStyles(session: {
 export function SessionStatusV2Label({
   session,
   variant = "card",
+  includeIcon = false,
 }: ActiveSessionV2Props) {
   const { status, image } = session;
-  const styles = getSessionStatusStyles({ status, image });
+  const launcherCategory = sessionLauncherKindToCategory(session.session_type);
+  const styles = getSessionStatusStyles({ status, image }, launcherCategory);
 
   const getStatusMessage = (
     state:
@@ -230,21 +287,40 @@ export function SessionStatusV2Label({
       | "hibernated"
       | "succeeded",
     variant?: "card" | "list",
+    sessionType?: SessionLauncherKind
   ) => {
+    const launcherCategory = sessionType
+      ? sessionLauncherKindToCategory(sessionType)
+      : "session";
     return variant === "list"
-      ? SESSION_TITLE_DASHBOARD[state]
-      : SESSION_TITLE[state];
+      ? launcherCategory === "session"
+        ? SESSION_TITLE_DASHBOARD[state]
+        : JOB_TITLE_DASHBOARD[state]
+      : launcherCategory === "session"
+      ? SESSION_TITLE[state]
+      : JOB_TITLE[state];
   };
 
+  const JobIcon = styles.jobIcon as Icon;
+  const animationIcon = { animation: "spin 2s linear infinite" };
+  // todo: should apply for running and no starting
+  const isRunningJob =
+    status.state === SESSION_STATES.STARTING && launcherCategory === "job";
   return (
     <div className={cx("d-flex", "flex-row", "gap-2", "align-items-center")}>
       <div className={cx("fs-4", "fw-bold")}>
+        {includeIcon && (
+          <JobIcon
+            style={isRunningJob ? animationIcon : undefined}
+            className={cx("bi", "me-1")}
+          />
+        )}
         <span
           className={
             variant === "list" ? styles.textColorList : styles.textColorCard
           }
         >
-          {getStatusMessage(status.state, variant)}
+          {getStatusMessage(status.state, variant, session.session_type)}
         </span>
       </div>
     </div>
@@ -255,7 +331,8 @@ export function SessionStatusV2Description({
   session,
   showInfoDetails = true,
 }: ActiveSessionDescV2Props) {
-  const { started, status } = session;
+  const { started, status, session_type } = session;
+  const launcherCategory = sessionLauncherKindToCategory(session_type);
   return (
     <div
       className={cx(
@@ -263,11 +340,15 @@ export function SessionStatusV2Description({
         "d-flex",
         "flex-row",
         "gap-2",
-        "align-items-center",
+        "align-items-center"
       )}
     >
       {started && (
-        <SessionStatusV2Text startTimestamp={started} status={status} />
+        <SessionStatusV2Text
+          startTimestamp={started}
+          status={status}
+          launcherCategory={launcherCategory}
+        />
       )}
       {showInfoDetails && (
         <SessionListRowStatusExtraDetailsV2 status={status} />
@@ -334,54 +415,64 @@ export function SessionStatusV2Title({
 }: ActiveSessionTitleV2Props) {
   const { status } = session;
   const state = status.state;
+  const launcherCategory = sessionLauncherKindToCategory(session.session_type);
+  const launcherDefinition = getLauncherCategoryDefinition(launcherCategory);
 
   const text =
     state === "running" && !launcher
-      ? "You are currently running a orphan session"
+      ? `You are currently running a orphan ${launcherDefinition.text.inline}`
       : state === "running"
-        ? "You are currently running a session from this launcher"
-        : state === "starting"
-          ? "You are currently starting a session from this launcher"
-          : state === "stopping"
-            ? "You are currently deleting a session from this launcher"
-            : state === "hibernated"
-              ? "You have a paused session from this launcher"
-              : state === "failed"
-                ? "An error was encountered while attempting to launch this session."
-                : null;
+      ? `You are currently running a ${launcherDefinition.text.inline} from this launcher`
+      : state === "starting"
+      ? `You are currently starting a ${launcherDefinition.text.inline} from this launcher`
+      : state === "stopping"
+      ? `You are currently deleting a ${launcherDefinition.text.inline} from this launcher`
+      : state === "hibernated"
+      ? `You have a paused ${launcherDefinition.text.inline} from this launcher`
+      : state === "failed"
+      ? `An error was encountered while attempting to launch this ${launcherDefinition.text.inline}.`
+      : null;
 
   return text ? <p className={cx("fst-italic", "mb-2")}>{text}</p> : null;
 }
 interface SessionStatusV2TextProps {
   startTimestamp: string;
   status: SessionStatus;
+  launcherCategory: LauncherCategory;
 }
 function SessionStatusV2Text({
   startTimestamp,
   status,
+  launcherCategory,
 }: SessionStatusV2TextProps) {
   const { state, will_hibernate_at, will_delete_at } = status;
+  const launcherCategoryDefinition =
+    getLauncherCategoryDefinition(launcherCategory);
   const startTimeText = (
     <TimeCaption datetime={startTimestamp} enableTooltip noCaption />
   );
   const hibernationTimestamp =
-    state === "hibernated" ? (will_hibernate_at ?? "") : null;
+    state === "hibernated" ? will_hibernate_at ?? "" : null;
 
   return state === "running" ? (
     <div className={cx("d-flex", "align-items-center", "gap-2")}>
       <Clock fontSize={16} className="flex-shrink-0" />
-      <span>Launched {startTimeText}</span>
+      <span>
+        {launcherCategoryDefinition.text.state.running} {startTimeText}
+      </span>
     </div>
   ) : state === "starting" ? (
     <div className={cx("d-flex", "align-items-center", "gap-2")}>
       <Clock fontSize={16} className="flex-shrink-0" />
-      <span>Launching since {startTimeText}</span>
+      <span>
+        {launcherCategoryDefinition.text.state.starting} since {startTimeText}
+      </span>
     </div>
   ) : state === "hibernated" && will_delete_at ? (
     <div className={cx("d-flex", "align-items-center", "gap-2")}>
       <Hourglass fontSize={16} className="flex-shrink-0" />
       <span>
-        Session will be deleted in{" "}
+        {launcherCategoryDefinition.text.state.hibernatedAndDelete}{" "}
         <TimeCaption
           datetime={will_delete_at}
           enableTooltip
@@ -394,7 +485,7 @@ function SessionStatusV2Text({
     <div className={cx("d-flex", "align-items-center", "gap-2")}>
       <Clock fontSize={16} className="flex-shrink-0" />
       <span>
-        Paused
+        {launcherCategoryDefinition.text.state.hibernated}{" "}
         <TimeCaption datetime={hibernationTimestamp} enableTooltip noCaption />
       </span>
     </div>
@@ -402,7 +493,7 @@ function SessionStatusV2Text({
     <div className={cx("d-flex", "align-items-center", "gap-2")}>
       <Clock fontSize={16} className="flex-shrink-0" />
       <span>
-        Paused
+        {launcherCategoryDefinition.text.state.hibernated}{" "}
         <MissingHibernationInfo />
       </span>
     </div>
@@ -410,7 +501,8 @@ function SessionStatusV2Text({
     <div className={cx("d-flex", "align-items-center", "gap-2")}>
       <Clock fontSize={16} className="flex-shrink-0" />
       <span>
-        Error {"("}created {startTimeText}
+        {launcherCategoryDefinition.text.state.failed} {"("}created{" "}
+        {startTimeText}
         {")"}
       </span>
     </div>
diff --git a/client/src/features/sessionsV2/components/SubmitJobLauncherAction.tsx b/client/src/features/sessionsV2/components/SubmitJobLauncherAction.tsx
index 17a1f61538..a9c64637dd 100644
--- a/client/src/features/sessionsV2/components/SubmitJobLauncherAction.tsx
+++ b/client/src/features/sessionsV2/components/SubmitJobLauncherAction.tsx
@@ -17,35 +17,49 @@
  */
 
 import cx from "classnames";
+import { useCallback, useState } from "react";
 import { Send } from "react-bootstrap-icons";
 import { Button } from "reactstrap";
 
 import type { SessionLauncher } from "../api/sessionLaunchersV2.api";
+import SubmitJobModal from "./SessionModals/SubmitJobModal";
 
 interface SubmitJobLauncherActionProps {
   launcher: SessionLauncher;
   disabled?: boolean;
 }
 
-// TODO: implement action when submit a job
 export default function SubmitJobLauncherAction({
+  launcher,
   disabled,
 }: SubmitJobLauncherActionProps) {
+  const [isSubmitOpen, setIsSubmitOpen] = useState(false);
+
+  const toggleSubmit = useCallback(() => {
+    setIsSubmitOpen((open) => !open);
+  }, []);
+
   return (
     <>
       <Button
         className="text-nowrap"
         color="primary"
         data-cy="submit-job-button"
+        disabled={disabled}
         onClick={(event) => {
           event.stopPropagation();
+          toggleSubmit();
         }}
         size="sm"
-        disabled={disabled}
       >
         <Send className={cx("bi", "me-1")} />
         Submit
       </Button>
+      <SubmitJobModal
+        isOpen={isSubmitOpen}
+        launcher={launcher}
+        toggle={toggleSubmit}
+      />
     </>
   );
 }
diff --git a/client/src/features/sessionsV2/session.constants.tsx b/client/src/features/sessionsV2/session.constants.tsx
index 18f82d29d4..871bef67d0 100644
--- a/client/src/features/sessionsV2/session.constants.tsx
+++ b/client/src/features/sessionsV2/session.constants.tsx
@@ -39,10 +39,11 @@ import faviconWaitingICO from "../../styles/assets/favicon/FaviconWaiting.ico";
 import faviconWaitingSVG from "../../styles/assets/favicon/FaviconWaiting.svg";
 import faviconWaiting16px from "../../styles/assets/favicon/FaviconWaiting16px.png";
 import faviconWaiting32px from "../../styles/assets/favicon/FaviconWaiting32px.png";
-import type {
-  BuilderSelectorOption,
-  LauncherCategory,
-  LauncherCategoryDefinition,
+import {
+  SESSION_LAUNCHER_KIND,
+  type BuilderSelectorOption,
+  type LauncherCategory,
+  type LauncherCategoryDefinition,
 } from "./sessionsV2.types";
 
 export const DEFAULT_URL = "/";
@@ -210,6 +211,16 @@ export const MIN_SESSION_STORAGE_GB = 1;
 
 export const STEP_SESSION_STORAGE_GB = 1;
 
+/** Matches SessionPostRequest.submission_id in sessionsV2 OpenAPI. */
+export const SUBMISSION_ID_PATTERN = /^[0-9A-Za-z]{4,}$/;
+
+export const SUBMISSION_ID_VALIDATION_MESSAGE = {
+  required: "Please provide a nickname.",
+  pattern:
+    "Submission ID must be at least 4 characters and contain only letters and numbers (no spaces).",
+  taken: "This submission ID is already used for a job on this launcher.",
+};
+
 export const LAUNCHER_OPTIONS: LauncherCategory[] = ["session", "job"];
 
 export const LAUNCHER_BY_CATEGORY: Record<
@@ -217,11 +228,20 @@ export const LAUNCHER_BY_CATEGORY: Record<
   LauncherCategoryDefinition
 > = {
   session: {
-    apiType: "interactive",
+    apiType: SESSION_LAUNCHER_KIND.INTERACTIVE,
     text: {
       display: "Session",
       inline: "session",
       action: "launch",
+      state: {
+        running: "Launched",
+        starting: "Launching",
+        hibernated: "Paused",
+        hibernatedAndDelete: "Session will be deleted in",
+        failed: "Error",
+        stopping: "Stopping",
+        succeeded: "Succeeded",
+      },
     },
     icon: PlayCircle,
     description:
@@ -229,11 +249,20 @@ export const LAUNCHER_BY_CATEGORY: Record<
     allowedEnvironmentSelects: ["global", "custom + build", "custom + image"],
   },
   job: {
-    apiType: "non-interactive",
+    apiType: SESSION_LAUNCHER_KIND.NON_INTERACTIVE,
     text: {
       display: "Job",
       inline: "job",
       action: "submit",
+      state: {
+        running: "Submitted",
+        starting: "Starting",
+        hibernated: "Paused",
+        hibernatedAndDelete: "Job will be dismissed in",
+        failed: "Error",
+        stopping: "Stopping",
+        succeeded: "Completed",
+      },
     },
     icon: Gear,
     description: "Run a process in the background.",
diff --git a/client/src/features/sessionsV2/session.utils.ts b/client/src/features/sessionsV2/session.utils.ts
index 2504ea708f..3d9600496c 100644
--- a/client/src/features/sessionsV2/session.utils.ts
+++ b/client/src/features/sessionsV2/session.utils.ts
@@ -17,15 +17,21 @@
  */
 
 import { FaviconStatus } from "../display/display.types";
-import type { ResourcePoolWithId } from "./api/computeResources.api";
 import type {
-  LauncherType,
+  ResourceClassWithId,
+  ResourcePoolWithId,
+} from "./api/computeResources.api";
+import type {
   EnvironmentList as SessionEnvironmentList,
   SessionLauncher,
   SessionLauncherEnvironmentParams,
   SessionLauncherEnvironmentPatchParams,
 } from "./api/sessionLaunchersV2.api";
-import type { ImageCheckResponse } from "./api/sessionsV2.api";
+import type {
+  ImageCheckResponse,
+  SessionPostRequest,
+  SessionResponse,
+} from "./api/sessionsV2.api";
 import {
   BUILDER_PLATFORMS,
   DEFAULT_PORT,
@@ -33,13 +39,17 @@ import {
   ENV_VARIABLES_RESERVED_PREFIX,
   getCompatibleFrontends,
   LAUNCHER_BY_CATEGORY,
+  SUBMISSION_ID_PATTERN,
+  SUBMISSION_ID_VALIDATION_MESSAGE,
 } from "./session.constants";
-import type {
-  EnvironmentSelectOption,
-  LauncherCategory,
-  LauncherCategoryDefinition,
-  SessionLauncherForm,
-  SessionStatusState,
+import {
+  SESSION_LAUNCHER_KIND,
+  type EnvironmentSelectOption,
+  type LauncherCategory,
+  type LauncherCategoryDefinition,
+  type SessionLauncherForm,
+  type SessionLauncherKind,
+  type SessionStatusState,
 } from "./sessionsV2.types";
 
 export function getLauncherCategoryDefinitionByLauncher(
@@ -50,10 +60,16 @@ export function getLauncherCategoryDefinitionByLauncher(
     : LAUNCHER_BY_CATEGORY["session"];
 }
 
+export function sessionLauncherKindToCategory(
+  kind: SessionLauncherKind
+): LauncherCategory {
+  return kind === SESSION_LAUNCHER_KIND.NON_INTERACTIVE ? "job" : "session";
+}
+
 export function getLauncherCategory(
   launcher: SessionLauncher
 ): LauncherCategory {
-  return isJobLauncher(launcher) ? "job" : "session";
+  return sessionLauncherKindToCategory(launcher.launcher_type);
 }
 
 export function getLauncherCategoryDefinition(
@@ -62,12 +78,14 @@ export function getLauncherCategoryDefinition(
   return LAUNCHER_BY_CATEGORY[category];
 }
 
-export function getLauncherApiType(category: LauncherCategory): LauncherType {
+export function getLauncherApiType(
+  category: LauncherCategory
+): SessionLauncherKind {
   return getLauncherCategoryDefinition(category).apiType;
 }
 
 export function isJobLauncher(launcher: SessionLauncher): boolean {
-  return launcher.launcher_type === "non-interactive";
+  return launcher.launcher_type === SESSION_LAUNCHER_KIND.NON_INTERACTIVE;
 }
 
 export function isGlobalEnvironmentIncluded(environmentsSelect: string[]) {
@@ -558,6 +576,99 @@ export function validateEnvVariableName(name: string): true | string {
   return true;
 }
 
+export function validateSubmissionId(value: string): true | string {
+  const trimmed = value?.trim() ?? "";
+  if (!trimmed) {
+    return SUBMISSION_ID_VALIDATION_MESSAGE.required;
+  }
+  if (/\s/.test(trimmed)) {
+    return SUBMISSION_ID_VALIDATION_MESSAGE.pattern;
+  }
+  if (!SUBMISSION_ID_PATTERN.test(trimmed)) {
+    return SUBMISSION_ID_VALIDATION_MESSAGE.pattern;
+  }
+  return true;
+}
+
+export function isSubmissionIdTaken({
+  sessions,
+  launcherId,
+  projectId,
+  submissionId,
+}: {
+  sessions: SessionResponse[] | undefined;
+  launcherId: string;
+  projectId: string;
+  submissionId: string;
+}): boolean {
+  const trimmed = submissionId.trim();
+  if (!trimmed || sessions == null) {
+    return false;
+  }
+  return sessions.some(
+    (session) =>
+      session.launcher_id === launcherId &&
+      session.project_id === projectId &&
+      session.submission_id === trimmed
+  );
+}
+
+export interface BuildJobSessionPostRequestArgs {
+  launcher: SessionLauncher;
+  submissionId: string;
+  resourceClass: ResourceClassWithId;
+  diskStorage?: number;
+  command?: string;
+  args?: string;
+}
+
+export function buildJobSessionPostRequest({
+  launcher,
+  submissionId,
+  resourceClass,
+  diskStorage,
+  args,
+}: BuildJobSessionPostRequestArgs): SessionPostRequest {
+  const argsParsed = safeParseJSONStringArray(args ?? "");
+  const request: SessionPostRequest = {
+    launcher_id: launcher.id,
+    submission_id: submissionId.trim(),
+    resource_class_id: resourceClass.id,
+    job_args_override: args ? argsParsed.data : undefined,
+  };
+
+  if (diskStorage != null && diskStorage !== resourceClass.default_storage) {
+    request.disk_storage = diskStorage;
+  }
+
+  // TODO: include command/args overrides when SessionPostRequest supports them.
+
+  return request;
+}
+
+export function getLauncherEnvironmentSelect(
+  launcher: SessionLauncher
+): EnvironmentSelectOption {
+  if (launcher.environment.environment_kind === "GLOBAL") {
+    return "global";
+  }
+  if (launcher.environment.environment_image_source === "build") {
+    return "custom + build";
+  }
+  return "custom + image";
+}
+
+export function getSubmitJobEnvironmentKindLabel(launcher: SessionLauncher) {
+  const { environment } = launcher;
+  if (environment.environment_kind === "GLOBAL") {
+    return "Global environment";
+  }
+  if (environment.environment_image_source === "build") {
+    return "Code based environment";
+  }
+  return "External image environment";
+}
+
 export function isImageCompatibleWith(
   image: ImageCheckResponse,
   platform: ResourcePoolWithId["platform"]
@@ -570,3 +681,26 @@ export function isImageCompatibleWith(
   );
   return imagePlatforms.some((p) => p === platform);
 }
+
+const CHARS = "abcdefghjkmnpqrstuvwxyz23456789";
+
+// Simple consonant/vowel groups to keep IDs more readable
+const CONSONANTS = "bcdfghjkmnpqrstvwxyz";
+const VOWELS = "aeu";
+
+export function generateSubmissionId(): string {
+  let result = "";
+
+  // Build a mostly pronounceable 8-char core
+  for (let i = 0; i < 8; i++) {
+    const source = i % 2 === 0 ? CONSONANTS : VOWELS;
+    result += source[Math.floor(Math.random() * source.length)];
+  }
+
+  // Add 2 random safe chars for extra uniqueness
+  for (let i = 0; i < 2; i++) {
+    result += CHARS[Math.floor(Math.random() * CHARS.length)];
+  }
+
+  return result;
+}
diff --git a/client/src/features/sessionsV2/sessionsV2.types.ts b/client/src/features/sessionsV2/sessionsV2.types.ts
index 9a367a65c0..24a24d7150 100644
--- a/client/src/features/sessionsV2/sessionsV2.types.ts
+++ b/client/src/features/sessionsV2/sessionsV2.types.ts
@@ -31,6 +31,7 @@ import type {
   LauncherType,
   SessionLauncherPost,
 } from "./api/sessionLaunchersV2.api";
+import type { SessionType } from "./api/sessionsV2.generated-api";
 
 export interface SvgIconProps {
   className?: string;
@@ -39,7 +40,15 @@ export interface SvgIconProps {
 
 export type LauncherCategory = "session" | "job";
 
-export type LauncherApiType = LauncherType;
+/** Shared API discriminator for `launcher_type` and `session_type`. */
+export type SessionLauncherKind = LauncherType & SessionType;
+
+export const SESSION_LAUNCHER_KIND = {
+  INTERACTIVE: "interactive",
+  NON_INTERACTIVE: "non-interactive",
+} as const satisfies Record<string, SessionLauncherKind>;
+
+export type LauncherApiType = SessionLauncherKind;
 
 export type EnvironmentSelectOption =
   | "global"
@@ -52,6 +61,15 @@ export interface LauncherCategoryDefinition {
     display: string;
     inline: string;
     action: string;
+    state: {
+      running: string;
+      starting: string;
+      hibernated: string;
+      hibernatedAndDelete: string;
+      failed: string;
+      stopping: string;
+      succeeded: string;
+    };
   };
   icon: Icon;
   description: string;
@@ -132,6 +150,8 @@ export interface SessionV2 {
   project_id: string;
   launcher_id: string;
   resource_class_id: number;
+  submission_id?: string | null;
+  session_type: SessionLauncherKind;
 }
 
 export interface BuilderSelectorOption<T extends string = string> {
diff --git a/tests/cypress/e2e/projectV2SubmitJob.spec.ts b/tests/cypress/e2e/projectV2SubmitJob.spec.ts
new file mode 100644
index 0000000000..7f515ace98
--- /dev/null
+++ b/tests/cypress/e2e/projectV2SubmitJob.spec.ts
@@ -0,0 +1,122 @@
+/*!
+ * Copyright 2026 - 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 fixtures from "../support/renkulab-fixtures";
+
+describe("submit job from launcher", () => {
+  beforeEach(() => {
+    fixtures
+      .config()
+      .versions()
+      .userTest()
+      .dataServicesUser({
+        response: {
+          id: "user1-uuid",
+          username: "user-1",
+          email: "user1@email.com",
+        },
+      })
+      .projects()
+      .readGroupV2Namespace({ groupSlug: "user1-uuid" })
+      .landingUserProjects()
+      .readProjectV2()
+      .readProjectV2WithoutDocumentation()
+      .listProjectV2Members()
+      .sessionLaunchers({
+        fixture: "projectV2/session-launchers-job.json",
+      })
+      .sessionServersEmptyV2()
+      .sessionImage()
+      .resourcePoolsTest()
+      .getResourceClass();
+
+    cy.visit("/p/user1-uuid/test-2-v2-project");
+    cy.wait("@readProjectV2");
+    cy.wait("@sessionLaunchers");
+    cy.wait("@sessionServersEmptyV2");
+  });
+
+  it("submits a job with nickname as submission_id", () => {
+    cy.getDataCy("session-launcher-item")
+      .first()
+      .within(() => {
+        cy.getDataCy("submit-job-button").click();
+      });
+
+    cy.getDataCy("submit-job-modal").should("be.visible");
+    cy.getDataCy("submit-job-launcher-name").should(
+      "contain.text",
+      "Job-custom",
+    );
+    cy.getDataCy("submit-job-command-input").should("be.visible");
+    cy.getDataCy("submit-job-args-input").should("be.visible");
+
+    cy.getDataCy("submit-job-nickname-input").type("bad nick");
+    cy.getDataCy("submit-job-confirm-button").click();
+    cy.getDataCy("submit-job-nickname-input")
+      .parent()
+      .find(".invalid-feedback")
+      .should("be.visible");
+
+    cy.getDataCy("submit-job-nickname-input").clear().type("run01");
+
+    cy.fixture("sessions/sessionV2.json").then((session) => {
+      cy.intercept("POST", "/api/data/sessions", (req) => {
+        expect(req.body.submission_id).to.eq("run01");
+        expect(req.body.launcher_id).to.eq("01HYJE99XEKWNKPYN8WRB6QA8Z");
+        req.reply({
+          body: {
+            ...session,
+            submission_id: "run01",
+            session_type: "non_interactive",
+            launcher_id: "01HYJE99XEKWNKPYN8WRB6QA8Z",
+            project_id: "01HYJE5FR1JV4CWFMBFJQFQ4RM",
+          },
+        });
+      }).as("submitJob");
+    });
+
+    cy.getDataCy("submit-job-confirm-button").click();
+    cy.wait("@submitJob");
+    cy.getDataCy("submit-job-success-nickname").should("contain.text", "run01");
+  });
+
+  it("rejects duplicate nicknames for the same launcher", () => {
+    fixtures.getSessionsV2({
+      fixture: "projectV2/sessions-with-submission-id.json",
+      name: "getSessionsWithSubmission",
+    });
+
+    cy.reload();
+    cy.wait("@sessionLaunchers");
+    cy.wait("@getSessionsWithSubmission");
+
+    cy.getDataCy("session-launcher-item")
+      .first()
+      .within(() => {
+        cy.getDataCy("submit-job-button").click();
+      });
+
+    cy.getDataCy("submit-job-nickname-input").type("run01");
+    cy.getDataCy("submit-job-confirm-button").click();
+    cy.getDataCy("submit-job-nickname-input")
+      .parent()
+      .find(".invalid-feedback")
+      .should("contain.text", "already used");
+  });
+});
diff --git a/tests/cypress/fixtures/projectV2/sessions-with-submission-id.json b/tests/cypress/fixtures/projectV2/sessions-with-submission-id.json
new file mode 100644
index 0000000000..7a661bd0ec
--- /dev/null
+++ b/tests/cypress/fixtures/projectV2/sessions-with-submission-id.json
@@ -0,0 +1,25 @@
+[
+  {
+    "image": "renku/renkulab-py:latest",
+    "name": "job-session-01",
+    "resources": {
+      "requests": {
+        "cpu": 0.5,
+        "memory": "1G",
+        "storage": "1G"
+      }
+    },
+    "started": "2024-05-23T10:00:00Z",
+    "status": {
+      "state": "running",
+      "ready_containers": 1,
+      "total_containers": 1
+    },
+    "url": "https://example.com",
+    "project_id": "01HYJE5FR1JV4CWFMBFJQFQ4RM",
+    "launcher_id": "01HYJE99XEKWNKPYN8WRB6QA8Z",
+    "resource_class_id": 2,
+    "session_type": "non_interactive",
+    "submission_id": "run01"
+  }
+]

From 9352d1f957f818816b0638c715109a65e7fb07a5 Mon Sep 17 00:00:00 2001
From: Andrea Cordoba <dandrea.cordoba@gmail.com>
Date: Tue, 2 Jun 2026 13:50:54 +0200
Subject: [PATCH 2/3] add project validation before submit a job

---
 .../sessionsV2/DataConnectorSecretsModal.tsx  |  56 ++-
 .../SaveCloudStorageCredentials.tsx           | 159 +++++++
 .../sessionsV2/SessionRepositoriesModal.tsx   |  27 +-
 .../sessionsV2/SessionSecretsModal.tsx        |  26 +-
 .../features/sessionsV2/SessionStartPage.tsx  | 250 +++-------
 .../SessionButton/ActiveSessionButton.tsx     |   4 +-
 .../components/SessionLauncherButtons.tsx     |   6 +-
 .../SessionModals/SubmitJobModal.tsx          | 430 ++++++++++++++++--
 .../components/SubmitJobLauncherAction.tsx    |  14 +
 .../src/features/sessionsV2/session.utils.ts  |  23 +-
 .../sessionLaunchValidation.utils.ts          |  97 ++++
 .../useSessionLaunchPrerequisites.hook.ts     | 150 ++++++
 .../sessionsV2/useSessionLaunchState.hook.ts  |  89 ++--
 .../sessionsV2/useSessionSecrets.hook.ts      |  17 +-
 tests/cypress/e2e/projectV2SubmitJob.spec.ts  |  90 +++-
 .../projectV2/empty-data-connector-links.json |   1 +
 16 files changed, 1097 insertions(+), 342 deletions(-)
 create mode 100644 client/src/features/sessionsV2/SaveCloudStorageCredentials.tsx
 create mode 100644 client/src/features/sessionsV2/sessionLaunchValidation.utils.ts
 create mode 100644 client/src/features/sessionsV2/useSessionLaunchPrerequisites.hook.ts
 create mode 100644 tests/cypress/fixtures/projectV2/empty-data-connector-links.json

diff --git a/client/src/features/sessionsV2/DataConnectorSecretsModal.tsx b/client/src/features/sessionsV2/DataConnectorSecretsModal.tsx
index 9c675d2003..e6d4c3e24a 100644
--- a/client/src/features/sessionsV2/DataConnectorSecretsModal.tsx
+++ b/client/src/features/sessionsV2/DataConnectorSecretsModal.tsx
@@ -59,6 +59,13 @@ const CONTEXT_STRINGS = {
     testError:
       "The data connector could not be mounted. Please retry with different credentials, or skip the data connector. If you skip, the data connector will not be mounted in the session.",
   },
+  job: {
+    continueButton: "Continue",
+    dataCy: "job-data-connector-credentials-modal",
+    header: "Job Storage Credentials",
+    testError:
+      "The data connector could not be mounted. Please retry with different credentials, or skip the data connector. If you skip, the data connector will not be mounted in the job.",
+  },
   storage: {
     continueButton: "Test and Save",
     dataCy: "data-connector-credentials-modal",
@@ -113,7 +120,7 @@ function DataConnectorSecrets({
         dataConnectorConfig.savedCredentialFields.map((secret) => [
           storageSecretNameToFieldName({ name: secret }),
           secret,
-        ]),
+        ])
       )
     : {};
 
@@ -158,7 +165,7 @@ function DataConnectorSecrets({
 }
 
 interface DataConnectorSecretsModalProps {
-  context?: "session" | "storage";
+  context?: "session" | "job" | "storage";
   isOpen: boolean;
   onCancel: () => void;
   onStart: (dataConnectorConfigs: DataConnectorConfiguration[]) => void;
@@ -176,16 +183,16 @@ export default function DataConnectorSecretsModal({
       initialDataConnectorConfigs == null
         ? []
         : initialDataConnectorConfigs.filter(
-            (config) => config.sensitiveFieldDefinitions.length === 0,
+            (config) => config.sensitiveFieldDefinitions.length === 0
           ),
-    [initialDataConnectorConfigs],
+    [initialDataConnectorConfigs]
   );
   const [dataConnectorConfigs, setDataConnectorConfigs] = useState(
     initialDataConnectorConfigs == null
       ? []
       : initialDataConnectorConfigs.filter(
-          (config) => config.sensitiveFieldDefinitions.length > 0,
-        ),
+          (config) => config.sensitiveFieldDefinitions.length > 0
+        )
   );
   const [index, setIndex] = useState(0);
   const { control, handleSubmit, reset: resetForm } = useForm();
@@ -204,7 +211,7 @@ export default function DataConnectorSecretsModal({
         onStart([...noCredentialsConfigs, ...csConfigs]);
       }
     },
-    [index, noCredentialsConfigs, onStart, resetForm, validationResult],
+    [index, noCredentialsConfigs, onStart, resetForm, validationResult]
   );
 
   const onSkip = useCallback(() => {
@@ -256,7 +263,7 @@ export default function DataConnectorSecretsModal({
       newCloudStorageConfigs[index] = config;
       setDataConnectorConfigs(newCloudStorageConfigs);
     },
-    [dataConnectorConfigs, index, validateCloudStorageConnection],
+    [dataConnectorConfigs, index, validateCloudStorageConnection]
   );
 
   useEffect(() => {
@@ -278,7 +285,7 @@ export default function DataConnectorSecretsModal({
   if (dataConnectorConfigs == null) return null;
   if (dataConnectorConfigs.length < 1) return null;
   const hasSavedCredentials = dataConnectorConfigs.some(
-    (csc) => csc.savedCredentialFields?.length > 0,
+    (csc) => csc.savedCredentialFields?.length > 0
   );
 
   return (
@@ -327,10 +334,8 @@ export default function DataConnectorSecretsModal({
   );
 }
 
-interface CredentialsButtonsProps extends Pick<
-  DataConnectorSecretsModalProps,
-  "onCancel"
-> {
+interface CredentialsButtonsProps
+  extends Pick<DataConnectorSecretsModalProps, "onCancel"> {
   context: NonNullable<DataConnectorSecretsModalProps["context"]>;
   hasSavedCredentials: boolean;
   onSkip: () => void;
@@ -352,7 +357,9 @@ function CredentialsButtons({
         <XLg className={cx("bi", "me-1")} />
         Cancel
       </Button>
-      {context === "session" && <SkipConnectionTestButton onSkip={onSkip} />}
+      {(context === "session" || context === "job") && (
+        <SkipConnectionTestButton context={context} onSkip={onSkip} />
+      )}
       {context === "storage" && (
         <ClearCredentialsButton
           onSkip={onSkip}
@@ -364,10 +371,10 @@ function CredentialsButtons({
           validationResult == null
             ? "primary"
             : validationResult.isSuccess
-              ? "primary"
-              : validationResult.isError
-                ? "danger"
-                : "primary"
+            ? "primary"
+            : validationResult.isError
+            ? "danger"
+            : "primary"
         }
         className={cx("ms-2")}
         disabled={validationResult.isLoading}
@@ -431,7 +438,7 @@ function ProgressBreadcrumbs({
                 "btn-link",
                 "p-0",
                 idx === index && ["text-decoration-none", "link-rk-text"],
-                idx > index && "text-decoration-none",
+                idx > index && "text-decoration-none"
               )}
               disabled={idx >= index}
               onClick={() => {
@@ -485,7 +492,8 @@ function SaveCredentialsInput({
   );
 }
 
-interface SensitiveFieldWidgetProps extends DataConnectorConfigurationSecretsProps {
+interface SensitiveFieldWidgetProps
+  extends DataConnectorConfigurationSecretsProps {
   credentialFieldDict: Record<string, string>;
   field: {
     name: string;
@@ -573,7 +581,7 @@ function SensitiveFieldInput({
                   "form-control",
                   "rounded-0",
                   "rounded-start",
-                  fieldState.error && "is-invalid",
+                  fieldState.error && "is-invalid"
                 )}
                 placeholder={""}
                 {...field}
@@ -612,9 +620,11 @@ function SensitiveFieldInput({
 }
 
 function SkipConnectionTestButton({
+  context,
   onSkip,
-}: Pick<CredentialsButtonsProps, "onSkip">) {
+}: Pick<CredentialsButtonsProps, "context" | "onSkip">) {
   const skipButtonRef = useRef<HTMLAnchorElement>(null);
+  const targetLabel = context === "job" ? "job" : "session";
   return (
     <>
       <span ref={skipButtonRef}>
@@ -624,7 +634,7 @@ function SkipConnectionTestButton({
         </Button>
       </span>
       <UncontrolledTooltip target={skipButtonRef}>
-        Skip the data connector. It will not be mounted in the session.
+        {`Skip the data connector. It will not be mounted in the ${targetLabel}.`}
       </UncontrolledTooltip>
     </>
   );
diff --git a/client/src/features/sessionsV2/SaveCloudStorageCredentials.tsx b/client/src/features/sessionsV2/SaveCloudStorageCredentials.tsx
new file mode 100644
index 0000000000..d3fe2b686d
--- /dev/null
+++ b/client/src/features/sessionsV2/SaveCloudStorageCredentials.tsx
@@ -0,0 +1,159 @@
+/*!
+ * Copyright 2026 - 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 { useEffect, useMemo, useState } from "react";
+
+import ProgressStepsIndicator, {
+  ProgressStyle,
+  ProgressType,
+  StatusStepProgressBar,
+  StepsProgressBar,
+} from "~/components/progress/ProgressSteps";
+import { storageDefinitionAfterSavingCredentialsFromConfig } from "../cloudStorage/projectCloudStorage.utils";
+import { usePatchDataConnectorsByDataConnectorIdSecretsMutation } from "../dataConnectorsV2/api/data-connectors.enhanced-api";
+import { shouldCloudStorageSaveCredentials } from "./sessionLaunchValidation.utils";
+import type { SessionStartDataConnectorConfiguration } from "./startSessionOptionsV2.types";
+
+import progressBoxStyles from "~/components/progress/ProgressBox.module.scss";
+
+interface SaveCloudStorageCredentialsProps {
+  dataConnectors: SessionStartDataConnectorConfiguration[];
+  onComplete: (configs: SessionStartDataConnectorConfiguration[]) => void;
+  title?: string;
+}
+
+export default function SaveCloudStorageCredentials({
+  dataConnectors,
+  onComplete,
+  title = "Saving credentials",
+}: SaveCloudStorageCredentialsProps) {
+  const [steps, setSteps] = useState<StepsProgressBar[]>([]);
+  const [saveCredentials, saveCredentialsResult] =
+    usePatchDataConnectorsByDataConnectorIdSecretsMutation();
+
+  const credentialsToSave = useMemo(() => {
+    return dataConnectors
+      .filter(shouldCloudStorageSaveCredentials)
+      .map((cs) => ({
+        storageName: cs.dataConnector.name,
+        storageId: cs.dataConnector.id,
+        secrets: cs.sensitiveFieldValues,
+      }));
+  }, [dataConnectors]);
+
+  const [results, setResults] = useState<StatusStepProgressBar[]>(
+    credentialsToSave.map(() => StatusStepProgressBar.WAITING)
+  );
+
+  const [index, setIndex] = useState(0);
+
+  useEffect(() => {
+    const theSteps = credentialsToSave.map((cs, i) => ({
+      id: i,
+      status: results[i],
+      step: `Saving credentials for ${cs.storageName}`,
+    }));
+    // TODO: fix react-hooks/set-state-in-effect
+    // eslint-disable-next-line react-hooks/set-state-in-effect
+    setSteps(theSteps);
+  }, [credentialsToSave, results]);
+
+  useEffect(() => {
+    if (credentialsToSave.length < 1 || index >= credentialsToSave.length)
+      return;
+    // TODO: fix react-hooks/set-state-in-effect
+    // eslint-disable-next-line react-hooks/set-state-in-effect
+    setResults((prev) => {
+      const newResults = [...prev];
+      newResults[index] = StatusStepProgressBar.EXECUTING;
+      return newResults;
+    });
+    const storage = credentialsToSave[index];
+    saveCredentials({
+      dataConnectorId: storage.storageId,
+      dataConnectorSecretPatchList: Object.entries(storage.secrets).map(
+        ([key, value]) => ({
+          name: key,
+          value,
+        })
+      ),
+    });
+  }, [credentialsToSave, index, saveCredentials]);
+
+  useEffect(() => {
+    if (
+      saveCredentialsResult.isUninitialized ||
+      saveCredentialsResult.isLoading
+    )
+      return;
+    if (saveCredentialsResult.data != null) {
+      // TODO: fix react-hooks/set-state-in-effect
+      // eslint-disable-next-line react-hooks/set-state-in-effect
+      setResults((prev) => {
+        const newResults = [...prev];
+        newResults[index] = StatusStepProgressBar.READY;
+        return newResults;
+      });
+    }
+    if (saveCredentialsResult.error != null) {
+      setResults((prev) => {
+        const newResults = [...prev];
+        newResults[index] = StatusStepProgressBar.FAILED;
+        return newResults;
+      });
+    }
+    saveCredentialsResult.reset();
+    setIndex((prev) => prev + 1);
+  }, [index, saveCredentialsResult]);
+
+  useEffect(() => {
+    if (saveCredentialsResult.isLoading) {
+      return;
+    }
+    if (index >= credentialsToSave.length) {
+      const cloudStorageConfigs = dataConnectors.map((cs) =>
+        storageDefinitionAfterSavingCredentialsFromConfig(cs)
+      );
+      onComplete(cloudStorageConfigs);
+    }
+  }, [
+    credentialsToSave.length,
+    dataConnectors,
+    index,
+    onComplete,
+    saveCredentialsResult.isLoading,
+  ]);
+
+  return (
+    <div
+      className={cx(
+        progressBoxStyles.progressBoxSmall,
+        progressBoxStyles.progressBoxSmallSteps
+      )}
+    >
+      <ProgressStepsIndicator
+        description="Saving credentials..."
+        type={ProgressType.Determinate}
+        style={ProgressStyle.Light}
+        title={title}
+        status={steps}
+      />
+    </div>
+  );
+}
diff --git a/client/src/features/sessionsV2/SessionRepositoriesModal.tsx b/client/src/features/sessionsV2/SessionRepositoriesModal.tsx
index ad03fbed7c..42a4932702 100644
--- a/client/src/features/sessionsV2/SessionRepositoriesModal.tsx
+++ b/client/src/features/sessionsV2/SessionRepositoriesModal.tsx
@@ -53,23 +53,34 @@ import startSessionOptionsV2Slice from "./startSessionOptionsV2.slice";
 interface SessionRepositoriesModalProps {
   isOpen: boolean;
   project: Project;
+  onSkip?: () => void;
+  onCancel?: () => void;
+  continueLabel?: string;
+  title?: string;
+  warningIntro?: string;
 }
 export default function SessionRepositoriesModal({
   isOpen,
   project,
+  onSkip: onSkipProp,
+  onCancel: onCancelProp,
+  continueLabel = "Launch anyway",
+  title = "Session repositories not accessible",
+  warningIntro = "your attention before launching the session",
 }: SessionRepositoriesModalProps) {
   const navigate = useNavigate();
-  const onCancel = useCallback(() => {
+  const defaultOnCancel = useCallback(() => {
     const url = generatePath(ABSOLUTE_ROUTES.v2.projects.show.root, {
       namespace: project.namespace,
       slug: project.slug,
     });
     navigate(url);
   }, [navigate, project.namespace, project.slug]);
+  const onCancel = onCancelProp ?? defaultOnCancel;
 
   const projectPermissions = useProjectPermissions({ projectId: project.id });
   const { data, error, isLoading } = useGetRepositoriesQuery(
-    project.repositories ?? [],
+    project.repositories ?? []
   );
 
   const repoWithInterruptions = useMemo(() => {
@@ -78,16 +89,16 @@ export default function SessionRepositoriesModal({
       data.filter(
         (repo) =>
           repo.error ||
-          (repo.data &&
-            shouldInterrupt(repo.data, !!projectPermissions?.write)),
+          (repo.data && shouldInterrupt(repo.data, !!projectPermissions?.write))
       ) ?? []
     );
   }, [data, isLoading, projectPermissions?.write]);
 
   const dispatch = useAppDispatch();
-  const onSkip = useCallback(() => {
+  const defaultOnSkip = useCallback(() => {
     dispatch(startSessionOptionsV2Slice.actions.setRepositoriesReady(true));
   }, [dispatch]);
+  const onSkip = onSkipProp ?? defaultOnSkip;
 
   const content =
     isLoading || !data ? (
@@ -107,7 +118,7 @@ export default function SessionRepositoriesModal({
           {repoWithInterruptions.length === 1
             ? `is ${repoWithInterruptions.length} repository that requires`
             : `are ${repoWithInterruptions.length} repositories that require`}{" "}
-          your attention before launching the session:
+          your attention {warningIntro}:
         </p>
         <ListGroup>
           {repoWithInterruptions.map((repository) => (
@@ -129,7 +140,7 @@ export default function SessionRepositoriesModal({
       isOpen={isOpen}
       size="lg"
     >
-      <ModalHeader tag="h2">Session repositories not accessible</ModalHeader>
+      <ModalHeader tag="h2">{title}</ModalHeader>
       <ModalBody>{content}</ModalBody>
       <ModalFooter>
         <Button
@@ -146,7 +157,7 @@ export default function SessionRepositoriesModal({
           onClick={onSkip}
         >
           <SkipForward className={cx("bi", "me-1")} />
-          Launch anyway
+          {continueLabel}
         </Button>
       </ModalFooter>
     </ScrollableModal>
diff --git a/client/src/features/sessionsV2/SessionSecretsModal.tsx b/client/src/features/sessionsV2/SessionSecretsModal.tsx
index cfa38e8b59..f3f2617576 100644
--- a/client/src/features/sessionsV2/SessionSecretsModal.tsx
+++ b/client/src/features/sessionsV2/SessionSecretsModal.tsx
@@ -65,29 +65,37 @@ interface SessionSecretsModalProps {
   isOpen: boolean;
   project: Project;
   sessionSecretSlotsWithSecrets: SessionSecretSlotWithSecret[];
+  onSkip?: () => void;
+  onCancel?: () => void;
+  title?: string;
 }
 
 export default function SessionSecretsModal({
   isOpen,
   project,
   sessionSecretSlotsWithSecrets,
+  onSkip: onSkipProp,
+  onCancel: onCancelProp,
+  title = "Session secrets",
 }: SessionSecretsModalProps) {
   const { data: user } = useGetUserQueryState();
 
   const navigate = useNavigate();
-  const onCancel = useCallback(() => {
+  const defaultOnCancel = useCallback(() => {
     const url = generatePath(ABSOLUTE_ROUTES.v2.projects.show.root, {
       namespace: project.namespace,
       slug: project.slug,
     });
     navigate(url);
   }, [navigate, project.namespace, project.slug]);
+  const onCancel = onCancelProp ?? defaultOnCancel;
 
   const dispatch = useAppDispatch();
 
-  const onSkip = useCallback(() => {
+  const defaultOnSkip = useCallback(() => {
     dispatch(startSessionOptionsV2Slice.actions.setUserSecretsReady(true));
   }, [dispatch]);
+  const onSkip = onSkipProp ?? defaultOnSkip;
 
   const loginUrl = useLoginUrl();
   const content = user?.isLoggedIn ? (
@@ -135,7 +143,7 @@ export default function SessionSecretsModal({
       isOpen={isOpen}
       size="lg"
     >
-      <ModalHeader tag="h2">Session secrets</ModalHeader>
+      <ModalHeader tag="h2">{title}</ModalHeader>
       <ModalBody>{content}</ModalBody>
       <ModalFooter>
         <Button
@@ -168,7 +176,7 @@ function ReadySessionSecrets({
 }: ReadySessionSecretsProps) {
   const readySessionSecrets = useMemo(
     () => sessionSecretSlotsWithSecrets.filter(({ secretId }) => secretId),
-    [sessionSecretSlotsWithSecrets],
+    [sessionSecretSlotsWithSecrets]
   );
 
   if (readySessionSecrets.length == 0) {
@@ -216,7 +224,7 @@ function UnreadySessionSecrets({
 }: UnreadySessionSecretsProps) {
   const unreadySessionSecrets = useMemo(
     () => sessionSecretSlotsWithSecrets.filter(({ secretId }) => !secretId),
-    [sessionSecretSlotsWithSecrets],
+    [sessionSecretSlotsWithSecrets]
   );
 
   if (unreadySessionSecrets.length == 0) {
@@ -335,11 +343,11 @@ function ProvideNewValueContent({ secretSlot }: ProvideNewValueContentProps) {
         sessionSecretPatchList: [{ secret_slot_id: slotId, value: data.value }],
       });
     },
-    [patchSessionSecrets, projectId, slotId],
+    [patchSessionSecrets, projectId, slotId]
   );
   const onSubmit = useMemo(
     () => handleSubmit(submitHandler),
-    [handleSubmit, submitHandler],
+    [handleSubmit, submitHandler]
   );
 
   useEffect(() => {
@@ -436,11 +444,11 @@ function ProvideExistingContent({ secretSlot }: ProvideExistingContentProps) {
         ],
       });
     },
-    [patchSessionSecrets, projectId, slotId],
+    [patchSessionSecrets, projectId, slotId]
   );
   const onSubmit = useMemo(
     () => handleSubmit(submitHandler),
-    [handleSubmit, submitHandler],
+    [handleSubmit, submitHandler]
   );
 
   useEffect(() => {
diff --git a/client/src/features/sessionsV2/SessionStartPage.tsx b/client/src/features/sessionsV2/SessionStartPage.tsx
index a837699e4c..f06d94cbc8 100644
--- a/client/src/features/sessionsV2/SessionStartPage.tsx
+++ b/client/src/features/sessionsV2/SessionStartPage.tsx
@@ -37,17 +37,12 @@ import ProgressStepsIndicator, {
 import { ABSOLUTE_ROUTES } from "../../routing/routes.constants";
 import useAppDispatch from "../../utils/customHooks/useAppDispatch.hook";
 import useAppSelector from "../../utils/customHooks/useAppSelector.hook";
-import {
-  dataConnectorsOverrideFromConfig,
-  storageDefinitionAfterSavingCredentialsFromConfig,
-} from "../cloudStorage/projectCloudStorage.utils";
-import { usePatchDataConnectorsByDataConnectorIdSecretsMutation } from "../dataConnectorsV2/api/data-connectors.enhanced-api";
+import { dataConnectorsOverrideFromConfig } from "../cloudStorage/projectCloudStorage.utils";
 import type { DataConnectorConfiguration } from "../dataConnectorsV2/components/useDataConnectorConfiguration.hook";
 import { resetFavicon, setFavicon } from "../display/displaySlice";
 import type { SessionSecretSlotWithSecret } from "../ProjectPageV2/ProjectPageContent/SessionSecrets/sessionSecrets.types";
 import type { Project } from "../projectsV2/api/projectV2.api";
 import { useGetNamespacesByNamespaceProjectsAndSlugQuery } from "../projectsV2/api/projectV2.enhanced-api";
-import { storageSecretNameToFieldName } from "../secretsV2/secrets.utils";
 import type { SessionLauncher } from "./api/sessionLaunchersV2.api";
 import { useGetProjectsByProjectIdSessionLaunchersQuery as useGetProjectSessionLaunchersQuery } from "./api/sessionLaunchersV2.api";
 import {
@@ -56,9 +51,15 @@ import {
 } from "./api/sessionsV2.api";
 import { SelectResourceClassModal } from "./components/SessionModals/SelectResourceClass";
 import DataConnectorSecretsModal from "./DataConnectorSecretsModal";
+import SaveCloudStorageCredentials from "./SaveCloudStorageCredentials";
 import { CUSTOM_LAUNCH_SEARCH_PARAM } from "./session.constants";
 import { validateEnvVariableName } from "./session.utils";
 import SessionImageModal from "./SessionImageModal";
+import {
+  dataConnectorsNeedCredentials,
+  dataConnectorsShouldSaveCredentials,
+  doesCloudStorageNeedCredentials,
+} from "./sessionLaunchValidation.utils";
 import SessionRepositoriesModal from "./SessionRepositoriesModal";
 import SessionSecretsModal from "./SessionSecretsModal";
 import startSessionOptionsV2Slice from "./startSessionOptionsV2.slice";
@@ -70,10 +71,8 @@ import useSessionLaunchState from "./useSessionLaunchState.hook";
 
 import progressBoxStyles from "~/components/progress/ProgressBox.module.scss";
 
-interface SaveCloudStorageProps extends Omit<
-  StartSessionFromLauncherProps,
-  "project"
-> {
+interface SaveCloudStorageProps
+  extends Omit<StartSessionFromLauncherProps, "project"> {
   startSessionOptionsV2: StartSessionOptionsV2;
 }
 
@@ -82,131 +81,28 @@ function SaveCloudStorage({
   startSessionOptionsV2,
 }: SaveCloudStorageProps) {
   const dispatch = useAppDispatch();
-  const [steps, setSteps] = useState<StepsProgressBar[]>([]);
-  const [saveCredentials, saveCredentialsResult] =
-    usePatchDataConnectorsByDataConnectorIdSecretsMutation();
-
-  const credentialsToSave = useMemo(() => {
-    return startSessionOptionsV2.dataConnectors
-      ? startSessionOptionsV2.dataConnectors
-          .filter(shouldCloudStorageSaveCredentials)
-          .map((cs) => ({
-            storageName: cs.dataConnector.name,
-            storageId: cs.dataConnector.id,
-            secrets: cs.sensitiveFieldValues,
-          }))
-      : [];
-  }, [startSessionOptionsV2.dataConnectors]);
-
-  const [results, setResults] = useState<StatusStepProgressBar[]>(
-    credentialsToSave.map(() => StatusStepProgressBar.WAITING),
-  );
-
-  const [index, setIndex] = useState(0);
-
-  useEffect(() => {
-    const theSteps = credentialsToSave.map((cs, i) => ({
-      id: i,
-      status: results[i],
-      step: `Saving credentials for ${cs.storageName}`,
-    }));
-    // TODO: fix react-hooks/set-state-in-effect
-    // eslint-disable-next-line react-hooks/set-state-in-effect
-    setSteps(theSteps);
-  }, [credentialsToSave, results]);
-
-  // Save all the credentials that need to be saved
-  useEffect(() => {
-    if (credentialsToSave.length < 1 || index >= credentialsToSave.length)
-      return;
-    // TODO: fix react-hooks/set-state-in-effect
-    // eslint-disable-next-line react-hooks/set-state-in-effect
-    setResults((prev) => {
-      const newResults = [...prev];
-      newResults[index] = StatusStepProgressBar.EXECUTING;
-      return newResults;
-    });
-    const storage = credentialsToSave[index];
-    saveCredentials({
-      dataConnectorId: storage.storageId,
-      dataConnectorSecretPatchList: Object.entries(storage.secrets).map(
-        ([key, value]) => ({
-          name: key,
-          value,
-        }),
-      ),
-    });
-  }, [credentialsToSave, index, saveCredentials]);
 
-  useEffect(() => {
-    if (
-      saveCredentialsResult.isUninitialized ||
-      saveCredentialsResult.isLoading
-    )
-      return;
-    if (saveCredentialsResult.data != null) {
-      // TODO: fix react-hooks/set-state-in-effect
-      // eslint-disable-next-line react-hooks/set-state-in-effect
-      setResults((prev) => {
-        const newResults = [...prev];
-        newResults[index] = StatusStepProgressBar.READY;
-        return newResults;
-      });
-    }
-    if (saveCredentialsResult.error != null) {
-      // TODO: fix react-hooks/set-state-in-effect
-
-      setResults((prev) => {
-        const newResults = [...prev];
-        newResults[index] = StatusStepProgressBar.FAILED;
-        return newResults;
-      });
-    }
-    saveCredentialsResult.reset();
-    setIndex((prev) => prev + 1);
-  }, [index, saveCredentialsResult]);
-
-  useEffect(() => {
-    if (
-      saveCredentialsResult.isLoading ||
-      !startSessionOptionsV2.dataConnectors
-    ) {
-      return;
-    }
-    if (index >= credentialsToSave.length) {
-      const cloudStorageConfigs = startSessionOptionsV2.dataConnectors?.map(
-        (cs) => storageDefinitionAfterSavingCredentialsFromConfig(cs),
+  const onComplete = useCallback(
+    (cloudStorageConfigs: SessionStartDataConnectorConfiguration[]) => {
+      dispatch(
+        startSessionOptionsV2Slice.actions.setDataConnectorsOverrides(
+          cloudStorageConfigs
+        )
       );
-      if (cloudStorageConfigs)
-        dispatch(
-          startSessionOptionsV2Slice.actions.setDataConnectorsOverrides(
-            cloudStorageConfigs,
-          ),
-        );
-    }
-  }, [
-    dispatch,
-    credentialsToSave,
-    index,
-    saveCredentialsResult,
-    startSessionOptionsV2.dataConnectors,
-  ]);
+    },
+    [dispatch]
+  );
+
+  if (!startSessionOptionsV2.dataConnectors) {
+    return null;
+  }
 
   return (
-    <div
-      className={cx(
-        progressBoxStyles.progressBoxSmall,
-        progressBoxStyles.progressBoxSmallSteps,
-      )}
-    >
-      <ProgressStepsIndicator
-        description="Saving credentials..."
-        type={ProgressType.Determinate}
-        style={ProgressStyle.Light}
-        title={`Launching session ${launcher.name}`}
-        status={steps}
-      />
-    </div>
+    <SaveCloudStorageCredentials
+      dataConnectors={startSessionOptionsV2.dataConnectors}
+      onComplete={onComplete}
+      title={`Launching session ${launcher.name}`}
+    />
   );
 }
 
@@ -216,7 +112,7 @@ function SessionStarting({ launcher, project }: StartSessionFromLauncherProps) {
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
   const startSessionOptionsV2 = useAppSelector(
-    ({ startSessionOptionsV2 }) => startSessionOptionsV2,
+    ({ startSessionOptionsV2 }) => startSessionOptionsV2
   );
 
   const [
@@ -230,7 +126,7 @@ function SessionStarting({ launcher, project }: StartSessionFromLauncherProps) {
       disk_storage: startSessionOptionsV2.storage,
       resource_class_id: startSessionOptionsV2.sessionClass,
       data_connectors_overrides: startSessionOptionsV2.dataConnectors?.flatMap(
-        dataConnectorsOverrideFromConfig,
+        dataConnectorsOverrideFromConfig
       ),
       env_variable_overrides: Array.from(searchParams)
         .filter(([name]) => validateEnvVariableName(name) === true)
@@ -297,8 +193,8 @@ function SessionStarting({ launcher, project }: StartSessionFromLauncherProps) {
         status: error
           ? StatusStepProgressBar.FAILED
           : isLoadingStartSession
-            ? StatusStepProgressBar.EXECUTING
-            : StatusStepProgressBar.READY,
+          ? StatusStepProgressBar.EXECUTING
+          : StatusStepProgressBar.READY,
         step: "Requesting session",
       },
     ]);
@@ -311,7 +207,7 @@ function SessionStarting({ launcher, project }: StartSessionFromLauncherProps) {
       <div
         className={cx(
           progressBoxStyles.progressBoxSmall,
-          progressBoxStyles.progressBoxSmallSteps,
+          progressBoxStyles.progressBoxSmallSteps
         )}
       >
         <ProgressStepsIndicator
@@ -326,37 +222,8 @@ function SessionStarting({ launcher, project }: StartSessionFromLauncherProps) {
   );
 }
 
-function doesCloudStorageNeedCredentials(
-  config: SessionStartDataConnectorConfiguration,
-) {
-  if (!config.active || config.skip) {
-    return false;
-  }
-
-  const sensitiveFields = Object.keys(config.sensitiveFieldValues);
-  const credentialFieldDict = config.savedCredentialFields
-    ? Object.fromEntries(
-        config.savedCredentialFields?.map((field) => [
-          storageSecretNameToFieldName({ name: field }),
-          true,
-        ]),
-      )
-    : {};
-  if (sensitiveFields.every((key) => credentialFieldDict[key] != null)) {
-    return false;
-  }
-  return Object.values(config.sensitiveFieldValues).some(
-    (value) => value === "",
-  );
-}
-
-function shouldCloudStorageSaveCredentials(
-  config: SessionStartDataConnectorConfiguration,
-) {
-  return config.saveCredentials;
-}
-
-interface StartSessionWithCloudStorageModalProps extends StartSessionFromLauncherProps {
+interface StartSessionWithCloudStorageModalProps
+  extends StartSessionFromLauncherProps {
   dataConnectors: SessionStartDataConnectorConfiguration[];
 }
 
@@ -372,17 +239,17 @@ function StartSessionWithCloudStorageModal({
   const configsWithCredentials = useMemo(
     () =>
       dataConnectors.filter(
-        (config) => !doesCloudStorageNeedCredentials(config),
+        (config) => !doesCloudStorageNeedCredentials(config)
       ),
-    [dataConnectors],
+    [dataConnectors]
   );
 
   const configsNeedingCredentials = useMemo(
     () =>
       dataConnectors.filter((config) =>
-        doesCloudStorageNeedCredentials(config),
+        doesCloudStorageNeedCredentials(config)
       ),
-    [dataConnectors],
+    [dataConnectors]
   );
 
   useEffect(() => {
@@ -402,11 +269,11 @@ function StartSessionWithCloudStorageModal({
       ];
       dispatch(
         startSessionOptionsV2Slice.actions.setDataConnectorsOverrides(
-          cloudStorageConfigs,
-        ),
+          cloudStorageConfigs
+        )
       );
     },
-    [dispatch, configsWithCredentials],
+    [dispatch, configsWithCredentials]
   );
 
   const steps = [
@@ -436,7 +303,7 @@ function StartSessionWithCloudStorageModal({
       <div
         className={cx(
           progressBoxStyles.progressBoxSmall,
-          progressBoxStyles.progressBoxSmallSteps,
+          progressBoxStyles.progressBoxSmallSteps
         )}
       >
         <ProgressStepsIndicator
@@ -479,7 +346,7 @@ function StartSessionFromLauncher({
   });
 
   const startSessionOptionsV2 = useAppSelector(
-    ({ startSessionOptionsV2 }) => startSessionOptionsV2,
+    ({ startSessionOptionsV2 }) => startSessionOptionsV2
   );
 
   const {
@@ -498,12 +365,12 @@ function StartSessionFromLauncher({
     isCustomLaunch: hasCustomQuery,
   });
 
-  const needsCredentials = startSessionOptionsV2.dataConnectors?.some(
-    doesCloudStorageNeedCredentials,
+  const needsCredentials = dataConnectorsNeedCredentials(
+    startSessionOptionsV2.dataConnectors
   );
 
-  const shouldSaveCredentials = startSessionOptionsV2.dataConnectors?.some(
-    shouldCloudStorageSaveCredentials,
+  const shouldSaveCredentials = dataConnectorsShouldSaveCredentials(
+    startSessionOptionsV2.dataConnectors
   );
 
   const allDataFetched =
@@ -643,7 +510,7 @@ function StartSessionFromLauncher({
     <div
       className={cx(
         progressBoxStyles.progressBoxSmall,
-        progressBoxStyles.progressBoxSmallSteps,
+        progressBoxStyles.progressBoxSmallSteps
       )}
     >
       <ProgressStepsIndicator
@@ -673,7 +540,7 @@ export default function SessionStartPage() {
     isLoading: isLoadingProject,
     error: projectError,
   } = useGetNamespacesByNamespaceProjectsAndSlugQuery(
-    namespace && slug ? { namespace, slug } : skipToken,
+    namespace && slug ? { namespace, slug } : skipToken
   );
   const projectId = project?.id ?? "";
 
@@ -688,12 +555,12 @@ export default function SessionStartPage() {
 
   const launcher = useMemo(
     () => launchers?.find(({ id }) => id === launcherId),
-    [launcherId, launchers],
+    [launcherId, launchers]
   );
 
   //? We do not start the session while the logged out prompt is displayed.
   const { isLoggedIn, shouldBeLoggedIn } = useAppSelector(
-    ({ loginState }) => loginState,
+    ({ loginState }) => loginState
   );
   const isShowingLoggedOutPrompt = !isLoggedIn && shouldBeLoggedIn;
 
@@ -717,7 +584,8 @@ export default function SessionStartPage() {
   return <StartSessionFromLauncher launcher={launcher} project={project} />;
 }
 
-interface StartSessionWithSessionSecretsModalProps extends StartSessionFromLauncherProps {
+interface StartSessionWithSessionSecretsModalProps
+  extends StartSessionFromLauncherProps {
   sessionSecretSlotsWithSecrets: SessionSecretSlotWithSecret[];
 }
 
@@ -727,7 +595,7 @@ function StartSessionWithSessionSecretsModal({
   sessionSecretSlotsWithSecrets,
 }: StartSessionWithSessionSecretsModalProps) {
   const startSessionOptionsV2 = useAppSelector(
-    ({ startSessionOptionsV2 }) => startSessionOptionsV2,
+    ({ startSessionOptionsV2 }) => startSessionOptionsV2
   );
 
   const showModal = !startSessionOptionsV2.userSecretsReady;
@@ -750,7 +618,7 @@ function StartSessionWithSessionSecretsModal({
       <div
         className={cx(
           progressBoxStyles.progressBoxSmall,
-          progressBoxStyles.progressBoxSmallSteps,
+          progressBoxStyles.progressBoxSmallSteps
         )}
       >
         <ProgressStepsIndicator
@@ -775,7 +643,7 @@ function StartSessionImageModal({
   project,
 }: StartSessionFromLauncherProps) {
   const startSessionOptionsV2 = useAppSelector(
-    ({ startSessionOptionsV2 }) => startSessionOptionsV2,
+    ({ startSessionOptionsV2 }) => startSessionOptionsV2
   );
 
   const showModal = !startSessionOptionsV2.imageReady;
@@ -798,7 +666,7 @@ function StartSessionImageModal({
       <div
         className={cx(
           progressBoxStyles.progressBoxSmall,
-          progressBoxStyles.progressBoxSmallSteps,
+          progressBoxStyles.progressBoxSmallSteps
         )}
       >
         <ProgressStepsIndicator
@@ -823,7 +691,7 @@ function StartSessionRepositoriesModal({
   project,
 }: StartSessionFromLauncherProps) {
   const startSessionOptionsV2 = useAppSelector(
-    ({ startSessionOptionsV2 }) => startSessionOptionsV2,
+    ({ startSessionOptionsV2 }) => startSessionOptionsV2
   );
 
   const showModal = !startSessionOptionsV2.repositoriesReady;
@@ -846,7 +714,7 @@ function StartSessionRepositoriesModal({
       <div
         className={cx(
           progressBoxStyles.progressBoxSmall,
-          progressBoxStyles.progressBoxSmallSteps,
+          progressBoxStyles.progressBoxSmallSteps
         )}
       >
         <ProgressStepsIndicator
diff --git a/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx b/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx
index ad60470171..ff9d8d1f88 100644
--- a/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx
+++ b/client/src/features/sessionsV2/components/SessionButton/ActiveSessionButton.tsx
@@ -320,7 +320,7 @@ export default function ActiveSessionButton({
         </>
       ) : status === "hibernated" ? (
         <Button
-          color="primary"
+          color="outline-primary"
           data-cy="resume-session-button"
           disabled={isResuming}
           onClick={onResumeSession}
@@ -418,7 +418,7 @@ export default function ActiveSessionButton({
         </Button>
       ) : status === "hibernated" ? (
         <Button
-          color="primary"
+          color="outline-primary"
           data-cy="resume-session-button"
           disabled={isResuming}
           onClick={onResumeSession}
diff --git a/client/src/features/sessionsV2/components/SessionLauncherButtons.tsx b/client/src/features/sessionsV2/components/SessionLauncherButtons.tsx
index ff2445f383..0254d0480d 100644
--- a/client/src/features/sessionsV2/components/SessionLauncherButtons.tsx
+++ b/client/src/features/sessionsV2/components/SessionLauncherButtons.tsx
@@ -257,7 +257,11 @@ export function SessionLauncherButtons({
   return (
     <>
       <ButtonWithMenuV2
-        color={"primary"}
+        color={
+          displayBuildActions || (launcherCategory === "session" && hasSession)
+            ? "outline-primary"
+            : "primary"
+        }
         default={defaultAction}
         preventPropagation
         size="sm"
diff --git a/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx b/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx
index 7801c30556..370f2a685f 100644
--- a/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx
+++ b/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx
@@ -18,7 +18,14 @@
 
 import { skipToken } from "@reduxjs/toolkit/query";
 import cx from "classnames";
-import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
+import {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import { Controller, useForm } from "react-hook-form";
 import {
   Button,
@@ -35,9 +42,13 @@ import {
 import { SuccessAlert, WarnAlert } from "~/components/Alert";
 import RtkOrDataServicesError from "~/components/errors/RtkOrDataServicesError";
 import { Loader } from "~/components/Loader";
+import { TimeCaption } from "~/components/TimeCaption";
 import useProjectPermissions from "~/features/ProjectPageV2/utils/useProjectPermissions.hook";
+import type { Project } from "~/features/projectsV2/api/projectV2.api";
 import AppContext from "~/utils/context/appContext";
 import { DEFAULT_APP_PARAMS } from "~/utils/context/appParams.constants";
+import type { DataConnectorConfiguration } from "../../../dataConnectorsV2/components/useDataConnectorConfiguration.hook";
+import type { SessionSecretSlotWithSecret } from "../../../ProjectPageV2/ProjectPageContent/SessionSecrets/sessionSecrets.types";
 import { useGetResourcePoolsQuery } from "../../api/computeResources.api";
 import {
   useGetEnvironmentsByEnvironmentIdBuildsQuery as useGetBuildsQuery,
@@ -48,6 +59,8 @@ import {
   useGetSessionsQuery,
   usePostSessionsMutation,
 } from "../../api/sessionsV2.api";
+import DataConnectorSecretsModal from "../../DataConnectorSecretsModal";
+import SaveCloudStorageCredentials from "../../SaveCloudStorageCredentials";
 import { SUBMISSION_ID_VALIDATION_MESSAGE } from "../../session.constants";
 import {
   buildJobSessionPostRequest,
@@ -58,6 +71,15 @@ import {
   isValidJSONStringArray,
   validateSubmissionId,
 } from "../../session.utils";
+import {
+  allSessionSecretsReady,
+  dataConnectorsShouldSaveCredentials,
+  doesCloudStorageNeedCredentials,
+} from "../../sessionLaunchValidation.utils";
+import SessionRepositoriesModal from "../../SessionRepositoriesModal";
+import SessionSecretsModal from "../../SessionSecretsModal";
+import type { SessionStartDataConnectorConfiguration } from "../../startSessionOptionsV2.types";
+import useSessionLaunchPrerequisites from "../../useSessionLaunchPrerequisites.hook";
 import { BuildStatusDescription } from "../BuildStatusComponents";
 import SessionClassSelector from "../SessionClassSelector";
 import { LauncherEnvironmentIcon } from "../SessionForm/LauncherEnvironmentIcon";
@@ -72,9 +94,91 @@ import {
   type SubmitJobForm,
 } from "./useSubmitJobForm";
 
+interface SubmitJobGates {
+  repositoriesReady: boolean;
+  userSecretsReady: boolean;
+  dataConnectorsResolved: boolean;
+  credentialsSaved: boolean;
+}
+
+const INITIAL_GATES: SubmitJobGates = {
+  repositoriesReady: false,
+  userSecretsReady: false,
+  dataConnectorsResolved: false,
+  credentialsSaved: false,
+};
+
+type ValidationStep =
+  | "repositories"
+  | "sessionSecrets"
+  | "dataConnectors"
+  | "saveCredentials"
+  | "complete";
+
+interface GetValidationStepArgs {
+  isValidating: boolean;
+  isLoadingPrerequisites: boolean;
+  gates: SubmitJobGates;
+  repositoriesNeedAttention: boolean;
+  secretsNeedAttention: boolean;
+  sessionSecretSlotsWithSecrets: SessionSecretSlotWithSecret[] | null;
+  needsCredentials: boolean;
+  shouldSaveCredentials: boolean;
+}
+
+function isUserSecretsReadyForSubmit(
+  gates: SubmitJobGates,
+  isValidating: boolean,
+  sessionSecretSlotsWithSecrets: SessionSecretSlotWithSecret[] | null
+): boolean {
+  return (
+    gates.userSecretsReady ||
+    (isValidating &&
+      !!sessionSecretSlotsWithSecrets &&
+      allSessionSecretsReady(sessionSecretSlotsWithSecrets))
+  );
+}
+
+function getSubmitJobValidationStep({
+  isValidating,
+  isLoadingPrerequisites,
+  gates,
+  repositoriesNeedAttention,
+  secretsNeedAttention,
+  sessionSecretSlotsWithSecrets,
+  needsCredentials,
+  shouldSaveCredentials,
+}: GetValidationStepArgs): ValidationStep | null {
+  if (!isValidating || isLoadingPrerequisites) {
+    return null;
+  }
+  if (!gates.repositoriesReady && repositoriesNeedAttention) {
+    return "repositories";
+  }
+  if (
+    !isUserSecretsReadyForSubmit(
+      gates,
+      isValidating,
+      sessionSecretSlotsWithSecrets
+    ) &&
+    secretsNeedAttention &&
+    sessionSecretSlotsWithSecrets
+  ) {
+    return "sessionSecrets";
+  }
+  if (!gates.dataConnectorsResolved && needsCredentials) {
+    return "dataConnectors";
+  }
+  if (shouldSaveCredentials && !gates.credentialsSaved) {
+    return "saveCredentials";
+  }
+  return "complete";
+}
+
 interface SubmitJobModalProps {
   isOpen: boolean;
   launcher: SessionLauncher;
+  project: Project;
   toggle: () => void;
 }
 
@@ -137,11 +241,23 @@ function SubmitJobJsonField({
   );
 }
 
-export default function SubmitJobModal({
+interface SubmitJobFormModalProps {
+  isOpen: boolean;
+  launcher: SessionLauncher;
+  toggle: () => void;
+  isCheckingLaunchPrerequisites: boolean;
+  onSubmitJob: (data: SubmitJobForm) => void;
+  postSessionResult: ReturnType<typeof usePostSessionsMutation>[1];
+}
+
+function SubmitJobFormModal({
   isOpen,
   launcher,
   toggle,
-}: SubmitJobModalProps) {
+  isCheckingLaunchPrerequisites,
+  onSubmitJob,
+  postSessionResult,
+}: SubmitJobFormModalProps) {
   const submissionIdInputRef = useRef<HTMLInputElement>(null);
   const { params } = useContext(AppContext);
   const imageBuildersEnabled =
@@ -177,6 +293,7 @@ export default function SubmitJobModal({
   );
 
   const lastBuild = builds?.at(0);
+  const isLastBuildRunning = lastBuild?.status === "in_progress";
   const lastSuccessfulBuild = builds?.find(
     (build) => build.status === "succeeded" && build.id !== lastBuild?.id
   );
@@ -210,15 +327,12 @@ export default function SubmitJobModal({
       defaultValues,
     });
 
-  const [postSession, postSessionResult] = usePostSessionsMutation();
-
   // eslint-disable-next-line react-hooks/incompatible-library
   const watchResourceClass = watch("resourceClass");
 
   useEffect(() => {
     if (!isOpen) {
       reset(defaultValues);
-      postSessionResult.reset();
       return;
     }
     const defaultResourceClass = resolveDefaultResourceClass({
@@ -235,14 +349,7 @@ export default function SubmitJobModal({
       submissionId: generateSubmissionId(),
     });
     submissionIdInputRef.current?.focus();
-  }, [
-    defaultValues,
-    isOpen,
-    launcher,
-    postSessionResult,
-    reset,
-    resourcePools,
-  ]);
+  }, [defaultValues, isOpen, launcher, reset, resourcePools]);
 
   const launcherSessions = useMemo(
     () =>
@@ -259,16 +366,9 @@ export default function SubmitJobModal({
       if (!data.resourceClass) {
         return;
       }
-      const sessionPostRequest = buildJobSessionPostRequest({
-        launcher,
-        submissionId: data.submissionId,
-        resourceClass: data.resourceClass,
-        diskStorage: data.diskStorage,
-        args: data.args,
-      });
-      postSession({ sessionPostRequest });
+      onSubmitJob(data);
     },
-    [launcher, postSession]
+    [onSubmitJob]
   );
 
   const isLoadingPrerequisites =
@@ -282,6 +382,7 @@ export default function SubmitJobModal({
     !canWrite ||
     !displayLaunchSession ||
     isLoadingPrerequisites ||
+    isCheckingLaunchPrerequisites ||
     !watchResourceClass ||
     postSessionResult.isLoading;
 
@@ -317,7 +418,7 @@ export default function SubmitJobModal({
           )}
         </>
       )}
-      rules={{ required: "Please provide a resource class." }}
+      rules={{ required: "Please provide a valid resource class." }}
     />
   );
 
@@ -345,10 +446,10 @@ export default function SubmitJobModal({
           </SuccessAlert>
         ) : (
           <Form noValidate onSubmit={handleSubmit(onSubmit)}>
-            {postSessionResult.error && (
+            {Boolean(postSessionResult.error) && (
               <RtkOrDataServicesError
                 dismissible={false}
-                error={postSessionResult.error}
+                error={postSessionResult.error as never}
               />
             )}
             <div className={cx("d-flex", "flex-column", "gap-3")}>
@@ -397,10 +498,28 @@ export default function SubmitJobModal({
                   data-cy="submit-job-old-image-warning"
                   dismissible={false}
                 >
-                  <p className="mb-1">
-                    The latest build failed or is not ready yet. This job will
-                    run using the last successfully built image.
-                  </p>
+                  {isLastBuildRunning ? (
+                    <p className="mb-1">
+                      The environment for this launcher is currently rebuilding
+                      and not yet complete. This job will use the last
+                      successfully built environment from{" "}
+                      <TimeCaption
+                        datetime={lastSuccessfulBuild.created_at}
+                        enableTooltip
+                        noCaption
+                      />
+                    </p>
+                  ) : (
+                    <p className="mb-1">
+                      The most recent build for this environment failed, so this
+                      job will use the last successfully built environment from{" "}
+                      <TimeCaption
+                        datetime={lastSuccessfulBuild.created_at}
+                        enableTooltip
+                        noCaption
+                      />
+                    </p>
+                  )}
                 </WarnAlert>
               )}
 
@@ -517,4 +636,255 @@ export default function SubmitJobModal({
   );
 }
 
+function SubmitJobModalContent({
+  launcher,
+  project,
+  toggle,
+}: Omit<SubmitJobModalProps, "isOpen">) {
+  const prerequisites = useSessionLaunchPrerequisites({
+    project,
+    enabled: true,
+  });
+
+  const [postSession, postSessionResult] = usePostSessionsMutation();
+  const hasSubmittedRef = useRef(false);
+  const [gates, setGates] = useState<SubmitJobGates>(INITIAL_GATES);
+  const [dataConnectorConfigs, setDataConnectorConfigs] = useState<
+    SessionStartDataConnectorConfiguration[] | undefined
+  >();
+  const [pendingSubmit, setPendingSubmit] = useState<SubmitJobForm | null>(
+    null
+  );
+  const [isValidating, setIsValidating] = useState(false);
+
+  const configsWithCredentials = useMemo(
+    () =>
+      (prerequisites.dataConnectorConfigs ?? []).filter(
+        (config) => !doesCloudStorageNeedCredentials(config)
+      ),
+    [prerequisites.dataConnectorConfigs]
+  );
+
+  const configsNeedingCredentials = prerequisites.configsNeedingCredentials;
+
+  const shouldSaveCredentials =
+    dataConnectorConfigs != null &&
+    dataConnectorsShouldSaveCredentials(dataConnectorConfigs);
+
+  const validationStep = useMemo(
+    (): ValidationStep | null =>
+      getSubmitJobValidationStep({
+        isValidating,
+        isLoadingPrerequisites: prerequisites.isLoading,
+        gates,
+        repositoriesNeedAttention: prerequisites.repositoriesNeedAttention,
+        secretsNeedAttention: prerequisites.secretsNeedAttention,
+        sessionSecretSlotsWithSecrets:
+          prerequisites.sessionSecretSlotsWithSecrets,
+        needsCredentials: prerequisites.needsCredentials,
+        shouldSaveCredentials,
+      }),
+    [
+      gates,
+      isValidating,
+      prerequisites.isLoading,
+      prerequisites.needsCredentials,
+      prerequisites.repositoriesNeedAttention,
+      prerequisites.secretsNeedAttention,
+      prerequisites.sessionSecretSlotsWithSecrets,
+      shouldSaveCredentials,
+    ]
+  );
+
+  useEffect(() => {
+    if (validationStep !== "complete") {
+      hasSubmittedRef.current = false;
+      return;
+    }
+    if (!pendingSubmit?.resourceClass) {
+      return;
+    }
+    if (postSessionResult.isLoading || postSessionResult.isSuccess) {
+      return;
+    }
+    if (hasSubmittedRef.current) {
+      return;
+    }
+    hasSubmittedRef.current = true;
+    postSession({
+      sessionPostRequest: buildJobSessionPostRequest({
+        launcher,
+        submissionId: pendingSubmit.submissionId,
+        resourceClass: pendingSubmit.resourceClass,
+        diskStorage: pendingSubmit.diskStorage,
+        args: pendingSubmit.args,
+        dataConnectors: dataConnectorConfigs,
+      }),
+    });
+  }, [
+    dataConnectorConfigs,
+    launcher,
+    pendingSubmit,
+    postSession,
+    postSessionResult.isLoading,
+    postSessionResult.isSuccess,
+    validationStep,
+  ]);
+
+  const cancelValidation = useCallback(() => {
+    setIsValidating(false);
+  }, []);
+
+  const handleSubmitAttempt = useCallback(
+    (data: SubmitJobForm) => {
+      if (prerequisites.isLoading) {
+        return;
+      }
+      setPendingSubmit(data);
+      setIsValidating(true);
+      setGates({
+        repositoriesReady: !prerequisites.repositoriesNeedAttention,
+        userSecretsReady: !prerequisites.secretsNeedAttention,
+        dataConnectorsResolved: !prerequisites.needsCredentials,
+        credentialsSaved: false,
+      });
+      if (
+        !prerequisites.needsCredentials &&
+        prerequisites.dataConnectorConfigs
+      ) {
+        setDataConnectorConfigs(prerequisites.dataConnectorConfigs);
+      } else {
+        setDataConnectorConfigs(undefined);
+      }
+    },
+    [
+      prerequisites.dataConnectorConfigs,
+      prerequisites.isLoading,
+      prerequisites.needsCredentials,
+      prerequisites.repositoriesNeedAttention,
+      prerequisites.secretsNeedAttention,
+    ]
+  );
+
+  const onDataConnectorsComplete = useCallback(
+    (configs: DataConnectorConfiguration[]) => {
+      const cloudStorageConfigs = [
+        ...configsWithCredentials,
+        ...configs,
+      ] as SessionStartDataConnectorConfiguration[];
+      setDataConnectorConfigs(cloudStorageConfigs);
+      setGates((prev) => ({
+        ...prev,
+        dataConnectorsResolved: true,
+        credentialsSaved:
+          !dataConnectorsShouldSaveCredentials(cloudStorageConfigs),
+      }));
+    },
+    [configsWithCredentials]
+  );
+
+  const onSaveCredentialsComplete = useCallback(
+    (configs: SessionStartDataConnectorConfiguration[]) => {
+      setDataConnectorConfigs(configs);
+      setGates((prev) => ({ ...prev, credentialsSaved: true }));
+    },
+    []
+  );
+
+  const onRepositoriesSkip = useCallback(() => {
+    setGates((prev) => ({ ...prev, repositoriesReady: true }));
+  }, []);
+
+  const onSecretsSkip = useCallback(() => {
+    setGates((prev) => ({ ...prev, userSecretsReady: true }));
+  }, []);
+
+  return (
+    <>
+      <SubmitJobFormModal
+        isCheckingLaunchPrerequisites={prerequisites.isLoading}
+        isOpen
+        launcher={launcher}
+        onSubmitJob={handleSubmitAttempt}
+        postSessionResult={postSessionResult}
+        toggle={toggle}
+      />
+
+      {validationStep === "repositories" && (
+        <SessionRepositoriesModal
+          continueLabel="Submit anyway"
+          isOpen
+          onCancel={cancelValidation}
+          onSkip={onRepositoriesSkip}
+          project={project}
+          title="Project repositories not accessible"
+          warningIntro="your attention before submitting the job"
+        />
+      )}
+
+      {validationStep === "sessionSecrets" &&
+        prerequisites.sessionSecretSlotsWithSecrets && (
+          <SessionSecretsModal
+            isOpen
+            onCancel={cancelValidation}
+            onSkip={onSecretsSkip}
+            project={project}
+            sessionSecretSlotsWithSecrets={
+              prerequisites.sessionSecretSlotsWithSecrets
+            }
+            title="Session secrets"
+          />
+        )}
+
+      {validationStep === "dataConnectors" && (
+        <DataConnectorSecretsModal
+          context="job"
+          dataConnectorConfigs={configsNeedingCredentials}
+          isOpen
+          onCancel={cancelValidation}
+          onStart={onDataConnectorsComplete}
+        />
+      )}
+
+      {validationStep === "saveCredentials" && dataConnectorConfigs && (
+        <Modal
+          backdrop="static"
+          centered
+          data-cy="submit-job-save-credentials-modal"
+          isOpen
+          toggle={cancelValidation}
+        >
+          <ModalHeader tag="h2">Saving credentials</ModalHeader>
+          <ModalBody>
+            <SaveCloudStorageCredentials
+              dataConnectors={dataConnectorConfigs}
+              onComplete={onSaveCredentialsComplete}
+              title={`Submitting job ${launcher.name}`}
+            />
+          </ModalBody>
+        </Modal>
+      )}
+    </>
+  );
+}
+
+export default function SubmitJobModal({
+  isOpen,
+  launcher,
+  project,
+  toggle,
+}: SubmitJobModalProps) {
+  if (!isOpen) {
+    return null;
+  }
+
+  return (
+    <SubmitJobModalContent
+      launcher={launcher}
+      project={project}
+      toggle={toggle}
+    />
+  );
+}
+
 export type { SubmitJobForm };
diff --git a/client/src/features/sessionsV2/components/SubmitJobLauncherAction.tsx b/client/src/features/sessionsV2/components/SubmitJobLauncherAction.tsx
index a9c64637dd..97fcbbcc2c 100644
--- a/client/src/features/sessionsV2/components/SubmitJobLauncherAction.tsx
+++ b/client/src/features/sessionsV2/components/SubmitJobLauncherAction.tsx
@@ -16,11 +16,13 @@
  * limitations under the License.
  */
 
+import { skipToken } from "@reduxjs/toolkit/query";
 import cx from "classnames";
 import { useCallback, useState } from "react";
 import { Send } from "react-bootstrap-icons";
 import { Button } from "reactstrap";
 
+import { useGetProjectsByProjectIdQuery } from "~/features/projectsV2/api/projectV2.api";
 import type { SessionLauncher } from "../api/sessionLaunchersV2.api";
 import SubmitJobModal from "./SessionModals/SubmitJobModal";
 
@@ -39,6 +41,17 @@ export default function SubmitJobLauncherAction({
     setIsSubmitOpen((open) => !open);
   }, []);
 
+  const projectId = launcher.project_id;
+  const {
+    data: project,
+    isLoading: isLoadingProject,
+    isFetching: isFetchingProject,
+  } = useGetProjectsByProjectIdQuery(projectId ? { projectId } : skipToken);
+
+  if (isLoadingProject || isFetchingProject || !project) {
+    return null;
+  }
+
   return (
     <>
       <Button
@@ -58,6 +71,7 @@ export default function SubmitJobLauncherAction({
       <SubmitJobModal
         isOpen={isSubmitOpen}
         launcher={launcher}
+        project={project}
         toggle={toggleSubmit}
       />
     </>
diff --git a/client/src/features/sessionsV2/session.utils.ts b/client/src/features/sessionsV2/session.utils.ts
index 3d9600496c..48afe01557 100644
--- a/client/src/features/sessionsV2/session.utils.ts
+++ b/client/src/features/sessionsV2/session.utils.ts
@@ -16,6 +16,7 @@
  * limitations under the License
  */
 
+import { dataConnectorsOverrideFromConfig } from "../cloudStorage/projectCloudStorage.utils";
 import { FaviconStatus } from "../display/display.types";
 import type {
   ResourceClassWithId,
@@ -51,6 +52,7 @@ import {
   type SessionLauncherKind,
   type SessionStatusState,
 } from "./sessionsV2.types";
+import type { SessionStartDataConnectorConfiguration } from "./startSessionOptionsV2.types";
 
 export function getLauncherCategoryDefinitionByLauncher(
   launcher: SessionLauncher
@@ -620,6 +622,7 @@ export interface BuildJobSessionPostRequestArgs {
   diskStorage?: number;
   command?: string;
   args?: string;
+  dataConnectors?: SessionStartDataConnectorConfiguration[];
 }
 
 export function buildJobSessionPostRequest({
@@ -628,6 +631,7 @@ export function buildJobSessionPostRequest({
   resourceClass,
   diskStorage,
   args,
+  dataConnectors,
 }: BuildJobSessionPostRequestArgs): SessionPostRequest {
   const argsParsed = safeParseJSONStringArray(args ?? "");
   const request: SessionPostRequest = {
@@ -641,6 +645,12 @@ export function buildJobSessionPostRequest({
     request.disk_storage = diskStorage;
   }
 
+  if (dataConnectors?.length) {
+    request.data_connectors_overrides = dataConnectors.flatMap(
+      dataConnectorsOverrideFromConfig
+    );
+  }
+
   // TODO: include command/args overrides when SessionPostRequest supports them.
 
   return request;
@@ -682,25 +692,20 @@ export function isImageCompatibleWith(
   return imagePlatforms.some((p) => p === platform);
 }
 
-const CHARS = "abcdefghjkmnpqrstuvwxyz23456789";
+const CHARS = "23456789";
 
 // Simple consonant/vowel groups to keep IDs more readable
-const CONSONANTS = "bcdfghjkmnpqrstvwxyz";
+const CONSONANTS = "bcdfghjkmnpqrstvwxyz2345689";
 const VOWELS = "aeu";
 
 export function generateSubmissionId(): string {
   let result = "";
 
   // Build a mostly pronounceable 8-char core
-  for (let i = 0; i < 8; i++) {
+  for (let i = 0; i < 6; i++) {
     const source = i % 2 === 0 ? CONSONANTS : VOWELS;
     result += source[Math.floor(Math.random() * source.length)];
   }
 
-  // Add 2 random safe chars for extra uniqueness
-  for (let i = 0; i < 2; i++) {
-    result += CHARS[Math.floor(Math.random() * CHARS.length)];
-  }
-
-  return result;
+  return "run" + result + CHARS[Math.floor(Math.random() * CHARS.length)];
 }
diff --git a/client/src/features/sessionsV2/sessionLaunchValidation.utils.ts b/client/src/features/sessionsV2/sessionLaunchValidation.utils.ts
new file mode 100644
index 0000000000..7951777b5d
--- /dev/null
+++ b/client/src/features/sessionsV2/sessionLaunchValidation.utils.ts
@@ -0,0 +1,97 @@
+/*!
+ * Copyright 2026 - 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 { shouldInterrupt } from "../ProjectPageV2/ProjectPageContent/CodeRepositories/repositories.utils";
+import type { SessionSecretSlotWithSecret } from "../ProjectPageV2/ProjectPageContent/SessionSecrets/sessionSecrets.types";
+import type { GetRepositoriesApiResponse } from "../repositories/api/repositories.api";
+import { storageSecretNameToFieldName } from "../secretsV2/secrets.utils";
+import type { SessionStartDataConnectorConfiguration } from "./startSessionOptionsV2.types";
+
+export function doesCloudStorageNeedCredentials(
+  config: SessionStartDataConnectorConfiguration
+): boolean {
+  if (!config.active || config.skip) {
+    return false;
+  }
+
+  const sensitiveFields = Object.keys(config.sensitiveFieldValues);
+  const credentialFieldDict = config.savedCredentialFields
+    ? Object.fromEntries(
+        config.savedCredentialFields?.map((field) => [
+          storageSecretNameToFieldName({ name: field }),
+          true,
+        ])
+      )
+    : {};
+  if (sensitiveFields.every((key) => credentialFieldDict[key] != null)) {
+    return false;
+  }
+  return Object.values(config.sensitiveFieldValues).some(
+    (value) => value === ""
+  );
+}
+
+export function shouldCloudStorageSaveCredentials(
+  config: SessionStartDataConnectorConfiguration
+): boolean {
+  return config.saveCredentials;
+}
+
+export function repositoriesNeedAttention(
+  repositories: GetRepositoriesApiResponse[] | undefined,
+  hasWritePermission: boolean
+): boolean {
+  if (!repositories) {
+    return false;
+  }
+  return repositories.some(
+    (repo) =>
+      repo.error ||
+      (repo.data && shouldInterrupt(repo.data, hasWritePermission))
+  );
+}
+
+export function allSessionSecretsReady(
+  sessionSecretSlotsWithSecrets: SessionSecretSlotWithSecret[] | null
+): boolean {
+  if (!sessionSecretSlotsWithSecrets?.length) {
+    return true;
+  }
+  return sessionSecretSlotsWithSecrets.every(({ secretId }) => secretId);
+}
+
+export function secretsNeedAttention(
+  sessionSecretSlotsWithSecrets: SessionSecretSlotWithSecret[] | null
+): boolean {
+  if (!sessionSecretSlotsWithSecrets?.length) {
+    return false;
+  }
+  return !allSessionSecretsReady(sessionSecretSlotsWithSecrets);
+}
+
+export function dataConnectorsNeedCredentials(
+  configs: SessionStartDataConnectorConfiguration[] | undefined
+): boolean {
+  return configs?.some(doesCloudStorageNeedCredentials) ?? false;
+}
+
+export function dataConnectorsShouldSaveCredentials(
+  configs: SessionStartDataConnectorConfiguration[] | undefined
+): boolean {
+  return configs?.some(shouldCloudStorageSaveCredentials) ?? false;
+}
diff --git a/client/src/features/sessionsV2/useSessionLaunchPrerequisites.hook.ts b/client/src/features/sessionsV2/useSessionLaunchPrerequisites.hook.ts
new file mode 100644
index 0000000000..7483902cc6
--- /dev/null
+++ b/client/src/features/sessionsV2/useSessionLaunchPrerequisites.hook.ts
@@ -0,0 +1,150 @@
+/*!
+ * Copyright 2026 - 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 { skipToken } from "@reduxjs/toolkit/query";
+import { useMemo } from "react";
+
+import {
+  useGetDataConnectorsListByDataConnectorIdsQuery,
+  useGetProjectsByProjectIdDataConnectorLinksQuery,
+} from "../dataConnectorsV2/api/data-connectors.enhanced-api";
+import useDataConnectorConfiguration from "../dataConnectorsV2/components/useDataConnectorConfiguration.hook";
+import useProjectPermissions from "../ProjectPageV2/utils/useProjectPermissions.hook";
+import type { Project } from "../projectsV2/api/projectV2.api";
+import { useGetRepositoriesQuery } from "../repositories/api/repositories.api";
+import {
+  dataConnectorsNeedCredentials,
+  dataConnectorsShouldSaveCredentials,
+  doesCloudStorageNeedCredentials,
+  repositoriesNeedAttention,
+  secretsNeedAttention,
+} from "./sessionLaunchValidation.utils";
+import type { SessionStartDataConnectorConfiguration } from "./startSessionOptionsV2.types";
+import useSessionSecrets from "./useSessionSecrets.hook";
+
+interface UseSessionLaunchPrerequisitesArgs {
+  project: Project;
+  enabled?: boolean;
+  autoMarkSecretsReady?: boolean;
+}
+
+export default function useSessionLaunchPrerequisites({
+  project,
+  enabled = true,
+  autoMarkSecretsReady = false,
+}: UseSessionLaunchPrerequisitesArgs) {
+  const projectId = project.id;
+  const repositoryUrls = project.repositories ?? [];
+
+  const {
+    data: dataConnectorLinks,
+    isFetching: isFetchingDataConnectorLinks,
+    isLoading: isLoadingDataConnectorLinks,
+  } = useGetProjectsByProjectIdDataConnectorLinksQuery(
+    enabled ? { projectId } : skipToken
+  );
+  const dataConnectorIds = useMemo(
+    () => dataConnectorLinks?.map((link) => link.data_connector_id),
+    [dataConnectorLinks]
+  );
+  const {
+    data: dataConnectorsMap,
+    isFetching: isFetchingDataConnectors,
+    isLoading: isLoadingDataConnectors,
+  } = useGetDataConnectorsListByDataConnectorIdsQuery(
+    enabled && dataConnectorIds ? { dataConnectorIds } : skipToken
+  );
+
+  const dataConnectors = useMemo(
+    () => Object.values(dataConnectorsMap ?? {}),
+    [dataConnectorsMap]
+  );
+  const { dataConnectorConfigs, isReadyDataConnectorConfigs } =
+    useDataConnectorConfiguration({
+      dataConnectors: enabled ? dataConnectors : undefined,
+    });
+
+  const { data: repositories, isFetching: isFetchingRepositories } =
+    useGetRepositoriesQuery(enabled ? repositoryUrls : skipToken);
+
+  const projectPermissions = useProjectPermissions({ projectId });
+
+  const {
+    isFetching: isFetchingSessionSecrets,
+    sessionSecretSlotsWithSecrets,
+  } = useSessionSecrets({
+    projectId,
+    autoMarkReady: autoMarkSecretsReady,
+    enabled,
+  });
+
+  const isFetchingOrLoadingDataConnectors =
+    isFetchingDataConnectorLinks ||
+    isLoadingDataConnectorLinks ||
+    isLoadingDataConnectors ||
+    isFetchingDataConnectors ||
+    !isReadyDataConnectorConfigs;
+
+  const isLoading =
+    !enabled ||
+    isFetchingOrLoadingDataConnectors ||
+    isFetchingRepositories ||
+    isFetchingSessionSecrets;
+
+  const hasWritePermission = projectPermissions?.write === true;
+
+  const repositoriesNeedAttentionFlag = repositoriesNeedAttention(
+    repositories,
+    hasWritePermission
+  );
+
+  const secretsNeedAttentionFlag = secretsNeedAttention(
+    sessionSecretSlotsWithSecrets
+  );
+
+  const configsNeedingCredentials = useMemo(
+    () =>
+      dataConnectorConfigs?.filter((config) =>
+        doesCloudStorageNeedCredentials(config)
+      ) ?? [],
+    [dataConnectorConfigs]
+  );
+
+  const needsCredentials = dataConnectorsNeedCredentials(dataConnectorConfigs);
+
+  const shouldSaveCredentials =
+    dataConnectorsShouldSaveCredentials(dataConnectorConfigs);
+
+  return {
+    dataConnectorConfigs: dataConnectorConfigs as
+      | SessionStartDataConnectorConfiguration[]
+      | undefined,
+    configsNeedingCredentials,
+    isFetchingOrLoadingDataConnectors,
+    isFetchingRepositories,
+    isFetchingSessionSecrets,
+    isLoading,
+    isReadyDataConnectorConfigs,
+    needsCredentials,
+    repositories,
+    repositoriesNeedAttention: repositoriesNeedAttentionFlag,
+    secretsNeedAttention: secretsNeedAttentionFlag,
+    sessionSecretSlotsWithSecrets,
+    shouldSaveCredentials,
+  };
+}
diff --git a/client/src/features/sessionsV2/useSessionLaunchState.hook.ts b/client/src/features/sessionsV2/useSessionLaunchState.hook.ts
index 82e0055103..4a29b4ddd0 100644
--- a/client/src/features/sessionsV2/useSessionLaunchState.hook.ts
+++ b/client/src/features/sessionsV2/useSessionLaunchState.hook.ts
@@ -21,22 +21,16 @@ import { useEffect, useMemo } from "react";
 
 import useAppDispatch from "~/utils/customHooks/useAppDispatch.hook";
 import useAppSelector from "~/utils/customHooks/useAppSelector.hook";
-import {
-  useGetDataConnectorsListByDataConnectorIdsQuery,
-  useGetProjectsByProjectIdDataConnectorLinksQuery,
-} from "../dataConnectorsV2/api/data-connectors.enhanced-api";
-import useDataConnectorConfiguration from "../dataConnectorsV2/components/useDataConnectorConfiguration.hook";
-import { shouldInterrupt } from "../ProjectPageV2/ProjectPageContent/CodeRepositories/repositories.utils";
 import useProjectPermissions from "../ProjectPageV2/utils/useProjectPermissions.hook";
 import type { Project } from "../projectsV2/api/projectV2.api";
-import { useGetRepositoriesQuery } from "../repositories/api/repositories.api";
 import { useGetResourcePoolsQuery } from "./api/computeResources.api";
 import type { SessionLauncher } from "./api/sessionLaunchersV2.api";
 import { useGetSessionsImagesQuery } from "./api/sessionsV2.api";
 import { DEFAULT_URL } from "./session.constants";
+import { repositoriesNeedAttention } from "./sessionLaunchValidation.utils";
 import startSessionOptionsV2Slice from "./startSessionOptionsV2.slice";
+import useSessionLaunchPrerequisites from "./useSessionLaunchPrerequisites.hook";
 import useSessionResourceClass from "./useSessionResourceClass.hook";
-import useSessionSecrets from "./useSessionSecrets.hook";
 
 interface StartSessionFromLauncherProps {
   launcher: SessionLauncher;
@@ -52,33 +46,25 @@ export default function useSessionLauncherState({
   const default_url = launcher.environment?.default_url ?? "";
 
   const {
-    data: dataConnectorLinks,
-    isFetching: isFetchingDataConnectorLinks,
-    isLoading: isLoadingDataConnectorLinks,
-  } = useGetProjectsByProjectIdDataConnectorLinksQuery({
-    projectId: project.id,
+    dataConnectorConfigs: initialDataConnectorConfigs,
+    isFetchingOrLoadingDataConnectors: isFetchingOrLoadingStorages,
+    isFetchingRepositories,
+    isFetchingSessionSecrets,
+    isReadyDataConnectorConfigs,
+    repositories,
+    sessionSecretSlotsWithSecrets,
+  } = useSessionLaunchPrerequisites({
+    project,
+    enabled: true,
+    autoMarkSecretsReady: true,
   });
-  const dataConnectorIds = useMemo(
-    () => dataConnectorLinks?.map((link) => link.data_connector_id),
-    [dataConnectorLinks],
-  );
-  const {
-    data: dataConnectorsMap,
-    isFetching: isFetchingDataConnectors,
-    isLoading: isLoadingDataConnectors,
-  } = useGetDataConnectorsListByDataConnectorIdsQuery(
-    dataConnectorIds ? { dataConnectorIds } : skipToken,
-  );
+
   const { data: resourcePools } = useGetResourcePoolsQuery({});
   const { isPendingResourceClass, setResourceClass } = useSessionResourceClass({
     launcher,
     isCustomLaunch,
     resourcePools,
   });
-  const {
-    isFetching: isFetchingSessionSecrets,
-    sessionSecretSlotsWithSecrets,
-  } = useSessionSecrets({ projectId: project.id });
 
   const containerImage = launcher.environment?.container_image ?? "";
   const isExternalImageEnvironment =
@@ -89,7 +75,7 @@ export default function useSessionLauncherState({
     useGetSessionsImagesQuery(
       isExternalImageEnvironment && containerImage
         ? { imageUrl: containerImage }
-        : skipToken,
+        : skipToken
     );
   const sessionImage = useMemo(() => {
     if (isExternalImageEnvironment && containerImage) {
@@ -99,7 +85,7 @@ export default function useSessionLauncherState({
   }, [containerImage, dataSessionImage, isExternalImageEnvironment]);
 
   const startSessionOptionsV2 = useAppSelector(
-    ({ startSessionOptionsV2 }) => startSessionOptionsV2,
+    ({ startSessionOptionsV2 }) => startSessionOptionsV2
   );
 
   const defaultSessionClass = useMemo(
@@ -110,10 +96,11 @@ export default function useSessionLauncherState({
         .find((c) => c.default) ??
       resourcePools?.find(() => true)?.classes[0] ??
       null,
-    [resourcePools],
+    [resourcePools]
   );
 
   const dispatch = useAppDispatch();
+  const projectPermissions = useProjectPermissions({ projectId: project.id });
 
   // Reset start session options slice when we navigate away
   useEffect(() => {
@@ -131,31 +118,14 @@ export default function useSessionLauncherState({
   }, [default_url, dispatch, startSessionOptionsV2.defaultUrl]);
 
   useEffect(() => {
-    const repositories = (project.repositories ?? []).map((url) => ({ url }));
-    dispatch(startSessionOptionsV2Slice.actions.setRepositories(repositories));
+    const projectRepositories = (project.repositories ?? []).map((url) => ({
+      url,
+    }));
+    dispatch(
+      startSessionOptionsV2Slice.actions.setRepositories(projectRepositories)
+    );
   }, [dispatch, project.repositories]);
 
-  const dataConnectors = useMemo(
-    () => Object.values(dataConnectorsMap ?? {}),
-    [dataConnectorsMap],
-  );
-  const {
-    dataConnectorConfigs: initialDataConnectorConfigs,
-    isReadyDataConnectorConfigs,
-  } = useDataConnectorConfiguration({ dataConnectors });
-
-  const { data: repositories, isFetching: isFetchingRepositories } =
-    useGetRepositoriesQuery(project.repositories ?? []);
-
-  const projectPermissions = useProjectPermissions({ projectId: project.id });
-
-  const isFetchingOrLoadingStorages =
-    isFetchingDataConnectorLinks ||
-    isLoadingDataConnectorLinks ||
-    isLoadingDataConnectors ||
-    isFetchingDataConnectors ||
-    !isReadyDataConnectorConfigs;
-
   useEffect(() => {
     if (
       !isFetchingOrLoadingStorages &&
@@ -164,8 +134,8 @@ export default function useSessionLauncherState({
     ) {
       dispatch(
         startSessionOptionsV2Slice.actions.setDataConnectorsOverrides(
-          initialDataConnectorConfigs,
-        ),
+          initialDataConnectorConfigs
+        )
       );
     }
   }, [
@@ -187,10 +157,9 @@ export default function useSessionLauncherState({
 
   // Check for code repos availability -- it should only block if any repo requires it
   useEffect(() => {
-    const interrupt = !!repositories?.find(
-      (repo) =>
-        repo.error ||
-        (repo.data && shouldInterrupt(repo.data, !!projectPermissions?.write)),
+    const interrupt = repositoriesNeedAttention(
+      repositories,
+      !!projectPermissions?.write
     );
     if (!isFetchingRepositories && !interrupt) {
       dispatch(startSessionOptionsV2Slice.actions.setRepositoriesReady(true));
diff --git a/client/src/features/sessionsV2/useSessionSecrets.hook.ts b/client/src/features/sessionsV2/useSessionSecrets.hook.ts
index 7397c7ff93..c6ac04ebd3 100644
--- a/client/src/features/sessionsV2/useSessionSecrets.hook.ts
+++ b/client/src/features/sessionsV2/useSessionSecrets.hook.ts
@@ -30,10 +30,14 @@ import startSessionOptionsV2Slice from "./startSessionOptionsV2.slice";
 
 interface UseSessionSecretsArgs {
   projectId: string;
+  autoMarkReady?: boolean;
+  enabled?: boolean;
 }
 
 export default function useSessionSecrets({
   projectId,
+  autoMarkReady = true,
+  enabled = true,
 }: UseSessionSecretsArgs) {
   const { data: user } = useGetUserQueryState();
   const isUserLoggedIn = !!user?.isLoggedIn;
@@ -42,13 +46,15 @@ export default function useSessionSecrets({
     currentData: sessionSecretSlots,
     isFetching: isFetchingSessionSecretSlots,
     error: sessionSecretSlotsError,
-  } = useGetProjectsByProjectIdSessionSecretSlotsQuery({ projectId });
+  } = useGetProjectsByProjectIdSessionSecretSlotsQuery(
+    enabled ? { projectId } : skipToken
+  );
   const {
     currentData: sessionSecrets,
     isFetching: isFetchingSessionSecrets,
     error: sessionSecretsError,
   } = useGetProjectsByProjectIdSessionSecretsQuery(
-    isUserLoggedIn ? { projectId } : skipToken,
+    enabled && isUserLoggedIn ? { projectId } : skipToken
   );
 
   const isFetching = isFetchingSessionSecretSlots || isFetchingSessionSecrets;
@@ -67,10 +73,13 @@ export default function useSessionSecrets({
   const dispatch = useAppDispatch();
 
   useEffect(() => {
-    if (sessionSecretSlotsWithSecrets?.every(({ secretId }) => secretId)) {
+    if (
+      autoMarkReady &&
+      sessionSecretSlotsWithSecrets?.every(({ secretId }) => secretId)
+    ) {
       dispatch(startSessionOptionsV2Slice.actions.setUserSecretsReady(true));
     }
-  }, [dispatch, sessionSecretSlotsWithSecrets, isUserLoggedIn]);
+  }, [autoMarkReady, dispatch, sessionSecretSlotsWithSecrets, isUserLoggedIn]);
 
   return {
     sessionSecretSlotsWithSecrets,
diff --git a/tests/cypress/e2e/projectV2SubmitJob.spec.ts b/tests/cypress/e2e/projectV2SubmitJob.spec.ts
index 7f515ace98..3464c5a0e7 100644
--- a/tests/cypress/e2e/projectV2SubmitJob.spec.ts
+++ b/tests/cypress/e2e/projectV2SubmitJob.spec.ts
@@ -18,6 +18,33 @@
 
 import fixtures from "../support/renkulab-fixtures";
 
+const JOB_PROJECT_ID = "01HYJE5FR1JV4CWFMBFJQFQ4RM";
+const JOB_LAUNCHER_ID = "01HYJE99XEKWNKPYN8WRB6QA8Z";
+
+function setupSubmitJobPrerequisites() {
+  fixtures
+    .readProjectV2ById({
+      projectId: JOB_PROJECT_ID,
+      overrides: { id: JOB_PROJECT_ID },
+    })
+    .getRepositoryMetadata({
+      repositoryUrl: "https://domain.name/repo1.git",
+    })
+    .getRepositoryMetadata({
+      repositoryUrl: "https://domain.name/repo2.git",
+    })
+    .listProjectDataConnectors({
+      projectId: JOB_PROJECT_ID,
+      fixture: "projectV2/empty-data-connector-links.json",
+    })
+    .sessionSecretSlots({
+      fixture: "projectV2SessionSecrets/empty_list.json",
+    })
+    .sessionSecrets({
+      fixture: "projectV2SessionSecrets/empty_list.json",
+    });
+}
+
 describe("submit job from launcher", () => {
   beforeEach(() => {
     fixtures
@@ -45,6 +72,8 @@ describe("submit job from launcher", () => {
       .resourcePoolsTest()
       .getResourceClass();
 
+    setupSubmitJobPrerequisites();
+
     cy.visit("/p/user1-uuid/test-2-v2-project");
     cy.wait("@readProjectV2");
     cy.wait("@sessionLaunchers");
@@ -58,12 +87,12 @@ describe("submit job from launcher", () => {
         cy.getDataCy("submit-job-button").click();
       });
 
+    cy.wait("@readProjectV2ById");
     cy.getDataCy("submit-job-modal").should("be.visible");
     cy.getDataCy("submit-job-launcher-name").should(
       "contain.text",
       "Job-custom",
     );
-    cy.getDataCy("submit-job-command-input").should("be.visible");
     cy.getDataCy("submit-job-args-input").should("be.visible");
 
     cy.getDataCy("submit-job-nickname-input").type("bad nick");
@@ -78,14 +107,14 @@ describe("submit job from launcher", () => {
     cy.fixture("sessions/sessionV2.json").then((session) => {
       cy.intercept("POST", "/api/data/sessions", (req) => {
         expect(req.body.submission_id).to.eq("run01");
-        expect(req.body.launcher_id).to.eq("01HYJE99XEKWNKPYN8WRB6QA8Z");
+        expect(req.body.launcher_id).to.eq(JOB_LAUNCHER_ID);
         req.reply({
           body: {
             ...session,
             submission_id: "run01",
             session_type: "non_interactive",
-            launcher_id: "01HYJE99XEKWNKPYN8WRB6QA8Z",
-            project_id: "01HYJE5FR1JV4CWFMBFJQFQ4RM",
+            launcher_id: JOB_LAUNCHER_ID,
+            project_id: JOB_PROJECT_ID,
           },
         });
       }).as("submitJob");
@@ -93,7 +122,7 @@ describe("submit job from launcher", () => {
 
     cy.getDataCy("submit-job-confirm-button").click();
     cy.wait("@submitJob");
-    cy.getDataCy("submit-job-success-nickname").should("contain.text", "run01");
+    cy.contains("Job run01 submitted successfully").should("be.visible");
   });
 
   it("rejects duplicate nicknames for the same launcher", () => {
@@ -112,6 +141,7 @@ describe("submit job from launcher", () => {
         cy.getDataCy("submit-job-button").click();
       });
 
+    cy.wait("@readProjectV2ById");
     cy.getDataCy("submit-job-nickname-input").type("run01");
     cy.getDataCy("submit-job-confirm-button").click();
     cy.getDataCy("submit-job-nickname-input")
@@ -119,4 +149,54 @@ describe("submit job from launcher", () => {
       .find(".invalid-feedback")
       .should("contain.text", "already used");
   });
+
+  it("shows repository validation when submitting the job", () => {
+    fixtures
+      .getRepositoryMetadata({
+        repositoryUrl: "https://domain.name/repo1.git",
+        fixture: "repositories/repository-metadata-requestintegration.json",
+      })
+      .getRepositoryMetadata({
+        repositoryUrl: "https://domain.name/repo2.git",
+        fixture: "repositories/repository-metadata-requestintegration.json",
+      });
+
+    cy.getDataCy("session-launcher-item")
+      .first()
+      .within(() => {
+        cy.getDataCy("submit-job-button").click();
+      });
+
+    cy.wait("@readProjectV2ById");
+    cy.getDataCy("submit-job-modal").should("be.visible");
+    cy.getDataCy("submit-job-nickname-input").type("run01");
+    cy.getDataCy("submit-job-confirm-button").click();
+    cy.getDataCy("session-repositories-modal").should("be.visible");
+    cy.getDataCy("session-repositories-modal-continue").click();
+    cy.getDataCy("session-repositories-modal").should("not.exist");
+  });
+
+  it("shows session secrets validation when submitting the job", () => {
+    fixtures
+      .sessionSecretSlots({
+        fixture: "projectV2SessionSecrets/secret_slots.json",
+      })
+      .sessionSecrets({
+        fixture: "projectV2SessionSecrets/empty_list.json",
+      });
+
+    cy.getDataCy("session-launcher-item")
+      .first()
+      .within(() => {
+        cy.getDataCy("submit-job-button").click();
+      });
+
+    cy.wait("@readProjectV2ById");
+    cy.getDataCy("submit-job-modal").should("be.visible");
+    cy.getDataCy("submit-job-nickname-input").type("run02");
+    cy.getDataCy("submit-job-confirm-button").click();
+    cy.getDataCy("session-secrets-modal").should("be.visible");
+    cy.getDataCy("session-secrets-modal-skip-button").click();
+    cy.getDataCy("session-secrets-modal").should("not.exist");
+  });
 });
diff --git a/tests/cypress/fixtures/projectV2/empty-data-connector-links.json b/tests/cypress/fixtures/projectV2/empty-data-connector-links.json
new file mode 100644
index 0000000000..fe51488c70
--- /dev/null
+++ b/tests/cypress/fixtures/projectV2/empty-data-connector-links.json
@@ -0,0 +1 @@
+[]

From a777f7a83785a1eb72393aa7d0c2dd436832f60d Mon Sep 17 00:00:00 2001
From: Andrea Cordoba <dandrea.cordoba@gmail.com>
Date: Wed, 3 Jun 2026 17:33:53 +0200
Subject: [PATCH 3/3] disable fields when submit a job

---
 .../SessionForm/AdvancedSettingsFields.tsx    |   3 +
 .../SessionModals/SubmitJobModal.tsx          | 135 +++++++-----------
 .../SessionModals/useSubmitJobForm.ts         |  17 ++-
 .../src/features/sessionsV2/session.utils.ts  |   7 +-
 4 files changed, 74 insertions(+), 88 deletions(-)

diff --git a/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx b/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx
index 8f9eafff3f..3981b569a9 100644
--- a/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx
+++ b/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx
@@ -222,6 +222,7 @@ export interface JsonFieldProps<T extends FieldValues> {
   helpText: string;
   isOptional?: boolean;
   dataCy?: string;
+  disabled?: boolean;
 }
 
 export function JsonField<T extends FieldValues>({
@@ -233,6 +234,7 @@ export function JsonField<T extends FieldValues>({
   helpText,
   isOptional,
   dataCy,
+  disabled = false,
 }: JsonFieldProps<T>) {
   const rules = isOptional
     ? {
@@ -268,6 +270,7 @@ export function JsonField<T extends FieldValues>({
                 data-cy={dataCy ?? `session-launcher-field-${name}`}
                 id={`addSessionLauncher${name}`}
                 rows={2}
+                disabled={disabled}
                 {...field}
               />
               {error && (
diff --git a/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx b/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx
index 370f2a685f..0ce791910a 100644
--- a/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx
+++ b/client/src/features/sessionsV2/components/SessionModals/SubmitJobModal.tsx
@@ -61,14 +61,15 @@ import {
 } from "../../api/sessionsV2.api";
 import DataConnectorSecretsModal from "../../DataConnectorSecretsModal";
 import SaveCloudStorageCredentials from "../../SaveCloudStorageCredentials";
-import { SUBMISSION_ID_VALIDATION_MESSAGE } from "../../session.constants";
+import {
+  ENVIRONMENT_VALUES_DESCRIPTION,
+  SUBMISSION_ID_VALIDATION_MESSAGE,
+} from "../../session.constants";
 import {
   buildJobSessionPostRequest,
   generateSubmissionId,
-  getJSONStringArray,
   getSubmitJobEnvironmentKindLabel,
   isSubmissionIdTaken,
-  isValidJSONStringArray,
   validateSubmissionId,
 } from "../../session.utils";
 import {
@@ -82,6 +83,7 @@ import type { SessionStartDataConnectorConfiguration } from "../../startSessionO
 import useSessionLaunchPrerequisites from "../../useSessionLaunchPrerequisites.hook";
 import { BuildStatusDescription } from "../BuildStatusComponents";
 import SessionClassSelector from "../SessionClassSelector";
+import { JsonField } from "../SessionForm/AdvancedSettingsFields";
 import { LauncherEnvironmentIcon } from "../SessionForm/LauncherEnvironmentIcon";
 import {
   ErrorOrNotAvailableResourcePools,
@@ -182,65 +184,6 @@ interface SubmitJobModalProps {
   toggle: () => void;
 }
 
-function SubmitJobJsonField({
-  control,
-  name,
-  label,
-  helpText,
-  info,
-  isOptional,
-  dataCy,
-  id,
-  rules,
-}: {
-  control: ReturnType<typeof useForm<SubmitJobForm>>["control"];
-  name: "command" | "args";
-  label: string;
-  helpText: string;
-  info: string;
-  isOptional?: boolean;
-  dataCy: string;
-  id: string;
-  rules?: Record<string, unknown>;
-}) {
-  return (
-    <div>
-      <Label className="form-label" for={id}>
-        {label}
-        {isOptional && (
-          <span className={cx("small", "text-muted", "ms-1")}>(Optional)</span>
-        )}
-      </Label>
-      <Controller
-        control={control}
-        name={name}
-        rules={{
-          validate: (value) => isValidJSONStringArray(value?.toString()),
-          ...rules,
-        }}
-        render={({ field, fieldState: { error } }) => (
-          <>
-            <textarea
-              className={cx("w-100 form-control", error && "is-invalid")}
-              data-cy={dataCy}
-              id={id}
-              rows={2}
-              {...field}
-            />
-            {error && (
-              <div className="invalid-feedback mt-0 d-block">
-                {error.message}
-              </div>
-            )}
-          </>
-        )}
-      />
-      <FormText tag="div">{helpText}</FormText>
-      {info && <FormText tag="div">{info}</FormText>}
-    </div>
-  );
-}
-
 interface SubmitJobFormModalProps {
   isOpen: boolean;
   launcher: SessionLauncher;
@@ -322,10 +265,16 @@ function SubmitJobFormModal({
     [launcher]
   );
 
-  const { control, handleSubmit, reset, setValue, watch } =
-    useForm<SubmitJobForm>({
-      defaultValues,
-    });
+  const {
+    control,
+    formState: { errors },
+    handleSubmit,
+    reset,
+    setValue,
+    watch,
+  } = useForm<SubmitJobForm>({
+    defaultValues,
+  });
 
   // eslint-disable-next-line react-hooks/incompatible-library
   const watchResourceClass = watch("resourceClass");
@@ -404,6 +353,7 @@ function SubmitJobFormModal({
             id="submitJobResourceClass"
             currentSessionClass={value}
             resourcePools={resourcePools}
+            disabled={isSubmitDisabled}
             onChange={(resourceClass) => {
               onChange(resourceClass);
               if (resourceClass) {
@@ -574,6 +524,7 @@ function SubmitJobFormModal({
                         id="submitJobNickname"
                         innerRef={submissionIdInputRef}
                         type="text"
+                        disabled={isSubmitDisabled}
                       />
                       <div className="invalid-feedback">{error?.message}</div>
                     </>
@@ -584,25 +535,42 @@ function SubmitJobFormModal({
                   only, min 4 characters).
                 </FormText>
               </div>
-
               <div>
-                <Label className={cx("form-label", "me-2")}>Command:</Label>
-                <code className="user-select-all">
-                  {getJSONStringArray(launcher.environment?.command)}
-                </code>
+                <JsonField<SubmitJobForm>
+                  control={control}
+                  name="command"
+                  label={
+                    isCustomImageEnvironment ? "Command CMD" : "Job command"
+                  }
+                  helpText={
+                    isCodeEnvironment
+                      ? "Enter the command that will run as a job (JSON array format)."
+                      : 'Please enter a valid JSON array format e.g. ["npm", "build"]'
+                  }
+                  info={ENVIRONMENT_VALUES_DESCRIPTION.command}
+                  errors={errors}
+                  isOptional={!isCodeEnvironment}
+                  dataCy="submit-job-command-input"
+                  disabled={isSubmitDisabled}
+                />
+              </div>
+              <div>
+                <JsonField<SubmitJobForm>
+                  control={control}
+                  name="args"
+                  label={
+                    isCustomImageEnvironment
+                      ? "Command Arguments CMD"
+                      : "Job arg"
+                  }
+                  helpText='Please enter a valid JSON array format e.g. ["--arg1", "--arg2"]'
+                  info={ENVIRONMENT_VALUES_DESCRIPTION.args}
+                  errors={errors}
+                  isOptional={isCustomImageEnvironment || isCodeEnvironment}
+                  dataCy="submit-job-args-input"
+                  disabled={isSubmitDisabled}
+                />
               </div>
-              <SubmitJobJsonField
-                control={control}
-                name="args"
-                label={
-                  isCustomImageEnvironment ? "Command Arguments CMD" : "Job Arg"
-                }
-                helpText='Please enter a valid JSON array format e.g. ["--arg1", "--arg2"]'
-                info=""
-                isOptional={isCustomImageEnvironment}
-                dataCy="submit-job-args-input"
-                id="submitJobArgs"
-              />
               <div>
                 <Label className="form-label" for="submitJobResourceClass">
                   Compute resources
@@ -717,6 +685,7 @@ function SubmitJobModalContent({
         submissionId: pendingSubmit.submissionId,
         resourceClass: pendingSubmit.resourceClass,
         diskStorage: pendingSubmit.diskStorage,
+        command: pendingSubmit.command,
         args: pendingSubmit.args,
         dataConnectors: dataConnectorConfigs,
       }),
diff --git a/client/src/features/sessionsV2/components/SessionModals/useSubmitJobForm.ts b/client/src/features/sessionsV2/components/SessionModals/useSubmitJobForm.ts
index 22381f246a..368da750e7 100644
--- a/client/src/features/sessionsV2/components/SessionModals/useSubmitJobForm.ts
+++ b/client/src/features/sessionsV2/components/SessionModals/useSubmitJobForm.ts
@@ -26,6 +26,7 @@ import type { SessionLauncher } from "../../api/sessionLaunchersV2.api";
 import {
   getJSONStringArray,
   getLauncherEnvironmentSelect,
+  isJobLauncher,
 } from "../../session.utils";
 import type { EnvironmentSelectOption } from "../../sessionsV2.types";
 
@@ -40,10 +41,22 @@ export interface SubmitJobForm {
 export function getSubmitJobDefaultValues(
   launcher: SessionLauncher
 ): SubmitJobForm {
+  const isJobBuildEnvironment =
+    isJobLauncher(launcher) &&
+    launcher.environment.environment_image_source === "build";
+  const buildParameters =
+    launcher.environment.environment_image_source === "build"
+      ? launcher.environment.build_parameters
+      : undefined;
+
   return {
     submissionId: "",
-    command: getJSONStringArray(launcher.environment?.command) ?? "",
-    args: getJSONStringArray(launcher.environment?.args) ?? "",
+    command: isJobBuildEnvironment
+      ? getJSONStringArray(buildParameters?.job_command) ?? ""
+      : getJSONStringArray(launcher.environment?.command) ?? "",
+    args: isJobBuildEnvironment
+      ? getJSONStringArray(buildParameters?.job_args) ?? ""
+      : getJSONStringArray(launcher.environment?.args) ?? "",
     resourceClass: undefined,
     diskStorage: launcher.disk_storage ?? undefined,
   };
diff --git a/client/src/features/sessionsV2/session.utils.ts b/client/src/features/sessionsV2/session.utils.ts
index 48afe01557..0a29d69c10 100644
--- a/client/src/features/sessionsV2/session.utils.ts
+++ b/client/src/features/sessionsV2/session.utils.ts
@@ -630,15 +630,18 @@ export function buildJobSessionPostRequest({
   submissionId,
   resourceClass,
   diskStorage,
+  command,
   args,
   dataConnectors,
 }: BuildJobSessionPostRequestArgs): SessionPostRequest {
+  const commandParsed = safeParseJSONStringArray(command ?? "");
   const argsParsed = safeParseJSONStringArray(args ?? "");
   const request: SessionPostRequest = {
     launcher_id: launcher.id,
     submission_id: submissionId.trim(),
     resource_class_id: resourceClass.id,
-    job_args_override: args ? argsParsed.data : undefined,
+    job_command_override: command?.trim() ? commandParsed.data : undefined,
+    job_args_override: args?.trim() ? argsParsed.data : undefined,
   };
 
   if (diskStorage != null && diskStorage !== resourceClass.default_storage) {
@@ -651,8 +654,6 @@ export function buildJobSessionPostRequest({
     );
   }
 
-  // TODO: include command/args overrides when SessionPostRequest supports them.
-
   return request;
 }