diff --git a/src/handler.ts b/src/handler.ts
index c852fab8..590bd483 100644
--- a/src/handler.ts
+++ b/src/handler.ts
@@ -363,6 +363,9 @@ export namespace Scheduler {
     compute_type?: string;
     schedule?: string;
     timezone?: string;
+    maxRetryAttempts: number;
+    maxRunTime: number;
+    maxWaitTime: number;
   }
 
   export interface IUpdateJobDefinition {
@@ -389,6 +392,9 @@ export namespace Scheduler {
     create_time: number;
     update_time: number;
     active: boolean;
+    maxRetryAttempts: number;
+    maxRunTime: number;
+    maxWaitTime: number;
   }
 
   export interface IEmailNotifications {
@@ -415,6 +421,9 @@ export namespace Scheduler {
     output_filename_template?: string;
     output_formats?: string[];
     compute_type?: string;
+    maxRetryAttempts: number;
+    maxRunTime: number;
+    maxWaitTime: number;
   }
 
   export interface ICreateJobFromDefinition {
diff --git a/src/mainviews/create-job.tsx b/src/mainviews/create-job.tsx
index 9b2ea81c..efa891b4 100644
--- a/src/mainviews/create-job.tsx
+++ b/src/mainviews/create-job.tsx
@@ -20,7 +20,7 @@ import { Scheduler, SchedulerService } from '../handler';
 import { useTranslator } from '../hooks';
 import { ICreateJobModel, IJobParameter, JobsView } from '../model';
 import { Scheduler as SchedulerTokens } from '../tokens';
-import { NameError } from '../util/job-name-validation';
+import { NameError, MaxRetryAttemptsError, MaxRunTimeError, MaxWaitTimeError } from '../util/job-name-validation';
 
 import { caretDownIcon } from '@jupyterlab/ui-components';
 
@@ -191,6 +191,26 @@ export function CreateJob(props: ICreateJobProps): JSX.Element {
     }
   };
 
+  const handleNumericInputChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const target = event.target;
+
+    const parameterNameIdx = parameterNameMatch(target.name);
+    const parameterValueIdx = parameterValueMatch(target.name);
+    const newParams = props.model.parameters || [];
+
+    if (parameterNameIdx !== null) {
+      newParams[parameterNameIdx].name = target.value;
+      props.handleModelChange({ ...props.model, parameters: newParams });
+    } else if (parameterValueIdx !== null) {
+      newParams[parameterValueIdx].value = +target.value;
+      props.handleModelChange({ ...props.model, parameters: newParams });
+    } else {
+      const value = parseInt(target.value);
+      const name = target.name;
+      props.handleModelChange({ ...props.model, [name]: isNaN(value)? target.value: value });
+    }
+  };
+
   const handleSelectChange = (event: SelectChangeEvent<string>) => {
     const target = event.target;
 
@@ -288,11 +308,11 @@ export function CreateJob(props: ICreateJobProps): JSX.Element {
       if (jobParameters[name] !== undefined) {
         console.error(
           'Parameter ' +
-            name +
-            ' already set to ' +
-            jobParameters[name] +
-            ' and is about to be set again to ' +
-            value
+          name +
+          ' already set to ' +
+          jobParameters[name] +
+          ' and is about to be set again to ' +
+          value
         );
       } else {
         jobParameters[name] = value;
@@ -319,7 +339,10 @@ export function CreateJob(props: ICreateJobProps): JSX.Element {
       compute_type: props.model.computeType,
       idempotency_token: props.model.idempotencyToken,
       tags: props.model.tags,
-      runtime_environment_parameters: props.model.runtimeEnvironmentParameters
+      runtime_environment_parameters: props.model.runtimeEnvironmentParameters,
+      maxRetryAttempts: props.model.maxRetryAttempts,
+      maxRunTime: props.model.maxRunTime,
+      maxWaitTime: props.model.maxWaitTime,
     };
 
     if (props.model.parameters !== undefined) {
@@ -364,7 +387,10 @@ export function CreateJob(props: ICreateJobProps): JSX.Element {
       tags: props.model.tags,
       runtime_environment_parameters: props.model.runtimeEnvironmentParameters,
       schedule: props.model.schedule,
-      timezone: props.model.timezone
+      timezone: props.model.timezone,
+      maxRetryAttempts: props.model.maxRetryAttempts,
+      maxRunTime: props.model.maxRunTime,
+      maxWaitTime: props.model.maxWaitTime,
     };
 
     if (props.model.parameters !== undefined) {
@@ -495,6 +521,7 @@ export function CreateJob(props: ICreateJobProps): JSX.Element {
             environmentList={environmentList}
             value={props.model.environment}
           />
+
           <OutputFormatPicker
             label={trans.__('Output formats')}
             name="outputFormat"
@@ -549,6 +576,63 @@ export function CreateJob(props: ICreateJobProps): JSX.Element {
               </FormLabel>
             </AccordionSummary>
             <AccordionDetails id={`${formPrefix}create-panel-content`}>
+              <div>
+                <TextField
+                  label={trans.__('Maximum Retry Attempts')}
+                  variant="outlined"
+                  onChange={e => {
+                    // Validate name
+                    setErrors({
+                      ...errors,
+                      maxRetryAttempts: MaxRetryAttemptsError(e.target.value, trans)
+                    });
+                    handleNumericInputChange(e as ChangeEvent<HTMLInputElement>);
+                  }}
+                  error={!!errors['maxRetryAttempts']}
+                  helperText={errors['maxRetryAttempts'] ?? ''}
+                  value={props.model.maxRetryAttempts}
+                  id={`${formPrefix}maxRetryAttempts`}
+                  name="maxRetryAttempts"
+                />
+              </div>
+              <div>
+                <TextField
+                  label={trans.__('Max Run Time (In Seconds)')}
+                  variant="outlined"
+                  onChange={e => {
+                    // Validate name
+                    setErrors({
+                      ...errors,
+                      maxRunTime: MaxRunTimeError(e.target.value, trans)
+                    });
+                    handleNumericInputChange(e as ChangeEvent<HTMLInputElement>);
+                  }}
+                  error={!!errors['maxRunTime']}
+                  helperText={errors['maxRunTime'] ?? ''}
+                  value={props.model.maxRunTime}
+                  id={`${formPrefix}maxRunTime`}
+                  name="maxRunTime"
+                />
+              </div>
+              <div>
+                <TextField
+                  label={trans.__('Max Wait Time (In Seconds)')}
+                  variant="outlined"
+                  onChange={e => {
+                    // Validate name
+                    setErrors({
+                      ...errors,
+                      maxWaitTime: MaxWaitTimeError(e.target.value, trans)
+                    });
+                    handleNumericInputChange(e as ChangeEvent<HTMLInputElement>);
+                  }}
+                  error={!!errors['maxWaitTime']}
+                  helperText={errors['maxWaitTime'] ?? ''}
+                  value={props.model.maxWaitTime}
+                  id={`${formPrefix}maxWaitTime`}
+                  name="maxWaitTime"
+                />
+              </div>
               <props.advancedOptions
                 jobsView={JobsView.CreateForm}
                 model={props.model}
diff --git a/src/model.ts b/src/model.ts
index a3b5c6fe..99eeefe2 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -72,11 +72,17 @@ export type ModelWithScheduleFields = {
    * Value of input field for past the hour.
    */
   scheduleMinute: string;
+
+  maxRetryAttempts: number;
+
+  maxRunTime: number;
+
+  maxWaitTime: number;
 };
 
 export interface ICreateJobModel
   extends ModelWithScheduleFields,
-    PartialJSONObject {
+  PartialJSONObject {
   /**
    * Key of the CreateJob component. When changed, this forces a re-mount.
    */
@@ -99,6 +105,9 @@ export interface ICreateJobModel
   tags?: string[];
   // Is the create button disabled due to a submission in progress?
   createInProgress?: boolean;
+  maxRetryAttempts: number;
+  maxRunTime: number;
+  maxWaitTime: number;
 }
 
 export const defaultScheduleFields: ModelWithScheduleFields = {
@@ -108,7 +117,10 @@ export const defaultScheduleFields: ModelWithScheduleFields = {
   scheduleMinute: '0',
   scheduleMonthDay: '1',
   scheduleWeekDay: '1',
-  timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
+  timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+  maxRetryAttempts: 1,
+  maxRunTime: 172800,
+  maxWaitTime: 172800,
 };
 
 export function emptyCreateJobModel(): ICreateJobModel {
@@ -125,7 +137,7 @@ export function emptyCreateJobModel(): ICreateJobModel {
 
 export interface IUpdateJobDefinitionModel
   extends ModelWithScheduleFields,
-    PartialJSONObject {
+  PartialJSONObject {
   definitionId: string;
   name: string;
   environment: string;
@@ -267,7 +279,7 @@ export class JobsModel extends VDomModel {
 
   fromJson(data: IJobsModel): void {
     this._jobsView = data.jobsView ?? JobsView.ListJobs;
-    this._createJobModel = data.createJobModel ?? emptyCreateJobModel();
+    this._createJobModel = data.createJobModel ? { ...defaultScheduleFields, ...data.createJobModel } : emptyCreateJobModel();
     this._listJobsModel = data.listJobsModel ?? emptyListJobsModel();
     this._jobDetailModel = data.jobDetailModel ?? emptyDetailViewModel();
     this._updateJobDefinitionModel =
diff --git a/src/util/job-name-validation.tsx b/src/util/job-name-validation.tsx
index 2bd9bbb3..0fcbfb1c 100644
--- a/src/util/job-name-validation.tsx
+++ b/src/util/job-name-validation.tsx
@@ -64,3 +64,65 @@ export function NameError(name: string, trans: TranslationBundle): string {
     'Name must contain only letters, numbers, spaces, periods, hyphens, and underscores'
   );
 }
+
+export function MaxRetryAttemptsError(maxRetryAttempts: string, trans: TranslationBundle): string {
+  // Check for blank
+  if (maxRetryAttempts === '') {
+    return trans.__('You must specify max retry attempts');
+  }
+
+  const integerValue = parseInt(maxRetryAttempts)
+  if (isNaN(integerValue)) {
+    return trans.__(
+      'Max retry attempts must be an integer'
+    );
+  }
+
+  // Check for length.
+  if (integerValue < 1 || integerValue > 30) {
+    return trans.__('Max retry attempts must be between 1 and 30');
+  }
+
+  return '';
+}
+
+export function MaxRunTimeError(maxRunTime: string, trans: TranslationBundle): string {
+  // Check for blank
+  if (maxRunTime === '') {
+    return trans.__('You must specify max run time');
+  }
+
+  const integerValue = parseInt(maxRunTime)
+  if (isNaN(integerValue)) {
+    return trans.__(
+      'Max run time must be an integer'
+    );
+  }
+
+  // Check for length.
+  if (integerValue < 1) {
+    return trans.__('Max run time must be greater than 1');
+  }
+
+  return '';
+}
+
+export function MaxWaitTimeError(maxWaitTime: string, trans: TranslationBundle): string {
+  // Check for blank
+  if (maxWaitTime === '') {
+    return trans.__('You must specify max run time');
+  }
+  const integerValue = parseInt(maxWaitTime)
+  if (isNaN(integerValue)) {
+    return trans.__(
+      'Max wait time must be an integer'
+    );
+  }
+
+  // Check for length.
+  if (integerValue < 1) {
+    return trans.__('Max wait time must be greater than 1');
+  }
+
+  return '';
+}