diff --git a/config/bootstrap b/config/bootstrap
index c2da7e1..eacc87a 100644
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -19,7 +19,6 @@ LH_BOOTSTRAP_EXCLUDE=""
 
 # $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-# FIXME: Set to "minimal" for CryptoNAS releases
 LH_BOOTSTRAP_FLAVOUR="standard"
 
 # $LH_BOOTSTRAP_KEYRING: set distribution keyring
@@ -28,7 +27,7 @@ LH_BOOTSTRAP_KEYRING=""
 
 # $LH_DISTRIBUTION: select distribution to use
 # (Default: lenny)
-LH_DISTRIBUTION="etch"
+LH_DISTRIBUTION="lenny"
 
 # $LH_MIRROR_BOOTSTRAP: set mirror to bootstrap from
 # (Default: http://ftp.us.debian.org/debian/)
diff --git a/config/chroot b/config/chroot
index 0541577..118b147 100644
--- a/config/chroot
+++ b/config/chroot
@@ -6,8 +6,7 @@ LH_CHROOT_FILESYSTEM="squashfs"
 
 # $LH_UNION_FILESYSTEM: set union filesystem
 # (Default: aufs)
-# Default aufs not available in Etch
-LH_UNION_FILESYSTEM="unionfs"
+LH_UNION_FILESYSTEM="aufs"
 
 # $LH_EXPOSED_ROOT: expose root as read only
 # (Default: disabled)
diff --git a/config/chroot_local-hooks/50cnas-cherrypy-fix.sh b/config/chroot_local-hooks/50cnas-cherrypy-fix.sh
deleted file mode 100755
index b43d850..0000000
--- a/config/chroot_local-hooks/50cnas-cherrypy-fix.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-#  License:  This script is distributed under the terms of version 2
-#            of the GNU GPL. See the LICENSE file included with the package.
-#
-# $Id:  $
-#
-# this script is part of the build process of CryptoNAS
-#
-# 2008-11-27 James Crofts backported workaround from CherryPy src repository.
-# See http://www.cherrypy.org/ticket/686 and
-# http://devel.cryptobox.org/ticket/216.
-#
-
-## Stop the build process if any of the following steps fail
-set -e
-
-##Hack to prevent intermittent cherrypy crashes at startup
-DIFF="/usr/share/cryptonas-live/_cpwsgiserver.py.diff"
-##These two files are identical before the patch and must be identical
-##afterward as well:
-patch /var/lib/python-support/python2.4/cherrypy/_cpwsgiserver.py < ${DIFF}
-patch /usr/share/python-support/python-cherrypy/cherrypy/_cpwsgiserver.py < ${DIFF}
-##Remove the now-obsolete "compiled" Python file.
-rm -f /var/lib/python-support/python2.4/cherrypy/_cpwsgiserver.pyc
diff --git a/config/chroot_local-packageslists/cryptonas b/config/chroot_local-packageslists/cryptonas
index 53d2c09..8a40e0c 100644
--- a/config/chroot_local-packageslists/cryptonas
+++ b/config/chroot_local-packageslists/cryptonas
@@ -17,7 +17,6 @@ discover
 hdparm
 binutils
 debconf
-sysutils
 stunnel4
 samba
 #Apache was breaking the build before work started on the Debian Live changeover. FIXME: re-integrate
diff --git a/config/cnas-default-settings b/config/cnas-default-settings
index dd3f856..12d884c 100644
--- a/config/cnas-default-settings
+++ b/config/cnas-default-settings
@@ -30,6 +30,11 @@
 # recognize and use all the relevant GPG keys. `--yes' can stay.
 APT_OPTIONS="--yes"
 
+# $LH_BOOTSTRAP_FLAVOUR: Choose a predefined set of programs to include
+# in the Live CD build. Set to "minimal" for release or, if you wish, 
+# "standard" for debugging.
+#LH_BOOTSTRAP_FLAVOUR="standard"
+LH_BOOTSTRAP_FLAVOUR="minimal"
 
 # $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
diff --git a/config/common b/config/common
index 57dc578..eebb011 100644
--- a/config/common
+++ b/config/common
@@ -30,8 +30,7 @@ LH_APT_SECURE="enabled"
 
 # $LH_BOOTSTRAP: set bootstrap program
 # (Default: cdebootstrap)
-#LH_BOOTSTRAP="cdebootstrap"
-LH_BOOTSTRAP="cdebootstrap"
+LH_BOOTSTRAP="debootstrap"
 
 # $LH_CACHE: control cache
 # (Default: enabled)
@@ -63,8 +62,7 @@ LH_DEBCONF_PRIORITY="critical"
 
 # $LH_INITRAMFS: set initramfs hook
 # (Default: live-initramfs)
-# Building under Debian `etch' requires this set to `casper'
-LH_INITRAMFS="casper"
+LH_INITRAMFS="live-initramfs"
 
 # $LH_FDISK: set fdisk program
 # (Default: autodetected)
diff --git a/config/release-settings b/config/release-settings
index 94035b6..eddc4ec 100644
--- a/config/release-settings
+++ b/config/release-settings
@@ -20,3 +20,5 @@ LH_SOURCE_IMAGES="tar"
 #Disable console login and enable other security measures
 CNAS_HARDNESS="secure"
 
+#Set to "minimal" for CryptoNAS releases, can be "standard" for debugging
+LH_BOOTSTRAP_FLAVOUR="minimal"
\ No newline at end of file