diff --git a/pkg/release-alix/genimage.sh b/pkg/release-alix/genimage.sh
index dcc2508..f50ad90 100755
--- a/pkg/release-alix/genimage.sh
+++ b/pkg/release-alix/genimage.sh
@@ -47,16 +47,6 @@ cp -r VERSIONDIR /tmp/mnt.$$/
 umount /tmp/mnt.$$
 MOUNTED=0
 
-mount -t btrfs ${LODEV}p2 /tmp/mnt.$$
-MOUNTED=1
-mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
-mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
-mkdir -p /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
-chmod 700 /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
-chown 0:0 /tmp/mnt.$$/usr/root
-umount /tmp/mnt.$$
-MOUNTED=0
-
 losetup -d ${LODEV}
 LOOPATTACHED=0
 
diff --git a/pkg/release-alix/install.sh b/pkg/release-alix/install.sh
index 4edc2da..f370925 100755
--- a/pkg/release-alix/install.sh
+++ b/pkg/release-alix/install.sh
@@ -52,16 +52,6 @@ cp -r VERSIONDIR /tmp/mnt.$$/
 umount /tmp/mnt.$$
 MOUNTED=0
 
-mount -t btrfs ${DEVICE}2 /tmp/mnt.$$
-MOUNTED=1
-mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
-mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
-mkdir -p /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
-chmod 700 /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
-chown 0:0 /tmp/mnt.$$/usr/root
-umount /tmp/mnt.$$
-MOUNTED=0
-
 rmdir /tmp/mnt.$$
 
 dd if=mbr.bin of=$DEVICE
diff --git a/pkg/release-qemu/runqemu.sh b/pkg/release-qemu/runqemu.sh
index ca7febf..a5bf8f1 100755
--- a/pkg/release-qemu/runqemu.sh
+++ b/pkg/release-qemu/runqemu.sh
@@ -11,7 +11,7 @@ CMDLINE=$(cat "$BOOT/cmdline.txt")
 RAM="256M"
 MAC0="52:54:00:12:34:56"
 
-mkdir -p ${OVERLAY}/{etc,etc_work,usr,usr_work,var_lib,var_lib_work}
+mkdir -p ${OVERLAY}
 
 qemu-system-x86_64 \
 	-drive "file=fat:rw:$BOOT,readonly=off,format=raw,if=virtio" \
diff --git a/pkg/release-rpi3/genimage.sh b/pkg/release-rpi3/genimage.sh
index 3d51e88..e3c8d59 100755
--- a/pkg/release-rpi3/genimage.sh
+++ b/pkg/release-rpi3/genimage.sh
@@ -45,16 +45,6 @@ cp -r boot/* /tmp/mnt.$$/
 umount /tmp/mnt.$$
 MOUNTED=0
 
-mount -t btrfs ${LODEV}p2 /tmp/mnt.$$
-MOUNTED=1
-mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
-mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
-mkdir -p /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
-chmod 750 /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
-chown 0:0 /tmp/mnt.$$/usr/root
-umount /tmp/mnt.$$
-MOUNTED=0
-
 losetup -d ${LODEV}
 LOOPATTACHED=0
 
diff --git a/pkg/release-rpi3/install.sh b/pkg/release-rpi3/install.sh
index 5ca0a9f..fe016dd 100755
--- a/pkg/release-rpi3/install.sh
+++ b/pkg/release-rpi3/install.sh
@@ -50,14 +50,4 @@ cp -r boot/* /tmp/mnt.$$/
 umount /tmp/mnt.$$
 MOUNTED=0
 
-mount -t btrfs ${DEVICE}p2 /tmp/mnt.$$
-MOUNTED=1
-mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
-mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
-mkdir -p /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
-chmod 750 /tmp/mnt.$$/usr/root /tmp/mnt.$$/usr_work
-chown 0:0 /tmp/mnt.$$/usr/root
-umount /tmp/mnt.$$
-MOUNTED=0
-
 rmdir /tmp/mnt.$$