diff --git a/debian/changelog b/debian/changelog
index b84a17fb..ed1038ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.545) UNRELEASED; urgency=medium
+
+  * Do not mount result, on top of lowerdir, appears to fail in
+    disco. Should unblock building server-live images in disco.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 09 Nov 2018 22:13:49 +0000
+
 livecd-rootfs (2.544) disco; urgency=medium
 
   [ Steve Langasek ]
diff --git a/live-build/ubuntu-server/hooks/031-maas-squashfs.binary b/live-build/ubuntu-server/hooks/031-maas-squashfs.binary
index ba348ba3..edbd20ba 100755
--- a/live-build/ubuntu-server/hooks/031-maas-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/031-maas-squashfs.binary
@@ -40,7 +40,7 @@ mkdir -p "$OVERLAY_REGION_ROOT"
 
 # RACK is on top of the regular squashfs
 
-mount_overlay "$SQUASH_ROOT/" "$OVERLAY_RACK_ROOT/" "$RACK_ROOT/" "RACK"
+mount_overlay "$SQUASH_ROOT/" "$OVERLAY_RACK_ROOT/" "$RACK_ROOT/"
 
 setup_mountpoint $RACK_ROOT
 env DEBIAN_FRONTEND=noninteractive chroot $RACK_ROOT apt-get -y install maas-rack-controller
@@ -54,7 +54,7 @@ umount "$RACK_ROOT"
 
 # Full MAAS (Region) is on top of the rack
 # in overlayfs lowerdir are mounted right to left, colon separated
-mount_overlay "$OVERLAY_RACK_ROOT/:$SQUASH_ROOT/" "$OVERLAY_REGION_ROOT/" "$REGION_ROOT/" "REGION"
+mount_overlay "$OVERLAY_RACK_ROOT/:$SQUASH_ROOT/" "$OVERLAY_REGION_ROOT/" "$REGION_ROOT/"
 
 setup_mountpoint $REGION_ROOT
 
diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index bab6ab76..b464f1f2 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
@@ -24,15 +24,17 @@ fi
 . config/functions
 . config/common
 
-SQUASH_ROOT=binary/boot/squashfs.dir
-OVERLAY_ROOT=binary/overlay
+BOTTOM_ROOT=binary/boot/squashfs.dir
+SQUASH_ROOT=binary/boot/squashfs-installer.dir
+OVERLAY_ROOT=binary/overlay-installer
 
+mkdir -p "$SQUASH_ROOT"
 mkdir -p "$OVERLAY_ROOT"
 
 # Create an installer squashfs layer
-mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/"
+mount_overlay "$BOTTOM_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/"
 
-setup_mountpoint binary/boot/squashfs.dir
+setup_mountpoint $SQUASH_ROOT
 
 # Override JobRunningTimeoutSec to 0s on the .device unit that
 # subiquity_config.mount depends on to avoid a 5s delay on switching