diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml
index ecb7a7e..e1d3efd 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs_uki.yaml
@@ -8,7 +8,7 @@
 name: "Rootfs Layout Settings for UKI"
 stages:
   rootfs:
-    - if: '[ -e "/run/cos/uki_boot_mode" ]'
+    - if: '[ -e "/run/cos/uki_boot_mode" ] && [ ! -f "/run/cos/recovery_mode" ]'
       name: "Layout configuration for UKI boot"
       environment_file: /run/cos/cos-layout.env
       environment:
@@ -46,6 +46,12 @@ stages:
           /var/lib/wicked
           /var/log
           /var/snap
+    - if: '[ -e "/run/cos/uki_boot_mode" ] && [ -f "/run/cos/recovery_mode" ]'
+      # omit the persistent partition on recovery mode
+      name: "Layout configuration for recovery mode on UKI"
+      environment_file: /run/cos/cos-layout.env
+      environment:
+        OVERLAY: "tmpfs:25%"
     - if: '[ -e "/run/cos/uki_install_mode" ]'
       # omit everything on installer, just set the ephemeral paths
       name: "Layout configuration for UKI installer"