diff --git a/charts/opskubedbcom-cassandraopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-cassandraopsrequest-editor/ui/create-ui.yaml
index bc87bae286..e7b356d757 100644
--- a/charts/opskubedbcom-cassandraopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-cassandraopsrequest-editor/ui/create-ui.yaml
@@ -152,7 +152,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-cassandraopsrequest-editor/ui/functions.js b/charts/opskubedbcom-cassandraopsrequest-editor/ui/functions.js
index 7088cc411f..0416e232a2 100644
--- a/charts/opskubedbcom-cassandraopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-cassandraopsrequest-editor/ui/functions.js
@@ -864,12 +864,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-clickhouseopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-clickhouseopsrequest-editor/ui/create-ui.yaml
index c7ea92580b..0e7237fa6b 100644
--- a/charts/opskubedbcom-clickhouseopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-clickhouseopsrequest-editor/ui/create-ui.yaml
@@ -152,7 +152,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-clickhouseopsrequest-editor/ui/functions.js b/charts/opskubedbcom-clickhouseopsrequest-editor/ui/functions.js
index 2585f794da..c40ed57673 100644
--- a/charts/opskubedbcom-clickhouseopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-clickhouseopsrequest-editor/ui/functions.js
@@ -876,12 +876,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-documentdbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-documentdbopsrequest-editor/ui/create-ui.yaml
index 4b7e216d1f..f69d0cdf66 100644
--- a/charts/opskubedbcom-documentdbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-documentdbopsrequest-editor/ui/create-ui.yaml
@@ -152,7 +152,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|documentdb
           paths:
diff --git a/charts/opskubedbcom-documentdbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-documentdbopsrequest-editor/ui/functions.js
index 979a5de30d..d58c684115 100644
--- a/charts/opskubedbcom-documentdbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-documentdbopsrequest-editor/ui/functions.js
@@ -875,12 +875,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
index f21f01b34e..8f8a5bf924 100644
--- a/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-druidopsrequest-editor/ui/functions.js
@@ -929,14 +929,16 @@ export const useFunc = (model) => {
       }
     }
 
-    const specPath = `/spec/verticalScaling/${type}/resources`
+    const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
-        path: specPath,
+        path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // Update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
index f9b32827c6..984875b795 100644
--- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/create-ui.yaml
@@ -221,7 +221,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid|node
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
index d3c09db6f7..876f416af6 100644
--- a/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-elasticsearchopsrequest-editor/ui/functions.js
@@ -1009,12 +1009,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-hanadbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-hanadbopsrequest-editor/ui/create-ui.yaml
index d3ee7f9686..2a6dad5440 100644
--- a/charts/opskubedbcom-hanadbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-hanadbopsrequest-editor/ui/create-ui.yaml
@@ -93,7 +93,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-hanadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-hanadbopsrequest-editor/ui/functions.js
index de1a29eb73..1b0b6541fa 100644
--- a/charts/opskubedbcom-hanadbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-hanadbopsrequest-editor/ui/functions.js
@@ -757,12 +757,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-hazelcastopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-hazelcastopsrequest-editor/ui/create-ui.yaml
index b8ff48ed14..21df7b3c42 100644
--- a/charts/opskubedbcom-hazelcastopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-hazelcastopsrequest-editor/ui/create-ui.yaml
@@ -152,7 +152,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|hazelcast
           paths:
diff --git a/charts/opskubedbcom-hazelcastopsrequest-editor/ui/functions.js b/charts/opskubedbcom-hazelcastopsrequest-editor/ui/functions.js
index b8f4fa3e7b..4221ee69b7 100644
--- a/charts/opskubedbcom-hazelcastopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-hazelcastopsrequest-editor/ui/functions.js
@@ -864,12 +864,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-igniteopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-igniteopsrequest-editor/ui/create-ui.yaml
index 39bbe08903..40308c9951 100644
--- a/charts/opskubedbcom-igniteopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-igniteopsrequest-editor/ui/create-ui.yaml
@@ -153,7 +153,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js b/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js
index bb76b1c0d6..2e6b78db54 100644
--- a/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-igniteopsrequest-editor/ui/functions.js
@@ -853,12 +853,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
index d7cd190b7e..4a8623e01b 100644
--- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/create-ui.yaml
@@ -170,7 +170,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid|node
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
index 9cd7dc380d..7ff45b4655 100644
--- a/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-kafkaopsrequest-editor/ui/functions.js
@@ -881,12 +881,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
index 0b5ec44be7..9186b1a394 100644
--- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/create-ui.yaml
@@ -151,7 +151,7 @@ step:
       type: machine-compare
       validation:
         name: isMachineValid
-        type: custom
+        type: custom|required
       watcher:
         func: onMachineChange|mariadb
         paths:
diff --git a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
index 3d6167d7ca..8a8c00feb6 100644
--- a/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mariadbopsrequest-editor/ui/functions.js
@@ -867,12 +867,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-memcachedopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-memcachedopsrequest-editor/ui/create-ui.yaml
index faa92fe891..84e2e89934 100644
--- a/charts/opskubedbcom-memcachedopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-memcachedopsrequest-editor/ui/create-ui.yaml
@@ -136,7 +136,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|memcached
           paths:
diff --git a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js
index 9db8361961..b9b5816030 100644
--- a/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-memcachedopsrequest-editor/ui/functions.js
@@ -847,12 +847,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-milvusopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-milvusopsrequest-editor/ui/create-ui.yaml
index b87a38ae5a..c7a74d796a 100644
--- a/charts/opskubedbcom-milvusopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-milvusopsrequest-editor/ui/create-ui.yaml
@@ -192,7 +192,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid|node
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-milvusopsrequest-editor/ui/functions.js b/charts/opskubedbcom-milvusopsrequest-editor/ui/functions.js
index 1ea947e2e1..e59d25d1ba 100644
--- a/charts/opskubedbcom-milvusopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-milvusopsrequest-editor/ui/functions.js
@@ -823,12 +823,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     const annotations = getValue(model, '/metadata/annotations') || {}
     const instance = annotations['kubernetes.io/instance-type']
diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
index 506851e66d..6e00cfde00 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/create-ui.yaml
@@ -236,7 +236,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid|standalone
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|standalone
           paths:
@@ -305,7 +305,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid|replicaSet
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|replicaSet
           paths:
diff --git a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
index 295731d995..46eb3c89e2 100644
--- a/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mongodbopsrequest-editor/ui/functions.js
@@ -902,12 +902,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/create-ui.yaml
index 481c2ddb73..96de9bb952 100644
--- a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/create-ui.yaml
@@ -149,7 +149,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|mssqlserver
           paths:
diff --git a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
index 4b16735c2b..8367fae031 100644
--- a/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mssqlserveropsrequest-editor/ui/functions.js
@@ -842,12 +842,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
index b2c6e78ae8..bc99634002 100644
--- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/create-ui.yaml
@@ -155,7 +155,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|mysql
           paths:
diff --git a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
index 9903200fb8..44fd4fa58d 100644
--- a/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-mysqlopsrequest-editor/ui/functions.js
@@ -873,12 +873,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-neo4jopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-neo4jopsrequest-editor/ui/create-ui.yaml
index 1680ac0ac1..c64b10d4f0 100644
--- a/charts/opskubedbcom-neo4jopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-neo4jopsrequest-editor/ui/create-ui.yaml
@@ -152,7 +152,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|neo4j
           paths:
diff --git a/charts/opskubedbcom-neo4jopsrequest-editor/ui/functions.js b/charts/opskubedbcom-neo4jopsrequest-editor/ui/functions.js
index 76b3879bd1..2f37348098 100644
--- a/charts/opskubedbcom-neo4jopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-neo4jopsrequest-editor/ui/functions.js
@@ -870,12 +870,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-oracleopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-oracleopsrequest-editor/ui/create-ui.yaml
index f47a8fa978..f0b7b0d7f2 100644
--- a/charts/opskubedbcom-oracleopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-oracleopsrequest-editor/ui/create-ui.yaml
@@ -155,7 +155,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-oracleopsrequest-editor/ui/functions.js b/charts/opskubedbcom-oracleopsrequest-editor/ui/functions.js
index d0edf28bf7..27e737c076 100644
--- a/charts/opskubedbcom-oracleopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-oracleopsrequest-editor/ui/functions.js
@@ -871,12 +871,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
index 5ce2a1e03c..3240e18ee4 100644
--- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/create-ui.yaml
@@ -126,7 +126,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|perconaxtradb
           paths:
diff --git a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
index 24bf2eafc8..f6cfd9098d 100644
--- a/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-perconaxtradbopsrequest-editor/ui/functions.js
@@ -815,12 +815,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/create-ui.yaml
index c8feb61af9..7a4c0b1428 100644
--- a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/create-ui.yaml
@@ -147,7 +147,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|pgbouncer
           paths:
diff --git a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
index 46d7fcc6a0..6a40b5f4e2 100644
--- a/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-pgbounceropsrequest-editor/ui/functions.js
@@ -847,12 +847,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
index c3badbead5..bf177dbede 100644
--- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/create-ui.yaml
@@ -150,7 +150,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
index 5f893952cc..9d13ef7532 100644
--- a/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-pgpoolopsrequest-editor/ui/functions.js
@@ -859,12 +859,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
index 671833df8a..6bcc78c62c 100644
--- a/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/create-ui.yaml
@@ -150,7 +150,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|postgres
           paths:
diff --git a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
index c4d16a598b..746c730507 100644
--- a/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-postgresopsrequest-editor/ui/functions.js
@@ -858,12 +858,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
index 1cf89bd040..942f78a115 100644
--- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/create-ui.yaml
@@ -148,7 +148,7 @@ step:
       type: machine-compare
       validation:
         name: isMachineValid
-        type: custom
+        type: custom|required
       watcher:
         func: onMachineChange|proxysql
         paths:
diff --git a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
index 12db18e386..5d7b4e1558 100644
--- a/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-proxysqlopsrequest-editor/ui/functions.js
@@ -839,12 +839,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-qdrantopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-qdrantopsrequest-editor/ui/create-ui.yaml
index e598b1b87d..2f505f714f 100644
--- a/charts/opskubedbcom-qdrantopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-qdrantopsrequest-editor/ui/create-ui.yaml
@@ -152,7 +152,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-qdrantopsrequest-editor/ui/functions.js b/charts/opskubedbcom-qdrantopsrequest-editor/ui/functions.js
index e2efd357e9..445f7601bc 100644
--- a/charts/opskubedbcom-qdrantopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-qdrantopsrequest-editor/ui/functions.js
@@ -874,12 +874,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
index d5567b7411..2c06b80146 100644
--- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/create-ui.yaml
@@ -154,7 +154,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
index e2c0ca66ab..aa87db21c8 100644
--- a/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-rabbitmqopsrequest-editor/ui/functions.js
@@ -846,12 +846,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     const annotations = getValue(model, '/metadata/annotations') || {}
     annotations['kubernetes.io/instance-type'] = selectedMachine.machine
diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
index d36e80e97f..ee22cbf314 100644
--- a/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-redisopsrequest-editor/ui/create-ui.yaml
@@ -161,7 +161,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|redis
           paths:
diff --git a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
index 071675dd72..741e75a328 100644
--- a/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-redisopsrequest-editor/ui/functions.js
@@ -858,12 +858,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
index 4b0c91c590..4df2479326 100644
--- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/create-ui.yaml
@@ -310,7 +310,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
@@ -798,6 +798,7 @@ step:
         schema: temp/properties/reconfigurationType
         type: tab-layout
       label: Aggregator Configuration
+      showLabels: true
       type: block-layout
     - elements:
       - label: ""
@@ -961,6 +962,7 @@ step:
         schema: temp/properties/reconfigurationType
         type: tab-layout
       label: Leaf Configuration
+      showLabels: true
       type: block-layout
     if:
       name: ifRequestTypeEqualsTo|Reconfigure
diff --git a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
index 844891a586..6182d48195 100644
--- a/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-singlestoreopsrequest-editor/ui/functions.js
@@ -855,12 +855,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
index 1de0ce8b33..d2fdb54ea9 100644
--- a/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-solropsrequest-editor/ui/create-ui.yaml
@@ -226,7 +226,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|node
           paths:
diff --git a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
index 112448d1fe..0029aa5f68 100644
--- a/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-solropsrequest-editor/ui/functions.js
@@ -883,12 +883,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-weaviateopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-weaviateopsrequest-editor/ui/create-ui.yaml
index f8865f4309..0b7c1aaeec 100644
--- a/charts/opskubedbcom-weaviateopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-weaviateopsrequest-editor/ui/create-ui.yaml
@@ -152,7 +152,7 @@ step:
         type: machine-compare
         validation:
           name: isMachineValid
-          type: custom
+          type: custom|required
         watcher:
           func: onMachineChange|weaviate
           paths:
diff --git a/charts/opskubedbcom-weaviateopsrequest-editor/ui/functions.js b/charts/opskubedbcom-weaviateopsrequest-editor/ui/functions.js
index e453aa889b..5ac42ae174 100644
--- a/charts/opskubedbcom-weaviateopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-weaviateopsrequest-editor/ui/functions.js
@@ -876,12 +876,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/create-ui.yaml b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/create-ui.yaml
index eaee69fe16..aa29e3da24 100644
--- a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/create-ui.yaml
+++ b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/create-ui.yaml
@@ -151,7 +151,7 @@ step:
       type: machine-compare
       validation:
         name: isMachineValid
-        type: custom
+        type: custom|required
       watcher:
         func: onMachineChange|node
         paths:
diff --git a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js
index 1430bc8eb7..6f4b146b31 100644
--- a/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js
+++ b/charts/opskubedbcom-zookeeperopsrequest-editor/ui/functions.js
@@ -1525,12 +1525,14 @@ export const useFunc = (model) => {
 
     const path = `/spec/verticalScaling/${type}/resources`
 
-    if (obj && Object.keys(obj).length)
+    if (obj && Object.keys(obj).length) {
       commit('wizard/model$update', {
         path: path,
         value: obj,
-        force: true,
       })
+    } else {
+      commit('wizard/model$delete', `/spec/verticalScaling/${type}`)
+    }
 
     // update metadata.annotations
     const annotations = getValue(model, '/metadata/annotations') || {}
diff --git a/schemas/ui-schema.json b/schemas/ui-schema.json
index 1d18ca2da0..a2f8848280 100644
--- a/schemas/ui-schema.json
+++ b/schemas/ui-schema.json
@@ -2058,7 +2058,6 @@
               "type": "string"
             },
             "type": {
-              "const": "custom",
               "type": "string"
             }
           },