diff --git a/images/make-images b/images/make-images
index d32c973..2d7b632 100755
--- a/images/make-images
+++ b/images/make-images
@@ -17,6 +17,10 @@ function build_image()
     local ARCH=$1
     local CHROOT=chroot-${DISTRIB}-${ARCH}
 
+    echo ""
+    echo "Starting build for $ARCH"
+    echo ""
+
     cd /tmp/
     cdebootstrap --arch=${ARCH} --foreign ${DISTRIB} ./$CHROOT http://deb.debian.org/debian/
     cp /usr/bin/qemu-arm-static $CHROOT/usr/bin/
@@ -35,6 +39,10 @@ function build_image()
 
     cd $CHROOT
     tar -czf $INIT_DIR/${DISTRIB}-${ARCH}.tgz ./*
+
+    echo ""
+    echo "Output image should be available as $INIT_DIR/${DISTRIB}-${ARCH}.tgz"
+    echo ""
 }
 
 main
diff --git a/init.sh b/init.sh
index 1c8ce36..2af4316 100755
--- a/init.sh
+++ b/init.sh
@@ -16,6 +16,7 @@ source config/config
 gpg --import config/keys/$DEBSIGN_KEYID.key
 gpg --import config/keys/$DEBSIGN_KEYID.pub
 
+mkdir gitrepos
 cd gitrepos/
 git clone https://github.com/yunohost/yunohost
 git clone https://github.com/yunohost/yunohost-admin
diff --git a/scripts/build_deb b/scripts/build_deb
index a5c9c24..cf009ac 100755
--- a/scripts/build_deb
+++ b/scripts/build_deb
@@ -92,7 +92,7 @@ echo "Building source package of ${package}_${version}..."
 if $BUILD_SRC_LOCALLY; then
     debuild -S -sa > /dev/null
 else
-    img="${PBUILDER_IMAGES}/amd64/${CODENAME}.tgz"
+    img="${PBUILDER_IMAGES}/${CODENAME}-amd64.tgz"
     sudo pbuilder execute --bindmounts ${ROOT_DIR} \
         --basetgz ${img} -- ${BUILD_SOURCES} $PKG_DIR
 fi
diff --git a/scripts/rebuildd/build-binaries b/scripts/rebuildd/build-binaries
index 9bd95eb..5bc0f48 100755
--- a/scripts/rebuildd/build-binaries
+++ b/scripts/rebuildd/build-binaries
@@ -34,7 +34,7 @@ echo "######################"
 # Format needed pbuilder arguments
 DEBBUILDOPTS="$DEBBUILDOPTS -j$JOBS"
 DSC_FILE="${package}_${version}.dsc"
-BASE_TGZ="${PBUILDER_IMAGES}/${arch}/${codename}.tgz"
+BASE_TGZ="${PBUILDER_IMAGES}/${codename}-${arch}.tgz"
 EXTRA_OPTS=()
 CONFIGFILE=""