diff --git a/auto/config b/auto/config
index bdaabb9..4d76930 100755
--- a/auto/config
+++ b/auto/config
@@ -14,9 +14,9 @@ lb config noauto \
 	--debian-installer-distribution "kali" \
 	--archive-areas "main contrib non-free" \
 	--bootstrap cdebootstrap \
-	--bootstrap-keyring /usr/share/keyrings/kali-archive-keyring.gpg \
+	--cdebootstrap-options "--keyring=/usr/share/keyrings/kali-archive-keyring.gpg --suite-config=wheezy" \
 	--keyring-packages kali-archive-keyring \
-	--volatile false \
+	--updates false \
 	--backports false \
 	--source false \
 	--mirror-bootstrap http://repo.kali.org/kali \
diff --git a/build_all.sh b/build_all.sh
index 39266ff..28e6701 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -5,6 +5,9 @@ set -e
 KALI_ARCHES="i386 amd64"
 KALI_VERSION="${VERSION:-daily}"
 
+# Set sane PATH (cron seems to lack /sbin/ dirs)
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
 # XXX: Use a git checkout of live-build until we have a good version in wheezy
 export LIVE_BUILD=/srv/cdimage.kali.org/live/live-build