diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
index 6c78ad7e..81029521 100644
--- a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
+++ b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
@@ -257,6 +257,7 @@ export default {
         :label="t('harvester.vmTemplate.tabs.basics')"
       >
         <CpuMemory
+          class="mb-20"
           :cpu="cpu"
           :memory="memory"
           :max-cpu="maxCpu"
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue
index ad22942b..c0eeaef8 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue
@@ -240,7 +240,7 @@ export default {
 </script>
 
 <template>
-  <div class="mt-20">
+  <div>
     <LabeledSelect
       v-model:value="checkedSsh"
       :label="t('harvester.virtualMachine.input.sshKey')"
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
index ad998c54..1a27322f 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
@@ -605,6 +605,7 @@ export default {
         :label="t('harvester.virtualMachine.detail.tabs.basics')"
       >
         <CpuMemory
+          class="mb-20"
           :cpu="cpu"
           :max-cpu="maxCpu"
           :memory="memory"
diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js
index 9a0427c3..45facabf 100644
--- a/pkg/harvester/mixins/harvester-vm/index.js
+++ b/pkg/harvester/mixins/harvester-vm/index.js
@@ -691,10 +691,13 @@ export default {
         this.spec.template.spec.domain.cpu.cores = this.cpu;
         this.spec.template.spec.domain.resources.limits.cpu = this.cpu?.toString();
         this.spec.template.spec.domain.resources.limits.memory = this.memory;
-        // clean
-        delete this.spec.template.spec.resources;
-        delete this.spec.template.spec.domain.memory;
-        delete this.spec.template.spec.domain.cpu.maxSockets;
+        // clean below fields as we don't need them if not enable CPU and memory hotplug
+        if (this.spec?.template?.spec?.domain?.cpu?.maxSockets) {
+          delete this.spec.template.spec.domain.cpu.maxSockets;
+        }
+        if (this.spec?.template?.spec?.domain?.memory?.maxGuest) {
+          delete this.spec.template.spec.domain.memory.maxGuest;
+        }
       }
     },