diff --git a/base-image/automation/jenkins-build.sh b/base-image/automation/jenkins-build.sh
index 21d83001..6fa8373d 100755
--- a/base-image/automation/jenkins-build.sh
+++ b/base-image/automation/jenkins-build.sh
@@ -15,8 +15,8 @@ docker run --rm \
 	-v `pwd`:/source \
 	-v `pwd`/dest:/dest \
 	supervisor-base-builder
-if [ -f dest/rootfs.tar.bz2 ]; then
-	cat dest/rootfs.tar.bz2 | docker import - $REPO:$date
+if [ -f dest/rootfs.tar.gz ]; then
+	cat dest/rootfs.tar.gz | docker import - $REPO:$date
 	docker tag -f $REPO:$date $REPO:latest
 	docker push $REPO
 else
diff --git a/base-image/build.sh b/base-image/build.sh
index f723b88c..9f8258ee 100755
--- a/base-image/build.sh
+++ b/base-image/build.sh
@@ -10,4 +10,4 @@ cd $BUILD_DIR
 source oe-core/oe-init-build-env build bitbake
 bitbake core-image-minimal
 qemu=$(cat conf/local.conf | grep '^MACHINE ??= ' | grep -o '"[^"]\+"' | tr -d '"')
-cp --dereference tmp/deploy/images/$qemu/core-image-minimal-$qemu.tar.bz2  $DEST_DIR/rootfs.tar.bz2
+cp --dereference tmp/deploy/images/$qemu/core-image-minimal-$qemu.tar.gz  $DEST_DIR/rootfs.tar.gz
diff --git a/base-image/build/conf/local.conf b/base-image/build/conf/local.conf
index 1cae4404..69a1b400 100644
--- a/base-image/build/conf/local.conf
+++ b/base-image/build/conf/local.conf
@@ -11,6 +11,7 @@
 # the option is a question of removing the # character and making any change to the
 # variable as required.
 
+
 #
 # Machine Selection
 #
@@ -131,6 +132,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
 # image-prelink disabled for now due to issues with IFUNC symbol relocation
 USER_CLASSES ?= "buildstats image-mklibs"
+IMAGE_FSTYPES ?= "tar.gz"
 
 
 #