diff --git a/Makefile b/Makefile
index 244229d2..0c6d7b5a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,7 @@ prepare:
 	@scripts/check-config
 
 	@scripts/live-build-config
-	cp -r data/includes.chroot/* build/config/includes.chroot/
-	cp -r data/package-lists/common/* build/config/package-lists/
+	cp -r data/live-build-config/* build/config/
 
 .PHONY: iso
 .ONESHELL:
diff --git a/data/includes.chroot/etc/fuse.conf b/data/live-build-config/includes.chroot/etc/fuse.conf
similarity index 100%
rename from data/includes.chroot/etc/fuse.conf
rename to data/live-build-config/includes.chroot/etc/fuse.conf
diff --git a/data/includes.chroot/opt/vyatta/etc/config.boot.default b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
similarity index 100%
rename from data/includes.chroot/opt/vyatta/etc/config.boot.default
rename to data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
diff --git a/data/package-lists/common/vyos-base.list.chroot b/data/live-build-config/package-lists/vyos-base.list.chroot
similarity index 100%
rename from data/package-lists/common/vyos-base.list.chroot
rename to data/live-build-config/package-lists/vyos-base.list.chroot
diff --git a/data/package-lists/common/vyos-utils.list.chroot b/data/live-build-config/package-lists/vyos-utils.list.chroot
similarity index 100%
rename from data/package-lists/common/vyos-utils.list.chroot
rename to data/live-build-config/package-lists/vyos-utils.list.chroot