diff --git a/020_pbuilder.sh b/020_pbuilder.sh
index 9a9e3f0..d38ca7e 100755
--- a/020_pbuilder.sh
+++ b/020_pbuilder.sh
@@ -1,18 +1,22 @@
 #!/usr/bin/env bash
-apt install -y cowbuilder dh-golang ccache
 
-DIST=ascii
+sudo apt install -y cowbuilder dh-golang ccache 
+
+DIST=chimaera
 DIST=$(lsb_release --short --codename)
 ARCH=$(dpkg --print-architecture)
 echo "DIST: " "${DIST}"
 echo "ARCH: " "${ARCH}"
 DEP_DIR=/srv/pbuilder/deps
 HOOK_DIR=/srv/pbuilder/hook.d
+PACKAGE_LIST=/srv/pbuilder/deps/Packages
 
 mkdir -p ${DEP_DIR}
 mkdir -p ${HOOK_DIR}
+touch ${PACKAGE_LIST}
+
+mkdir -p /var/cache/pbuilder/$DIST-$ARCH/{aptcache,result}
 
-# Should probably use a containerized reprepro FIXME
 cat > /etc/pbuilderrc << 'EOF'
 set -x
 # this is your configuration file for pbuilder.
@@ -30,9 +34,11 @@ STABLE_CODENAME="stretch"
 STABLE_BACKPORTS_SUITE="$STABLE_CODENAME-backports"
 
 UNSTABLE_DEVUAN="ceres"
-TESTING_DEVUAN="beowulf"
-STABLE_DEVUAN="ascii"
-OLDSTABLE_DEVUAN="jessie"
+TESTING_DEVUAN="daedalus"
+STABLE_DEVUAN="chimaera"
+OLDSTABLE_DEVUAN="beowulf"
+OLDOLDSTABLE_DEVUAN="ascii"
+OLDOLDOLDSTABLE_DEVUAN="jessie"
 
 OLDSTABLE_BACKPORTS_DEVUAN="$OLDSTABLE_DEVUAN-backports"
 OLDSTABLE_PROPOSED_BACKPORTS_DEVUAN="$OLDSTABLE_DEVUAN-proposed-backports"
@@ -117,6 +123,7 @@ if [ -n "${ARCH}" ]; then
     DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")
 fi
 
+
 BASETGZ="/var/cache/pbuilder/$NAME-base.tgz"
 DISTRIBUTION="$DIST"
 BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
@@ -124,6 +131,7 @@ APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
 BUILDPLACE="/var/cache/pbuilder/build/"
 PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-gdebi"
 CCACHEDIR=/var/cache/pbuilder/ccache
+EATMYDATA=yes
 
 echo "DIST: " "$DIST"
 echo "ARCH: " "$ARCH"
@@ -153,7 +161,7 @@ fi
 OTHERMIRROR="deb [trusted=yes] file:///srv/pbuilder/deps ./"
 BINDMOUNTS=/srv/pbuilder/deps
 HOOKDIR=/srv/pbuilder/hook.d
-EXTRAPACKAGES="apt-utils"
+EXTRAPACKAGES="apt-utils eatmydata ccache"
 EOF
 
 # Update local dep sources
@@ -183,5 +191,10 @@ chmod +x ${HOOK_DIR}/D06deps
 
 #Update cow image on changes above
 #DIST=${DIST} ARCH=${ARCH} git-pbuilder create --override-config --mirror http://deb.devuan.org
-DIST=${DIST} ARCH=${ARCH} git-pbuilder create 
+if [ -d /var/cache/pbuilder/base-${DIST}-${ARCH}.cow ]; then
+	DIST=${DIST} ARCH=${ARCH} git-pbuilder update 
+else
+	DIST=${DIST} ARCH=${ARCH} git-pbuilder create
+fi
+
 
diff --git a/build_deb_from_dsc.sh b/build_deb_from_dsc.sh
index 8e80df7..85a302d 100755
--- a/build_deb_from_dsc.sh
+++ b/build_deb_from_dsc.sh
@@ -37,13 +37,12 @@ if [ -d debian ]; then
 	dpkg-buildpackage -us -uc -b
 fi
 
-# Install the built debs
-#for DEB in ../*.deb; do
-#	echo "LSD: ${DEB}"
-#	sudo dpkg -i ${DEB}
-#done
-dpkg -i ../*.deb
-apt install -y -f
+if [ -f *.deb ]; then
+	dpkg -i ../*.deb
+	apt install -y -f
+else
+	echo "No debs to install, did the package build complete successfully?"
+fi