diff --git a/extra/pkg.build.ini b/extra/pkg.build.ini
index 4ecb810..2b396f4 100644
--- a/extra/pkg.build.ini
+++ b/extra/pkg.build.ini
@@ -40,7 +40,7 @@ gpgkeyserver =
 gpg = no
 dlpath = /var/tmp/${bdisk:uxname}
 chrootdir = /var/tmp/chroots
-basedir = /opt/dev/bdisk
+basedir = /var/lib/bdisk
 isodir = ${dlpath}/iso
 srcdir = ${dlpath}/src
 prepdir = ${dlpath}/temp
diff --git a/overlay/etc/systemd/scripts/livecd.fix.sh b/extra/pre-build.d/etc/systemd/scripts/livecd.fix.sh
similarity index 100%
rename from overlay/etc/systemd/scripts/livecd.fix.sh
rename to extra/pre-build.d/etc/systemd/scripts/livecd.fix.sh
diff --git a/overlay/etc/systemd/system/livecdfix.service b/extra/pre-build.d/etc/systemd/system/livecdfix.service
similarity index 100%
rename from overlay/etc/systemd/system/livecdfix.service
rename to extra/pre-build.d/etc/systemd/system/livecdfix.service
diff --git a/overlay/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager.service
similarity index 100%
rename from overlay/etc/systemd/system/multi-user.target.wants/NetworkManager.service
rename to extra/pre-build.d/etc/systemd/system/multi-user.target.wants/NetworkManager.service
diff --git a/overlay/etc/systemd/system/multi-user.target.wants/livecdfix.service b/extra/pre-build.d/etc/systemd/system/multi-user.target.wants/livecdfix.service
similarity index 100%
rename from overlay/etc/systemd/system/multi-user.target.wants/livecdfix.service
rename to extra/pre-build.d/etc/systemd/system/multi-user.target.wants/livecdfix.service