diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
index e0c73f37..169ecef4 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
@@ -889,6 +889,17 @@ export default {
           :label="t('harvester.virtualMachine.secureBoot')"
           :mode="mode"
         />
+
+        <Checkbox
+          v-if="tpmEnabled || efiEnabled"
+          class="check"
+          type="checkbox"
+          :label="t('harvester.virtualMachine.advancedOptions.persistentState')"
+          :mode="mode"
+          :value="true"
+          :disabled="true"
+        />
+
         <Banner
           v-if="showCpuPinningBanner"
           color="warning"
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index cf9d09f9..7926e9f9 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -594,6 +594,7 @@ harvester:
     enableUsb: Enable USB Tablet
     advancedOptions:
       tpm: Enable TPM
+      persistentState: Persistent State
       cpuManager:
         prefix: You must enable CPU Manager for at least one node in
         middle: 'host page'
diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js
index 20e6d198..792c138e 100644
--- a/pkg/harvester/mixins/harvester-vm/index.js
+++ b/pkg/harvester/mixins/harvester-vm/index.js
@@ -1384,25 +1384,30 @@ export default {
     },
 
     setBootMethod(boot = { efi: false, secureBoot: false }) {
-      if (boot.efi && boot.secureBoot) {
-        set(this.spec.template.spec.domain, 'features.smm.enabled', true);
-        set(this.spec.template.spec.domain, 'firmware.bootloader.efi.secureBoot', true);
-      } else if (boot.efi && !boot.secureBoot) {
-        // set(this.spec.template.spec.domain, 'features.smm.enabled', false);
-
-        try {
-          delete this.spec.template.spec.domain.features.smm['enabled'];
-          const noKeys = Object.keys(this.spec.template.spec.domain.features.smm).length === 0;
-
-          if (noKeys) {
-            delete this.spec.template.spec.domain.features['smm'];
-          }
-        } catch (e) {}
-        set(this.spec.template.spec.domain, 'firmware.bootloader.efi.secureBoot', false);
-      } else {
+      if (!boot.efi) {
         delete this.spec.template.spec.domain['firmware'];
         delete this.spec.template.spec.domain.features['smm'];
+
+        return;
       }
+
+      set(this.spec.template.spec.domain, 'firmware.bootloader.efi.persistent', true);
+      set(this.spec.template.spec.domain, 'firmware.bootloader.efi.secureBoot', !!boot.secureBoot);
+
+      if (boot.secureBoot) {
+        set(this.spec.template.spec.domain, 'features.smm.enabled', true);
+
+        return;
+      }
+
+      try {
+        const smm = this.spec.template.spec.domain.features.smm;
+
+        delete smm['enabled'];
+        if (Object.keys(smm).length === 0) {
+          delete this.spec.template.spec.domain.features['smm'];
+        }
+      } catch (e) {}
     },
 
     setCpuPinning(value) {
@@ -1415,7 +1420,7 @@ export default {
 
     setTPM(tpmEnabled) {
       if (tpmEnabled) {
-        set(this.spec.template.spec.domain.devices, 'tpm', {});
+        set(this.spec.template.spec.domain.devices, 'tpm.persistent', true);
       } else {
         delete this.spec.template.spec.domain.devices['tpm'];
       }