diff --git a/src/common/Input/Input.js b/src/common/Input/Input.js
index 76e69f6bea..a62866dc57 100644
--- a/src/common/Input/Input.js
+++ b/src/common/Input/Input.js
@@ -337,6 +337,7 @@ Input.defaultProps = {
   focused: false,
   iconClass: '',
   iconOnClick: () => { },
+  id: '',
   infoLabel: false,
   inputIcon: null,
   invalid: false,
diff --git a/src/components/JobWizard/JobWizard.js b/src/components/JobWizard/JobWizard.js
index dd95bde438..10a3cbca8e 100644
--- a/src/components/JobWizard/JobWizard.js
+++ b/src/components/JobWizard/JobWizard.js
@@ -422,14 +422,7 @@ const JobWizard = ({
           ref: scheduleButtonRef
         },
         {
-          id:
-            mode === PANEL_EDIT_MODE
-              ? 'job-wizard-btn-save'
-              : isBatchInference
-              ? 'job-wizard-btn-infer-now'
-              : isTrain
-              ? 'job-wizard-btn-run-training'
-              : 'job-wizard-btn-run',
+          id:'run-btn',
           label:
             mode === PANEL_EDIT_MODE
               ? 'Save'
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardDataInputs/JobWizardDataInputs.js b/src/components/JobWizard/JobWizardSteps/JobWizardDataInputs/JobWizardDataInputs.js
index 468017c060..d752f42aa8 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardDataInputs/JobWizardDataInputs.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardDataInputs/JobWizardDataInputs.js
@@ -35,7 +35,6 @@ const JobWizardDataInputs = ({ formState, stepIsActive }) => {
           exitEditModeTriggerItem={stepIsActive}
           fieldsPath={`${DATA_INPUTS_STEP}.dataInputsTable`}
           formState={formState}
-          id="data-inputs-form-table"
           rowCanBeAdded={formState.values.runDetails.handlerData?.has_kwargs}
         />
       </div>
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardResources/JobWizardResources.js b/src/components/JobWizard/JobWizardSteps/JobWizardResources/JobWizardResources.js
index da1bb38961..928bfcbfdc 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardResources/JobWizardResources.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardResources/JobWizardResources.js
@@ -88,7 +88,6 @@ const JobWizardResources = ({ formState, frontendSpec, stepIsActive }) => {
           exitEditModeTriggerItem={stepIsActive}
           fieldsPath={`${RESOURCES_STEP}.volumesTable`}
           formState={formState}
-          id="add-volumes-form-table"
         />
       </div>
     </div>
diff --git a/src/elements/FormDataInputsTable/FormDataInputsTable.js b/src/elements/FormDataInputsTable/FormDataInputsTable.js
index 452fd1557a..3ed54b9676 100644
--- a/src/elements/FormDataInputsTable/FormDataInputsTable.js
+++ b/src/elements/FormDataInputsTable/FormDataInputsTable.js
@@ -153,7 +153,7 @@ const FormDataInputsTable = ({
 FormDataInputsTable.defaultProps = {
   className: '',
   disabled: false,
-  id: 'data-inputs-table',
+  id: 'data-inputs-form-table',
   exitEditModeTriggerItem: null,
   rowCanBeAdded: false
 }
diff --git a/src/elements/FormVolumesTable/FormVolumesTable.js b/src/elements/FormVolumesTable/FormVolumesTable.js
index 132af7f4e6..692e03ab03 100644
--- a/src/elements/FormVolumesTable/FormVolumesTable.js
+++ b/src/elements/FormVolumesTable/FormVolumesTable.js
@@ -113,7 +113,7 @@ const FormVolumesTable = ({ disabled, exitEditModeTriggerItem, fieldsPath, formS
 FormVolumesTable.defaultProps = {
   disabled: false,
   exitEditModeTriggerItem: null,
-  id: 'volumes-table'
+  id: 'volumes-form-table'
 }
 
 FormVolumesTable.propTypes = {