diff --git a/charts/opskubedbcom-igniteopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-igniteopsrequest-editor/ui/create-ui.yaml
index 316aa63233..1aa51cfa9d 100644
--- a/charts/opskubedbcom-igniteopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-igniteopsrequest-editor/ui/create-ui.yaml
@@ -155,7 +155,7 @@ step:
           name: isMachineValid
           type: custom
         watcher:
-          func: onMachineChange|ignite|/spec/podTemplate/spec/resources
+          func: onMachineChange|node|/spec/podTemplate/spec/resources
           paths:
           - temp/properties/machine
       - elements:
@@ -172,7 +172,7 @@ step:
                 value: LabelSelector
               - text: Taint
                 value: Taint
-              schema: schema/properties/spec/properties/verticalScaling/properties/ignite/properties/nodeSelectionPolicy
+              schema: schema/properties/spec/properties/verticalScaling/properties/node/properties/nodeSelectionPolicy
               type: select
             hideBorder: true
             showLabels: false
diff --git a/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js b/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js
index 6afa728878..248c53d4e6 100644
--- a/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js
@@ -812,7 +812,9 @@ export const useFunc = (model) => {
 
   function setMachine() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
+    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
+    const igniteContainer = containers.find((c) => c.name === 'ignite')
+    const limits = igniteContainer?.resources?.requests || {}
     const annotations = dbDetails?.metadata?.annotations || {}
     const instance = annotations['kubernetes.io/instance-type']
 
@@ -1820,7 +1822,9 @@ export const useFunc = (model) => {
 
   function isMachineValid() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    let limits = setMachine()
+    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
+    const igniteContainer = containers.find((c) => c.name === 'ignite')
+    const limits = igniteContainer?.resources?.requests || {}
     delete limits.machine
 
     const selectedMachine = getValue(discriminator, '/machine')