diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml
index a34f015..3db02d4 100644
--- a/packages/static/kairos-overlay-files/collection.yaml
+++ b/packages/static/kairos-overlay-files/collection.yaml
@@ -1,4 +1,4 @@
 packages:
   - name: "kairos-overlay-files"
     category: "static"
-    version: "1.1.25"
+    version: "1.1.26"
diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml
index c07c6c1..e9f2b17 100644
--- a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml
+++ b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml
@@ -48,7 +48,7 @@ stages:
           /var/log
           /var/snap
         PERSISTENT_STATE_BIND: "true"
-    - if: '[ -f "/run/cos/recovery_mode" ]'
+    - if: '[ -f "/run/cos/recovery_mode" ] && grep -vq "rd.immucore.uki" /proc/cmdline'
       # omit the persistent partition on recovery mode
       name: "Layout configuration for recovery mode"
       environment_file: /run/cos/cos-layout.env
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 e1d3efd..a19502b 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" ] && [ ! -f "/run/cos/recovery_mode" ]'
+    - if: '[ -e "/run/cos/uki_boot_mode" ] && [ ! -e "/run/cos/recovery_mode" ]'
       name: "Layout configuration for UKI boot"
       environment_file: /run/cos/cos-layout.env
       environment:
@@ -46,7 +46,7 @@ stages:
           /var/lib/wicked
           /var/log
           /var/snap
-    - if: '[ -e "/run/cos/uki_boot_mode" ] && [ -f "/run/cos/recovery_mode" ]'
+    - if: '[ -e "/run/cos/uki_boot_mode" ] && [ -e "/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