diff --git a/src/fireedge/src/client/components/Forms/Vm/AttachDiskForm/VolatileSteps/AdvancedOptions/schema.js b/src/fireedge/src/client/components/Forms/Vm/AttachDiskForm/VolatileSteps/AdvancedOptions/schema.js
index f96ce762639..fe1dafd0f48 100644
--- a/src/fireedge/src/client/components/Forms/Vm/AttachDiskForm/VolatileSteps/AdvancedOptions/schema.js
+++ b/src/fireedge/src/client/components/Forms/Vm/AttachDiskForm/VolatileSteps/AdvancedOptions/schema.js
@@ -26,7 +26,7 @@ import { T, HYPERVISORS } from 'client/constants'
 import {
   Field,
   Section,
-  getValidationFromFields,
+  getObjectSchemaFromFields,
   filterFieldsByHypervisor,
 } from 'client/utils'
 
@@ -75,6 +75,6 @@ const FIELDS = (hypervisor) =>
  * @param {HYPERVISORS} hypervisor - Hypervisor
  * @returns {ObjectSchema} Advanced options schema
  */
-const SCHEMA = (hypervisor) => getValidationFromFields(FIELDS(hypervisor))
+const SCHEMA = (hypervisor) => getObjectSchemaFromFields(FIELDS(hypervisor))
 
 export { SECTIONS, FIELDS, SCHEMA }
diff --git a/src/fireedge/src/client/components/Forms/VmTemplate/InstantiateForm/Steps/UserInputs/index.js b/src/fireedge/src/client/components/Forms/VmTemplate/InstantiateForm/Steps/UserInputs/index.js
index eb5bd83fd97..34fd785ca15 100644
--- a/src/fireedge/src/client/components/Forms/VmTemplate/InstantiateForm/Steps/UserInputs/index.js
+++ b/src/fireedge/src/client/components/Forms/VmTemplate/InstantiateForm/Steps/UserInputs/index.js
@@ -51,13 +51,11 @@ const UserInputsStep = (vmTemplate) => {
     vmTemplate?.TEMPLATE?.INPUTS_ORDER
   )
 
-  console.log({ userInputs, order: vmTemplate?.TEMPLATE?.INPUTS_ORDER })
-
   return {
     id: STEP_ID,
     label: T.UserInputs,
     optionsValidate: { abortEarly: false },
-    resolver: () => SCHEMA(userInputs),
+    resolver: SCHEMA(userInputs),
     content: (props) => Content({ ...props, userInputs }),
   }
 }