diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
index 753182a4..aa4fd34f 100644
--- a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
+++ b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
@@ -278,6 +278,25 @@ export default {
         name="Basics"
         :label="t('harvester.vmTemplate.tabs.basics')"
       >
+        <div class="row mb-20">
+          <div class="col span-6">
+            <LabeledSelect
+              v-model:value="osType"
+              label-key="harvester.virtualMachine.osType"
+              :mode="mode"
+              :options="OS"
+              :tooltip="isCreate ? t('harvester.virtualMachine.osTypeTooltip') : null"
+            />
+          </div>
+          <div class="col span-6">
+            <CpuModel
+              :value="spec.template.spec.domain.cpu?.model || ''"
+              :mode="mode"
+              @update:value="updateCpuModel"
+            />
+          </div>
+        </div>
+
         <CpuMemory
           class="mb-20"
           :cpu="cpu"
@@ -289,6 +308,69 @@ export default {
           @updateCpuMemory="updateCpuMemory"
         />
 
+        <div class="mb-20">
+          <Checkbox
+            v-if="value.cpuPinningFeatureEnabled"
+            v-model:value="cpuPinning"
+            class="check"
+            type="checkbox"
+            tooltip-key="harvester.virtualMachine.cpuPinning.tooltip"
+            label-key="harvester.virtualMachine.cpuPinning.label"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-model:value="installUSBTablet"
+            class="check"
+            type="checkbox"
+            :label="t('harvester.virtualMachine.enableUsb')"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-model:value="tpmEnabled"
+            class="check"
+            type="checkbox"
+            label-key="harvester.virtualMachine.systemOptions.tpm"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-if="value.tpmPersistentStateFeatureEnabled && tpmEnabled"
+            v-model:value="tpmPersistentStateEnabled"
+            class="check"
+            type="checkbox"
+            :label="t('harvester.virtualMachine.systemOptions.tpmPersistentState')"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-model:value="efiEnabled"
+            class="check"
+            type="checkbox"
+            :label="t('harvester.virtualMachine.systemOptions.efiEnabled')"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-if="value.efiPersistentStateFeatureEnabled && efiEnabled"
+            v-model:value="efiPersistentStateEnabled"
+            class="check"
+            type="checkbox"
+            :label="t('harvester.virtualMachine.systemOptions.efiPersistentState')"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-if="efiEnabled"
+            v-model:value="secureBoot"
+            class="check"
+            type="checkbox"
+            :label="t('harvester.virtualMachine.systemOptions.secureBoot')"
+            :mode="mode"
+          />
+        </div>
+
         <div class="mb-20">
           <SSHKey
             v-model:value="sshKey"
@@ -446,18 +528,6 @@ export default {
               :mode="mode"
             />
           </div>
-
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="osType"
-              label-key="harvester.virtualMachine.osType"
-              :mode="mode"
-              :options="OS"
-            />
-          </div>
-        </div>
-
-        <div class="row mb-20">
           <div class="col span-6">
             <LabeledSelect
               v-model:value="maintenanceStrategy"
@@ -467,6 +537,9 @@ export default {
               :mode="mode"
             />
           </div>
+        </div>
+
+        <div class="row mb-20">
           <div class="col span-6">
             <Reserved
               :reserved-memory="reservedMemory"
@@ -476,16 +549,6 @@ export default {
           </div>
         </div>
 
-        <div class="row mb-20">
-          <div class="col span-6">
-            <CpuModel
-              :value="spec.template.spec.domain.cpu?.model || ''"
-              :mode="mode"
-              @update:value="updateCpuModel"
-            />
-          </div>
-        </div>
-
         <div class="row mb-20">
           <a
             v-if="showAdvanced"
@@ -523,76 +586,17 @@ export default {
           :network-script="networkScript"
           @updateUserData="updateUserData"
           @updateNetworkData="updateNetworkData"
-        />
-
-        <div class="spacer"></div>
-        <Checkbox
-          v-if="value.cpuPinningFeatureEnabled"
-          v-model:value="cpuPinning"
-          class="check"
-          type="checkbox"
-          tooltip-key="harvester.virtualMachine.cpuPinning.tooltip"
-          label-key="harvester.virtualMachine.cpuPinning.label"
-          :mode="mode"
-        />
-        <Checkbox
-          v-model:value="installUSBTablet"
-          class="check"
-          type="checkbox"
-          :label="t('harvester.virtualMachine.enableUsb')"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-model:value="installAgent"
-          class="check"
-          type="checkbox"
-          label-key="harvester.virtualMachine.installAgent"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-model:value="tpmEnabled"
-          class="check"
-          type="checkbox"
-          label-key="harvester.virtualMachine.advancedOptions.tpm"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-if="value.tpmPersistentStateFeatureEnabled && tpmEnabled"
-          v-model:value="tpmPersistentStateEnabled"
-          class="check"
-          type="checkbox"
-          :label="t('harvester.virtualMachine.advancedOptions.tpmPersistentState')"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-model:value="efiEnabled"
-          class="check"
-          type="checkbox"
-          :label="t('harvester.virtualMachine.advancedOptions.efiEnabled')"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-if="value.efiPersistentStateFeatureEnabled && efiEnabled"
-          v-model:value="efiPersistentStateEnabled"
-          class="check"
-          type="checkbox"
-          :label="t('harvester.virtualMachine.advancedOptions.efiPersistentState')"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-if="efiEnabled"
-          v-model:value="secureBoot"
-          class="check"
-          type="checkbox"
-          :label="t('harvester.virtualMachine.advancedOptions.secureBoot')"
-          :mode="mode"
-        />
+        >
+          <template #after-user-data>
+            <Checkbox
+              v-model:value="installAgent"
+              class="check mb-20"
+              type="checkbox"
+              label-key="harvester.virtualMachine.installAgent"
+              :mode="mode"
+            />
+          </template>
+        </CloudConfig>
       </Tab>
     </Tabbed>
   </CruResource>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/index.vue
index 5aa78b2a..3179822e 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/index.vue
@@ -219,6 +219,8 @@ export default {
       />
     </div>
 
+    <slot name="after-user-data" />
+
     <div class="mb-20">
       <DataTemplate
         ref="networkTemplate"
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
index 49e23506..b7d6d44e 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
@@ -742,6 +742,25 @@ export default {
         name="basics"
         :label="t('harvester.virtualMachine.detail.tabs.basics')"
       >
+        <div class="row mb-20">
+          <div class="col span-6">
+            <LabeledSelect
+              v-model:value="osType"
+              label-key="harvester.virtualMachine.osType"
+              :options="OS"
+              :disabled="!isCreate"
+              :tooltip="isCreate ? t('harvester.virtualMachine.osTypeTooltip') : null"
+            />
+          </div>
+          <div class="col span-6">
+            <CpuModel
+              v-model:value="cpuModel"
+              :mode="mode"
+              @update:value="updateCpuModel"
+            />
+          </div>
+        </div>
+
         <CpuMemory
           class="mb-20"
           :cpu="cpu"
@@ -753,6 +772,87 @@ export default {
           @updateCpuMemory="updateCpuMemory"
         />
 
+        <div class="mb-20">
+          <Checkbox
+            v-if="value.cpuPinningFeatureEnabled"
+            v-model:value="cpuPinning"
+            :disabled="!enableCpuPinningCheckbox"
+            class="check"
+            type="checkbox"
+            tooltip-key="harvester.virtualMachine.cpuPinning.tooltip"
+            label-key="harvester.virtualMachine.cpuPinning.label"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-model:value="installUSBTablet"
+            class="check"
+            type="checkbox"
+            tooltip-key="harvester.virtualMachine.usbTip"
+            label-key="harvester.virtualMachine.enableUsb"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-model:value="tpmEnabled"
+            class="check"
+            type="checkbox"
+            label-key="harvester.virtualMachine.systemOptions.tpm"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-if="value.tpmPersistentStateFeatureEnabled && tpmEnabled"
+            v-model:value="tpmPersistentStateEnabled"
+            class="check"
+            type="checkbox"
+            :label="t('harvester.virtualMachine.systemOptions.tpmPersistentState')"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-model:value="efiEnabled"
+            class="check"
+            type="checkbox"
+            :label="t('harvester.virtualMachine.systemOptions.efiEnabled')"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-if="value.efiPersistentStateFeatureEnabled && efiEnabled"
+            v-model:value="efiPersistentStateEnabled"
+            class="check"
+            type="checkbox"
+            :label="t('harvester.virtualMachine.systemOptions.efiPersistentState')"
+            :mode="mode"
+          />
+
+          <Checkbox
+            v-if="efiEnabled"
+            v-model:value="secureBoot"
+            class="check"
+            type="checkbox"
+            :label="t('harvester.virtualMachine.systemOptions.secureBoot')"
+            :mode="mode"
+          />
+        </div>
+
+        <Banner
+          v-if="showCpuPinningBanner"
+          :color="mode === 'create' ? 'info' : 'warning'"
+        >
+          <MessageLink
+            v-if="mode === 'create'"
+            :to="to"
+            prefix-label="harvester.virtualMachine.cpuPinning.cpuManager.prefix"
+            middle-label="harvester.virtualMachine.cpuPinning.cpuManager.middle"
+            suffix-label="harvester.virtualMachine.cpuPinning.cpuManager.suffix"
+          />
+          <span v-if="mode==='edit'">
+            {{ t('harvester.virtualMachine.cpuPinning.restartVMMessage') }}
+          </span>
+        </Banner>
+
         <SSHKey
           v-model:value="sshKey"
           class="mb-20"
@@ -969,18 +1069,6 @@ export default {
               :mode="mode"
             />
           </div>
-
-          <div class="col span-6">
-            <LabeledSelect
-              v-model:value="osType"
-              label-key="harvester.virtualMachine.osType"
-              :options="OS"
-              :disabled="!isCreate"
-            />
-          </div>
-        </div>
-
-        <div class="row mb-20">
           <div class="col span-6">
             <LabeledSelect
               v-model:value="maintenanceStrategy"
@@ -990,6 +1078,9 @@ export default {
               :mode="mode"
             />
           </div>
+        </div>
+
+        <div class="row mb-20">
           <div class="col span-6">
             <Reserved
               :reserved-memory="reservedMemory"
@@ -999,16 +1090,6 @@ export default {
           </div>
         </div>
 
-        <div class="row mb-20">
-          <div class="col span-6">
-            <CpuModel
-              v-model:value="cpuModel"
-              :mode="mode"
-              @update:value="updateCpuModel"
-            />
-          </div>
-        </div>
-
         <div class="row mb-20">
           <a
             v-if="showAdvanced"
@@ -1075,7 +1156,19 @@ export default {
           @updateUserData="updateUserData"
           @updateNetworkData="updateNetworkData"
           @updateDataTemplateId="updateDataTemplateId"
-        />
+        >
+          <template #after-user-data>
+            <Checkbox
+              v-model:value="installAgent"
+              class="check mb-20"
+              type="checkbox"
+              :disabled="isWindows"
+              label-key="harvester.virtualMachine.installAgent"
+              :mode="mode"
+              @update:value="updateAgent"
+            />
+          </template>
+        </CloudConfig>
 
         <WindowsSysprep
           v-if="isWindows"
@@ -1084,95 +1177,6 @@ export default {
           :mode="mode"
           :namespace="value.metadata.namespace"
         />
-
-        <Checkbox
-          v-if="value.cpuPinningFeatureEnabled"
-          v-model:value="cpuPinning"
-          :disabled="!enableCpuPinningCheckbox"
-          class="check"
-          type="checkbox"
-          tooltip-key="harvester.virtualMachine.cpuPinning.tooltip"
-          label-key="harvester.virtualMachine.cpuPinning.label"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-model:value="installUSBTablet"
-          class="check mt-20"
-          type="checkbox"
-          tooltip-key="harvester.virtualMachine.usbTip"
-          label-key="harvester.virtualMachine.enableUsb"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-model:value="installAgent"
-          class="check"
-          type="checkbox"
-          :disabled="isWindows"
-          label-key="harvester.virtualMachine.installAgent"
-          :mode="mode"
-          @update:value="updateAgent"
-        />
-
-        <Checkbox
-          v-model:value="tpmEnabled"
-          class="check"
-          type="checkbox"
-          label-key="harvester.virtualMachine.advancedOptions.tpm"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-if="value.tpmPersistentStateFeatureEnabled && tpmEnabled"
-          v-model:value="tpmPersistentStateEnabled"
-          class="check"
-          type="checkbox"
-          :label="t('harvester.virtualMachine.advancedOptions.tpmPersistentState')"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-model:value="efiEnabled"
-          class="check"
-          type="checkbox"
-          :label="t('harvester.virtualMachine.advancedOptions.efiEnabled')"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-if="value.efiPersistentStateFeatureEnabled && efiEnabled"
-          v-model:value="efiPersistentStateEnabled"
-          class="check"
-          type="checkbox"
-          :label="t('harvester.virtualMachine.advancedOptions.efiPersistentState')"
-          :mode="mode"
-        />
-
-        <Checkbox
-          v-if="efiEnabled"
-          v-model:value="secureBoot"
-          class="check"
-          type="checkbox"
-          :label="t('harvester.virtualMachine.advancedOptions.secureBoot')"
-          :mode="mode"
-        />
-
-        <Banner
-          v-if="showCpuPinningBanner"
-          color="warning"
-        >
-          <MessageLink
-            v-if="mode === 'create'"
-            :to="to"
-            prefix-label="harvester.virtualMachine.advancedOptions.cpuManager.prefix"
-            middle-label="harvester.virtualMachine.advancedOptions.cpuManager.middle"
-            suffix-label="harvester.virtualMachine.advancedOptions.cpuManager.suffix"
-          />
-          <span v-if="mode==='edit'">
-            {{ t('harvester.virtualMachine.cpuPinning.restartVMMessage') }}
-          </span>
-        </Banner>
       </Tab>
     </Tabbed>
 
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index 24a858dd..6c7d04a0 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -687,6 +687,7 @@ harvester:
   virtualMachine:
     label: Virtual Machines
     osType: OS Type
+    osTypeTooltip: Selecting an image with an OS label on the Volumes tab may change the OS Type selection.
     cpuModel:
       label: CPU Model
       fetchError: 'Failed to load CPU model configuration: {error}'
@@ -758,6 +759,10 @@ harvester:
       tooltip: Enable CPU Pinning brings better performance and reduce latency for the virtual machine
       restartVMMessage: Changing the CPU Pinning setting requires a virtual machine reboot for the change to take effect
       migrationMessage: This virtual machine can only be migrated to a target node that has CPU Manager enabled, as CPU Pinning is configured.
+      cpuManager:
+        prefix: You must enable CPU Manager for at least one node in
+        middle: 'host page'
+        suffix: to enable CPU Pinning for VM
     restartNow: |-
       {restart, select,
         true {Restart}
@@ -767,13 +772,9 @@ harvester:
     genericLoginError: Authentication failed. Please re-log in and try again.
     installAgent: Install guest agent
     enableUsb: Enable USB Tablet
-    advancedOptions:
+    systemOptions:
       tpm: Enable TPM
       tpmPersistentState: TPM Persistent State
-      cpuManager:
-        prefix: You must enable CPU Manager for at least one node in
-        middle: 'host page'
-        suffix: to enable CPU Pinning for VM
       efiEnabled: Booting in EFI mode
       efiPersistentState: EFI Persistent State
       secureBoot: Secure Boot