diff --git a/examples/ai-zfs-efi-simple.yaml b/examples/ai-zfs-efi-simple.yaml
index 5c86df24..1db6b89e 100644
--- a/examples/ai-zfs-efi-simple.yaml
+++ b/examples/ai-zfs-efi-simple.yaml
@@ -46,11 +46,10 @@ autoinstall:
          flag: boot, wipe: superblock, grub_device: true}
       - {type: format, id: d1p1_format, label: efi, fstype: fat32,
          volume: d1p1}
+      - {type: mount, id: d1p1_mount, device: d1p1_format, path: /boot/efi}
 
       - {type: partition, id: d1p2, number: 2, size: -1, device: d1}
       - {type: zpool, id: d1_rpool, pool: rpool, vdevs: [d1p2], mountpoint: /,
          pool_properties: {ashift: 12},
          fs_properties: {acltype: posixacl, relatime: on, canmount: on,
                          compression: gzip, devices: off, xattr: sa}}
-
-      - {type: mount, id: d1p1_mount, device: d1p1_format, path: /boot/efi}
diff --git a/examples/ai-zfs-efi.yaml b/examples/ai-zfs-efi.yaml
index 8342e4ac..a615d22a 100644
--- a/examples/ai-zfs-efi.yaml
+++ b/examples/ai-zfs-efi.yaml
@@ -46,6 +46,7 @@ autoinstall:
          flag: boot, wipe: superblock, grub_device: true}
       - {type: format, id: d1p1_format, label: efi, fstype: fat32,
          volume: d1p1}
+      - {type: mount, id: d1p1_mount, device: d1p1_format, path: /boot/efi}
 
       - {type: partition, id: d1p2, number: 2, size: -1, device: d1}
       - {type: zpool, id: d1_rpool, pool: rpool, vdevs: [d1p2], mountpoint: /,
@@ -78,6 +79,3 @@ autoinstall:
          properties: {canmount: off, mountpoint: /}}
       - {type: zfs, id: d1_rpool_USERDATA_home, pool: d1_rpool,
          volume: /USERDATA/home}
-
-      # workaround target exist problem
-      - {type: mount, id: d1p1_mount, device: d1p1_format, path: /boot/efi}
diff --git a/examples/ai-zfs-guided.yaml b/examples/ai-zfs-guided.yaml
new file mode 100644
index 00000000..b6311fbb
--- /dev/null
+++ b/examples/ai-zfs-guided.yaml
@@ -0,0 +1,38 @@
+#cloud-config
+autoinstall:
+  version: 1
+
+  identity:
+    realname: ''
+    hostname: ubuntu
+    username: ubuntu
+    password: '$6$wdAcoXrU039hKYPd$508Qvbe7ObUnxoj15DRCkzC3qO7edjH0VV7BPNRDYK4QR8ofJaEEF2heacn0QgD.f8pO8SNp83XNdWG6tocBM1'
+
+  source:
+    id: ubuntu-server-minimal
+
+  early-commands:
+    - apt-get install -y zfsutils-linux
+
+  late-commands:
+    # Let's avoid recreating LP: #1993318
+    - zpool set cachefile= rpool
+    - cp /etc/zfs/zpool.cache "/target/etc/zfs/"
+    - mkdir -p "/etc/zfs/zfs-list.cache" "/target/etc/zfs/zfs-list.cache"
+    - truncate -s 0 /etc/zfs/zfs-list.cache/rpool
+    - >-
+      env -i
+      ZEVENT_POOL=rpool
+      ZED_ZEDLET_DIR=/etc/zfs/zed.d
+      ZEVENT_SUBCLASS=history_event
+      ZFS=zfs
+      ZEVENT_HISTORY_INTERNAL_NAME=create
+      /etc/zfs/zed.d/history_event-zfs-list-cacher.sh
+    - >-
+      sh -c
+      'sed -E "s|\t/target/?|\t/|g" "/etc/zfs/zfs-list.cache/rpool" > "/target/etc/zfs/zfs-list.cache/rpool"'
+    - rm -f "/etc/zfs/zfs-list.cache/rpool"
+
+  storage:
+    layout:
+      name: zfs