diff --git a/Makefile b/Makefile
index ed6669a1..ad942223 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,8 @@ $(TARGETS): %: $(RELEASE_DIR) %-config
 	$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) 2>&1 | tee logs/buildroot_$@_output.txt
 	rsync -ah --progress $(BUILDROOT)/output/images/disk.img $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img
 	rsync -ah --progress $(BUILDROOT)/output/images/rootfs.swu $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).swu
-	xz -3 -T0 -v -f -k $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img
-	xz -3 -T0 -v -f -k $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).swu
+	xz -3 -T0 -v -f $(BUILDROOT)/output/images/disk.img > $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img.xz
+	xz -3 -T0 -v -f $(BUILDROOT)/output/images/rootfs.swu> $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).swu.xz
 	@if [ $@ = "ova_64" ]; then\
 		qemu-img convert -O vdi $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).vdi;\
 		xz -3 -T0 -v -f -k $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).vdi;\
diff --git a/buildroot b/buildroot
index e2b977c8..8e61f4de 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit e2b977c858a29c91a33324283e649a8aeab4a2dc
+Subproject commit 8e61f4deec675cc035d44412ca1d31caae40d709
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/storage.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/storage.conf
index 2f4bc148..f2125917 100644
--- a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/storage.conf
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/storage.conf
@@ -1,2 +1,5 @@
 [storage]
 driver = "overlay"
+
+[storage.options]
+mount_program = "/usr/bin/fuse-overlayfs"