diff --git a/cli/manual_installer.go b/cli/manual_installer.go
index 0a60d1372..54325858b 100644
--- a/cli/manual_installer.go
+++ b/cli/manual_installer.go
@@ -131,6 +131,15 @@ func interactiveInstall(spawnShell bool) error {
 		return err
 	}
 
+	allGood, err := prompt("Are settings ok?", "n", yesNo, true, false)
+	if err != nil {
+		return err
+	}
+
+	if !isYes(allGood) {
+		return interactiveInstall(spawnShell)
+	}
+
 	c := &config.Config{
 		C3OS: &config.C3OS{
 			NetworkToken: networkToken,
diff --git a/overlay/files-iso/boot/grub2/grub.cfg b/overlay/files-iso/boot/grub2/grub.cfg
index 4ad9e9c3c..d621542e0 100644
--- a/overlay/files-iso/boot/grub2/grub.cfg
+++ b/overlay/files-iso/boot/grub2/grub.cfg
@@ -48,6 +48,13 @@ menuentry "c3os (remote recovery mode)" --class os --unrestricted {
     $initrd ($root)/boot/rootfs.xz
 }
 
+menuentry "c3os (boot local node from livecd)" --class os --unrestricted {
+    echo Loading kernel...
+    $linux ($root)/boot/kernel.xz cdroot root=live:CDLABEL=COS_LIVE rd.live.dir=/ rd.live.squashimg=rootfs.squashfs console=tty1 console=ttyS0 c3os.boot_live_mode
+    echo Loading initrd...
+    $initrd ($root)/boot/rootfs.xz
+}
+
 if [ "${grub_platform}" = "efi" ]; then
     hiddenentry "Text mode" --hotkey "t" {
         set textmode=true
diff --git a/overlay/files/system/oem/11_persistency.yaml b/overlay/files/system/oem/11_persistency.yaml
index 04631f437..6536029d0 100644
--- a/overlay/files/system/oem/11_persistency.yaml
+++ b/overlay/files/system/oem/11_persistency.yaml
@@ -27,6 +27,33 @@ stages:
           /var/lib/longhorn
           /var/lib/cni
         PERSISTENT_STATE_BIND: "true"
+    - if: |
+        cat /proc/cmdline | grep -q "c3os.boot_live_mode"
+      name: "Layout configuration"
+      environment_file: /run/cos/cos-layout.env
+      environment:
+        VOLUMES: "LABEL=COS_OEM:/oem LABEL=COS_PERSISTENT:/usr/local"
+        OVERLAY: "tmpfs:25%"
+        RW_PATHS: "/var /etc /srv"
+        PERSISTENT_STATE_PATHS: >-
+          /etc/systemd
+          /etc/rancher
+          /etc/sysconfig
+          /etc/runlevels
+          /etc/ssh
+          /etc/iscsi 
+          /etc/cni
+          /home
+          /opt
+          /root
+          /usr/libexec
+          /var/log
+          /var/lib/rancher
+          /var/lib/kubelet
+          /var/lib/wicked
+          /var/lib/longhorn
+          /var/lib/cni
+        PERSISTENT_STATE_BIND: "true"
     - if: '[ ! -f /run/cos/recovery_mode ] && [ ! -f /run/cos/live_mode ]'
       name: "Grow persistent"
       layout:
diff --git a/repositories.yaml b/repositories.yaml
index 84249f5a8..2b1e7077b 100644
--- a/repositories.yaml
+++ b/repositories.yaml
@@ -6,14 +6,14 @@ repositories:
     arch: amd64
     cached: true
     priority: 1
-    reference: "v0.8.10-repository.yaml"
+    reference: "v0.8.10-1-repository.yaml"
     urls:
       - "quay.io/costoolkit/releases-green"
   - !!merge <<: *cos
     arch: "arm64"
     urls:
       - "quay.io/costoolkit/releases-green-arm64"
-    reference: "v0.8.10-repository.yaml"
+    reference: "v0.8.10-1-repository.yaml"
   - &c3os
     name: "c3os"
     # https://github.com/c3os-io/packages