diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 73af57a7..31969e6b 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -70,7 +70,7 @@ ARG OS_RELEASES_YML=https://releases.rancher.com/os
 
 ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services
 ARG IMAGE_NAME=${OS_REPO}/os
-ARG DFS_IMAGE=${OS_REPO}/docker:v${DOCKER_VERSION}-1
+ARG DFS_IMAGE=${OS_REPO}/docker:v${DOCKER_VERSION}-2
 
 ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2016.05-3/os-base_amd64.tar.xz
 ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2016.05-3/os-base_arm64.tar.xz
diff --git a/scripts/package-rootfs b/scripts/package-rootfs
index a06c565c..187975b2 100755
--- a/scripts/package-rootfs
+++ b/scripts/package-rootfs
@@ -29,4 +29,7 @@ docker stop ${DFS}
 docker run --rm --volumes-from=${DFS} rancher/os-base tar -c -C /var/lib/docker ./image | tar -x -C ${PREPOP_DIR}
 docker run --rm --volumes-from=${DFS} rancher/os-base tar -c -C /var/lib/docker ./overlay | tar -x -C ${PREPOP_DIR}
 
-tar czf ${ARTIFACTS}/rootfs.tar.gz --exclude usr/share/ros/images.tar --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} .
+tar -cf ${ARTIFACTS}/rootfs.tar --exclude usr/share/ros/images.tar  --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} .
+tar -rf ${ARTIFACTS}/rootfs.tar -C ${IMAGE_CACHE} .
+rm -f ${ARTIFACTS}/rootfs.tar.gz
+gzip ${ARTIFACTS}/rootfs.tar