diff --git a/charts/opskubedbcom-hanadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-hanadbopsrequest-editor/ui/functions.js
index 2e51d2d7bd..26d8e5363c 100644
--- a/charts/opskubedbcom-hanadbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-hanadbopsrequest-editor/ui/functions.js
@@ -664,8 +664,7 @@ export const useFunc = (model) => {
 
   function getMachines() {
     const presets = storeGet('/kubedbuiPresets') || {}
-    const dbDetails = getValue(discriminator, '/dbDetails')
-    const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
+    const limits = getLimits()
 
     const avlMachines = presets.admin?.machineProfiles?.available || []
     let arr = []
@@ -714,9 +713,8 @@ export const useFunc = (model) => {
   }
 
   function setMachine() {
-    const dbDetails = getValue(discriminator, '/dbDetails')
-    const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
-    const annotations = dbDetails?.metadata?.annotations || {}
+    const limits = getLimits()
+    const annotations = getValue(discriminator, '/dbDetails/metadata/annotations') || {}
     const instance = annotations['kubernetes.io/instance-type']
 
     let parsedInstance = {}
@@ -1702,9 +1700,17 @@ export const useFunc = (model) => {
       })
   }
 
-  function isMachineValid() {
+  function getLimits() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    const limits = dbDetails?.spec?.podTemplate?.spec?.resources?.requests || {}
+    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
+    const kind = dbDetails?.kind
+    const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
+    const limits = resource[0]?.resources?.requests || {}
+    return limits
+  }
+
+  function isMachineValid() {
+    const limits = getLimits()
 
     const selectedMachine = getValue(discriminator, '/machine')
     const selectedLimits = { cpu: selectedMachine.cpu, memory: selectedMachine.memory }
diff --git a/charts/opskubedbcom-hazelcastopsrequest-editor/ui/functions.js b/charts/opskubedbcom-hazelcastopsrequest-editor/ui/functions.js
index 7156294cb2..dc0f36c57e 100644
--- a/charts/opskubedbcom-hazelcastopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-hazelcastopsrequest-editor/ui/functions.js
@@ -769,10 +769,7 @@ export const useFunc = (model) => {
 
   function getMachines() {
     const presets = storeGet('/kubedbuiPresets') || {}
-    const dbDetails = getValue(discriminator, '/dbDetails')
-    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const hazelcastContainer = containers.find((c) => c.name === 'hazelcast')
-    const limits = hazelcastContainer?.resources?.requests || {}
+    const limits = getLimits()
 
     const avlMachines = presets.admin?.machineProfiles?.available || []
     let arr = []
@@ -822,9 +819,7 @@ export const useFunc = (model) => {
 
   function setMachine() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const hazelcastContainer = containers.find((c) => c.name === 'hazelcast')
-    const limits = hazelcastContainer?.resources?.requests || {}
+    const limits = getLimits()
 
     const annotations = dbDetails?.metadata?.annotations || {}
     const instance = annotations['kubernetes.io/instance-type']
@@ -1812,11 +1807,17 @@ export const useFunc = (model) => {
       })
   }
 
-  function isMachineValid() {
+  function getLimits() {
     const dbDetails = getValue(discriminator, '/dbDetails')
     const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const hazelcastContainer = containers.find((c) => c.name === 'hazelcast')
-    const limits = hazelcastContainer?.resources?.requests || {}
+    const kind = dbDetails?.kind
+    const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
+    const limits = resource[0]?.resources?.requests || {}
+    return limits
+  }
+
+  function isMachineValid() {
+    const limits = getLimits()
 
     const selectedMachine = getValue(discriminator, '/machine')
     const selectedLimits = { cpu: selectedMachine.cpu, memory: selectedMachine.memory }
diff --git a/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js b/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js
index a5168caa19..dbbd6f5374 100644
--- a/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js
@@ -754,15 +754,10 @@ export const useFunc = (model) => {
   // vertical scaling
 
   // machine profile stuffs
-  // let machinesFromPreset = []
 
   function getMachines() {
     const presets = storeGet('/kubedbuiPresets') || {}
-    const dbDetails = getValue(discriminator, '/dbDetails')
-    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const limits =
-      dbDetails?.spec?.podTemplate?.spec?.resources?.requests ??
-      (containers[0]?.resources?.limits || {})
+    const limits = getLimits()
 
     const avlMachines = presets.admin?.machineProfiles?.available || []
     let arr = []
@@ -812,9 +807,8 @@ export const useFunc = (model) => {
 
   function setMachine() {
     const dbDetails = getValue(discriminator, '/dbDetails')
-    const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const igniteContainer = containers.find((c) => c.name === 'ignite')
-    const limits = igniteContainer?.resources?.requests || {}
+    const limits = getLimits()
+    console.log(limits)
     const annotations = dbDetails?.metadata?.annotations || {}
     const instance = annotations['kubernetes.io/instance-type']
 
@@ -830,6 +824,7 @@ export const useFunc = (model) => {
 
     const machinePresets = machinesFromPreset.find((item) => item.id === machine)
     if (machinePresets) {
+      console.log('machinePresets', machinePresets, machine)
       return {
         machine: machine,
         cpu: machinePresets.limits.cpu,
@@ -1801,11 +1796,18 @@ export const useFunc = (model) => {
       })
   }
 
-  function isMachineValid() {
+  function getLimits() {
     const dbDetails = getValue(discriminator, '/dbDetails')
     const containers = dbDetails?.spec?.podTemplate?.spec?.containers || []
-    const igniteContainer = containers.find((c) => c.name === 'ignite')
-    const limits = igniteContainer?.resources?.requests || {}
+    const kind = dbDetails?.kind
+    const resource = containers.filter((ele) => ele.name === kind?.toLowerCase())
+    const limits = resource[0]?.resources?.requests || {}
+    return limits
+  }
+
+  function isMachineValid() {
+    const dbDetails = getValue(discriminator, '/dbDetails')
+    let limits = getLimits()
     delete limits.machine
 
     const selectedMachine = getValue(discriminator, '/machine')