diff --git a/CONF.sh b/CONF.sh
index 99e58ad..ac1a4e3 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -62,7 +62,7 @@ export BASEDIR=`pwd`
 # export CDNAME=debian
 
 # Building $codename cd set ...
-export CODENAME=stretch
+export CODENAME=sid
 
 # By default use Debian installer packages from $CODENAME
 if [ -z "$DI_CODENAME" ]; then
@@ -119,23 +119,23 @@ fi
 #	      images, however. Also, if you are using an NFS partition for
 #	      some part of this, you must use this option.
 # Paths to the mirrors
-export MIRROR=/srv/mirror/debian
+export MIRROR=/srv/debian-sparc64-archive
 
 # Path of the temporary directory
-export TDIR=/srv/mirror/tmp
+export TDIR=/srv/tmp
 
 # Path where the images will be written
-export OUT=/srv/mirror/debian-cd-test
+export OUT=/srv/debian-cd-test
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.
-export APTTMP=/srv/mirror/tmp/apt
+export APTTMP=/srv/tmp/apt
 
 # Do I want to have NONFREE merged in the CD set
 # export NONFREE=1
 
 # Do I want to have CONTRIB merged in the CD set
-export CONTRIB=1
+# export CONTRIB=1
 
 # Do I want to have NONFREE on a separate CD (the last CD of the CD set)
 # WARNING: Don't use NONFREE and EXTRANONFREE at the same time !
@@ -188,8 +188,8 @@ export CONTRIB=1
 # USB stick. xorriso 0.6.5 and later has working support for this.
 #export i386_MKISOFS="xorriso"
 #export i386_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
-#export amd64_MKISOFS="xorriso"
-#export amd64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
+export MKISOFS="xorriso"
+export MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
 
 # Keyring (defaults):
 #ARCHIVE_KEYRING_PACKAGE=debian-archive-keyring
@@ -206,7 +206,7 @@ export CONTRIB=1
 export ISOLINUX=1
 
 # uncomment this to if you want to see more of what the Makefile is doing
-#export VERBOSE_MAKE=1
+export VERBOSE_MAKE=1
 
 # The maximum size allowed for an individual package, in bytes; if
 # larger than this, it will be excluded (and all dependents, of
@@ -265,7 +265,7 @@ export IMAGESUMS=1
 
 # And define the set of checksum algorithms you want here. Default is
 # all of: md5 sha1 sha512 sha256
-# export CHECKSUMS="md5 sha1 sha512 sha256"
+export CHECKSUMS="md5 sha1"
 
 # We may have to extract files from packages to put them onto the CD
 # (e.g. bootloader files). If you make those packages (and their
@@ -394,7 +394,7 @@ export SNAPURL=Debian=http://snapshot.debian.org/archive/debian/SNAPDATETIME/
 
 # Set to 1 to save space by omitting the installation manual. 
 # If so the README will link to the manual on the web site.
-#export OMIT_MANUAL=1
+export OMIT_MANUAL=1
 
 # Set to 1 to save space by omitting the release notes
 # If so we will link to them on the web site.
@@ -406,7 +406,7 @@ export OMIT_RELEASE_NOTES=1
 # Set to 1 to not include the doc/tools directories on CD1
 # Useful to save space and avoids failures if you have a mirror
 # without those directories.
-#export OMIT_DOC_TOOLS=1
+export OMIT_DOC_TOOLS=1
 
 case "$OFFICIAL" in
     "Official")
diff --git a/easy-build.sh b/easy-build.sh
index 5c86823..807f613 100755
--- a/easy-build.sh
+++ b/easy-build.sh
@@ -73,10 +73,10 @@ fi
 ## For what release to build images
 
 # The suite the installed system will be based on
-export CODENAME=stretch
+export CODENAME=sid
 # The suite from which the udebs for the installer will be taken (normally
 # the same as CODENAME)
-export DI_CODENAME=stretch
+export DI_CODENAME=sid
 
 
 ## The debian-installer images to use. This must match the suite (DI_CODENAME)
@@ -92,7 +92,6 @@ export DI_DIST=$DI_CODENAME
 # or, use daily built d-i images (most from http://people.debian.org)
 #export DI_WWW_HOME=default
 # or, use custom / locally built images
-#export DI_DIR="$HOME/d-i_images/%ARCH%"
-
+export DI_DIR="/srv/d-i/debian-installer/installer/build/tmp/cdrom/"
 
 ## Other options