diff --git a/schroot/setup.d/10mount b/schroot/setup.d/10mount
index a5e0802..efaa161 100755
--- a/schroot/setup.d/10mount
+++ b/schroot/setup.d/10mount
@@ -120,10 +120,14 @@ do_mount_fs_union()
                 CHROOT_UNION_MOUNT_OPTIONS="br:${CHROOT_UNION_OVERLAY_DIRECTORY}:${CHROOT_UNION_UNDERLAY_DIRECTORY}=ro"
                 ;;
             overlayfs)
-                CHROOT_UNION_MOUNT_OPTIONS="lowerdir=${CHROOT_UNION_UNDERLAY_DIRECTORY},upperdir=${CHROOT_UNION_OVERLAY_DIRECTORY}"
+                mkdir "${CHROOT_UNION_OVERLAY_DIRECTORY}.work"
+                CHROOT_UNION_MOUNT_OPTIONS="lowerdir=${CHROOT_UNION_UNDERLAY_DIRECTORY},upperdir=${CHROOT_UNION_OVERLAY_DIRECTORY},workdir=${CHROOT_UNION_OVERLAY_DIRECTORY}.work"
                 ;;
         esac
     fi
+    if [ "$CHROOT_UNION_TYPE" = "overlayfs" ]; then
+        CHROOT_UNION_TYPE=overlay
+    fi
 
     if modprobe "$CHROOT_UNION_TYPE" 2>/dev/null >/dev/null || grep "\<$CHROOT_UNION_TYPE\>" /proc/filesystems; then
 		: