diff --git a/examples/cdroot-overlay.tar.bz2 b/examples/cdroot-overlay.tar.bz2
index c371511..a6749d8 100644
Binary files a/examples/cdroot-overlay.tar.bz2 and b/examples/cdroot-overlay.tar.bz2 differ
diff --git a/examples/inner_chroot_script.sh b/examples/inner_chroot_script.sh
index c4c3239..7c30ea1 100755
--- a/examples/inner_chroot_script.sh
+++ b/examples/inner_chroot_script.sh
@@ -31,11 +31,41 @@ if [ "$myuname" == "x86_64" ]; then
         mydir="amd64"
 fi
 
+rm -rf /var/lib/entropy/packages/${mydir}/4/x11-drivers*
 ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-173*
 ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-96*
 # dropped since no X 1.5 support yet
 # ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps ~x11-drivers/nvidia-drivers-71.86.07
 mv /var/lib/entropy/packages/${mydir}/4/x11-drivers\:nvidia-drivers*.tbz2 /install-data/drivers/
 
+# Remove Jenna ?
+sed -i '/jenna/ s/.*//' /etc/entropy/repositories.conf
+rm -rf /var/lib/entropy/client/database/amd64/jenna
+rm -rf /var/lib/entropy/client/database/x86/jenna
+
+# Add fusion icon to desktop
+if [ -f "/usr/share/applications/fusion-icon.desktop" ]; then
+	cp /usr/share/applications/fusion-icon.desktop /etc/skel/Desktop/
+fi
+
 echo -5 | etc-update
 /lib/rc/bin/rc-depend -u
+
+echo "Vacuum cleaning client db"
+# Vacuum Entropy client database
+python -c "
+from entropy import EquoInterface
+equo = EquoInterface()
+equo.clientDbconn.dropAllIndexes()
+equo.clientDbconn.vacuum()
+equo.clientDbconn.commitChanges()
+equo.destroy()
+raise SystemExit(0)
+"
+
+# Generate openrc cache
+/etc/init.d/savecache start
+/etc/init.d/savecache zap
+
+equo deptest --pretend
+emaint --fix world
diff --git a/examples/outer_chroot_script.py b/examples/outer_chroot_script.py
new file mode 100755
index 0000000..484e58c
--- /dev/null
+++ b/examples/outer_chroot_script.py
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+import os, shutil
+source_chroot_dir = os.getenv('SOURCE_CHROOT_DIR')
+chroot_dir = os.getenv('CHROOT_DIR')
+cdroot_dir = os.getenv('CDROOT_DIR')
+boot_dir = os.path.join(chroot_dir,"boot")
+cdroot_boot_dir = os.path.join(cdroot_dir,"boot")
+
+boot_kernel = [x for x in os.listdir(boot_dir) if x.startswith("kernel-")]
+if boot_kernel:
+    boot_kernel = os.path.join(boot_dir,sorted(boot_kernel)[0])
+    shutil.copy2(boot_kernel,os.path.join(cdroot_boot_dir,"sabayon"))
+
+boot_ramfs = [x for x in os.listdir(boot_dir) if x.startswith("initramfs-")]
+if boot_ramfs:
+    boot_ramfs = os.path.join(boot_dir,sorted(boot_ramfs)[0])
+    shutil.copy2(boot_ramfs,os.path.join(cdroot_boot_dir,"sabayon.igz"))
+