diff --git a/preferences/components/efi-persisted/efi.yaml b/preferences/components/efi-persisted/efi.yaml
new file mode 100644
index 00000000..a4fc7c0b
--- /dev/null
+++ b/preferences/components/efi-persisted/efi.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: instancetype.kubevirt.io/v1beta1
+kind: VirtualMachinePreference
+metadata:
+  name: efi
+spec:
+  firmware:
+    preferredEfi:
+      persistent: true
+      secureBoot: false
diff --git a/preferences/components/efi-persisted/kustomization.yaml b/preferences/components/efi-persisted/kustomization.yaml
new file mode 100644
index 00000000..01908c89
--- /dev/null
+++ b/preferences/components/efi-persisted/kustomization.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: ./efi.yaml
+    target:
+      kind: VirtualMachinePreference
+  - path: ./efi.yaml
+    target:
+      kind: VirtualMachineClusterPreference
diff --git a/preferences/components/efi/efi.yaml b/preferences/components/efi/efi.yaml
index ea32c88f..b41124a2 100644
--- a/preferences/components/efi/efi.yaml
+++ b/preferences/components/efi/efi.yaml
@@ -5,5 +5,5 @@ metadata:
   name: efi
 spec:
   firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: false
+    preferredEfi:
+      secureBoot: false
diff --git a/preferences/components/secureboot/secureboot.yaml b/preferences/components/secureboot/secureboot.yaml
index 9f889ac4..5f6c152c 100644
--- a/preferences/components/secureboot/secureboot.yaml
+++ b/preferences/components/secureboot/secureboot.yaml
@@ -7,5 +7,5 @@ spec:
   features:
     preferredSmm: {}
   firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: true
+    preferredEfi:
+      secureBoot: true
diff --git a/preferences/components/tpm/tpm.yaml b/preferences/components/tpm/tpm.yaml
index f07439be..522f1d31 100644
--- a/preferences/components/tpm/tpm.yaml
+++ b/preferences/components/tpm/tpm.yaml
@@ -5,4 +5,5 @@ metadata:
   name: tpm
 spec:
   devices:
-    preferredTPM: {}
+    preferredTPM:
+      persistent: true
diff --git a/preferences/windows/11/kustomization.yaml b/preferences/windows/11/kustomization.yaml
index d577bd07..f9ba9a40 100644
--- a/preferences/windows/11/kustomization.yaml
+++ b/preferences/windows/11/kustomization.yaml
@@ -8,6 +8,7 @@ resources:
 components:
   - ./metadata
   - ./requirements
+  - ../../components/efi-persisted
   - ../../components/tpm
   - ../../components/secureboot
 
diff --git a/preferences/windows/2k22/kustomization.yaml b/preferences/windows/2k22/kustomization.yaml
index b4245a5d..d4c541f8 100644
--- a/preferences/windows/2k22/kustomization.yaml
+++ b/preferences/windows/2k22/kustomization.yaml
@@ -8,6 +8,7 @@ resources:
 components:
   - ./metadata
   - ./requirements
+  - ../../components/efi-persisted
   - ../../components/tpm
   - ../../components/secureboot