diff --git a/packer/initramfs/labsync b/packer/initramfs/labsync
index 32e5de9..30855ee 100755
--- a/packer/initramfs/labsync
+++ b/packer/initramfs/labsync
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 labsync_set_environment() {
-		if grep -q "^${1}=" /root/etc/environment; then
-			sed -i "s/^\(${1}\)=.*$/\1='${2}'/" /root/etc/environment
+		if grep -q "^${1}=" /${rootmnt}/etc/environment; then
+			sed -i "s/^\(${1}\)=.*$/\1='${2}'/" /${rootmnt}/etc/environment
 		else
-			echo "${1}='${2}'" >> /root/etc/environment
+			echo "${1}='${2}'" >> /${rootmnt}/etc/environment
 		fi
 }
 
@@ -175,12 +175,14 @@ PARTTABLE
 
 	labsync_info "Mounting squashfs and overlay"
 	modprobe overlay
-	mkdir -p /root
-	mkdir /ro_root /rw_root
-	mount -t squashfs "$(realpath "$lv_path_squashfs")" /ro_root
-	mount -t ext4 "$lv_path_overlay" /rw_root
-	mkdir -p /rw_root/upper /rw_root/work
-	mount -t overlay overlay -o lowerdir=/ro_root,upperdir=/rw_root/upper,workdir=/rw_root/work /root
+	mkdir -p /rom /overlay
+	mount -t squashfs "$(realpath "$lv_path_squashfs")" /rom
+	mount -t ext4 "$lv_path_overlay" /overlay
+	mkdir -p /overlay/upper /overlay/work
+	mount -t overlay overlay -o lowerdir=/rom,upperdir=/overlay/upper,workdir=/overlay/work ${rootmnt}
+	mkdir -p ${rootmnt}/overlay ${rootmnt}/rom
+	mount -n -o move /overlay ${rootmnt}/overlay
+	mount -n -o move /rom ${rootmnt}/rom
 
 	if [ -z "$labsync_localboot" ]; then
 		labsync_set_environment LABSYNC "$torrent_name"