diff --git a/README.md b/README.md
index 8eca603..10d4900 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,6 @@
 
 This repo holds custom dracut modules required by Flatcar Container Linux
 
-## Running tests
-
-```
-./test
-```
-
 ## Code of Conduct
 
 In the interest of promoting a fair, diverse, and open community, Kinvolk uses its [Code of Conduct](https://github.com/kinvolk/contribution/blob/master/CODE_OF_CONDUCT.md) for all its projects and events.
diff --git a/dracut/51diskless-generator/diskless-generator b/dracut/51diskless-generator/diskless-generator
index d45bf8c..83a82af 100755
--- a/dracut/51diskless-generator/diskless-generator
+++ b/dracut/51diskless-generator/diskless-generator
@@ -43,8 +43,8 @@ if [[ -z "${usr}" && -f /usr.squashfs ]]; then
 
 [Unit]
 Before=initrd-root-fs.target
-Wants=remount-sysroot.service
-After=remount-sysroot.service
+Wants=ignition-remount-sysroot.service
+After=ignition-remount-sysroot.service
 # Make sure the loop device nodes are available
 Wants=systemd-tmpfiles-setup-dev-early.service
 After=systemd-tmpfiles-setup-dev-early.service
diff --git a/dracut/51diskless-generator/module-setup.sh b/dracut/51diskless-generator/module-setup.sh
index 85820ba..9426c80 100755
--- a/dracut/51diskless-generator/module-setup.sh
+++ b/dracut/51diskless-generator/module-setup.sh
@@ -4,7 +4,6 @@
 
 depends() {
     echo systemd
-    echo usr-generator
 }
 
 install() {
diff --git a/dracut/51usr-fsck-generator/module-setup.sh b/dracut/51usr-fsck-generator/module-setup.sh
deleted file mode 100755
index 5253359..0000000
--- a/dracut/51usr-fsck-generator/module-setup.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-depends() {
-    echo systemd
-}
-
-install() {
-    inst_multiple tr
-    inst_simple "$moddir/usr-fsck-generator" \
-        "$systemdutildir/system-generators/usr-fsck-generator"
-}
diff --git a/dracut/51usr-fsck-generator/testsuite.sh b/dracut/51usr-fsck-generator/testsuite.sh
deleted file mode 100755
index cf73a15..0000000
--- a/dracut/51usr-fsck-generator/testsuite.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-moddir=$(dirname "$0")
-failed=0
-
-run_test() {
-    local cmdline="$1"
-    local checkfunc="$2"
-    local unitdir=$(mktemp -d)
-    trap "rm -rf '${unitdir}'" EXIT
-
-    echo "Starting test ${checkfunc}"
-    export USR_FSCK_GENERATOR_CMDLINE="${cmdline}"
-    if ! "${moddir}/usr-fsck-generator" "${unitdir}"; then
-        echo "FAILED ${checkfunc}"
-        failed=$((failed + 1))
-    elif ! "${checkfunc}" "${unitdir}"; then
-        echo "FAILED ${checkfunc}"
-        failed=$((failed + 1))
-    else
-        echo "PASSED ${checkfunc}"
-    fi
-
-    rm -rf "${unitdir}"
-    trap - EXIT
-}
-
-test_noop() {
-    if [[ -e "$1"/* ]]; then
-        echo "$1 not empty"
-        return 1
-    fi
-}
-run_test "nothing" test_noop
-run_test "usr=nothing" test_noop
-run_test "mount.usr=nothing" test_noop
-run_test "usr=nothing mount.usr=nothing" test_noop
-
-
-test_simple() {
-    [[ -e $1/systemd-fsck@foo-bar-baz.service.d/disable.conf ]]
-    return $?
-}
-run_test "usr=/foo/bar/baz" test_simple
-run_test "mount.usr=/foo/bar/baz" test_simple
-run_test "usr=bar mount.usr=/foo/bar/baz" test_simple
-run_test "usr=foo mount.usr=bar usr=baz mount.usr=/foo/bar/baz usr=bleh" test_simple
-
-
-test_label() {
-    [[ -e $1/systemd-fsck@dev-disk-by\\x2dlabel-foo.service.d/disable.conf ]]
-    return $?
-}
-run_test "mount.usr=LABEL=foo" test_label
-
-
-test_uuid() {
-    [[ -e $1/systemd-fsck@dev-disk-by\\x2duuid-a123.service.d/disable.conf ]]
-    return $?
-}
-run_test "mount.usr=UUID=A123" test_uuid
-
-
-test_partuuid() {
-    [[ -e $1/systemd-fsck@dev-disk-by\\x2dpartuuid-a123.service.d/disable.conf ]]
-    return $?
-}
-run_test "mount.usr=PARTUUID=A123" test_partuuid
-
-
-test_partlabel() {
-    [[ -e $1/systemd-fsck@dev-disk-by\\x2dpartlabel-foo.service.d/disable.conf ]]
-    return $?
-}
-run_test "mount.usr=PARTLABEL=foo" test_partlabel
-
-
-if [[ "${failed}" -ne 0 ]]; then
-    echo "${failed} test(s) failed!"
-    exit 1
-fi
diff --git a/dracut/51usr-fsck-generator/usr-fsck-generator b/dracut/51usr-fsck-generator/usr-fsck-generator
deleted file mode 100755
index 100069e..0000000
--- a/dracut/51usr-fsck-generator/usr-fsck-generator
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-# This script adds a drop-in which disables systemd-fsck for the /usr
-# partition. Cases:
-#
-# 1. /usr is backed by dm-verity and is read-only. fsck.ext4 would fail
-#    and print a confusing error to the journal.
-#
-# 2. The /usr filesystem is configured for verity but the bootloader is
-#    too old to enable it. fsck.ext4 would fail because of the read-only
-#    compat flags that prevent writing to the filesystem, and print a
-#    confusing error to the journal.
-#
-# 3. Neither #1 or #2 are true because this is a dev image. This case
-#    is not trivial to detect and not actually important.
-
-set -e
-
-UNIT_DIR="${1:-/tmp}"
-
-# env var for testing
-if [[ -n "${USR_FSCK_GENERATOR_CMDLINE}" ]]; then
-    cmdline=( ${USR_FSCK_GENERATOR_CMDLINE} )
-else
-    cmdline=( $(</proc/cmdline) )
-fi
-
-# Usage: cmdline_arg name default_value
-cmdline_arg() {
-    local name="$1" value="$2"
-    for arg in "${cmdline[@]}"; do
-        if [[ "${arg%%=*}" == "${name}" ]]; then
-            value="${arg#*=}"
-        fi
-    done
-    echo "${value}"
-}
-
-usr=$(cmdline_arg mount.usr)
-if [[ -z "$usr" ]]; then
-    usr=$(cmdline_arg usr)
-fi
-
-case "${usr}" in
-    LABEL=*)
-        usr="$(echo $usr | sed 's,/,\\x2f,g')"
-        usr="/dev/disk/by-label/${usr#LABEL=}"
-        ;;
-    UUID=*)
-        usr="${usr#UUID=}"
-        usr="$(echo $usr | tr "[:upper:]" "[:lower:]")"
-        usr="/dev/disk/by-uuid/${usr}"
-        ;;
-    PARTUUID=*)
-        usr="${usr#PARTUUID=}"
-        usr="$(echo $usr | tr "[:upper:]" "[:lower:]")"
-        usr="/dev/disk/by-partuuid/${usr}"
-        ;;
-    PARTLABEL=*)
-        usr="/dev/disk/by-partlabel/${usr#PARTLABEL=}"
-        ;;
-esac
-
-# Only proceed if the source is a path.
-if [[ "${usr}" != /* ]]; then
-    exit 0
-fi
-
-usr="$(systemd-escape -p "${usr}")"
-
-dropin_dir="${UNIT_DIR}/systemd-fsck@${usr}.service.d"
-mkdir -p "${dropin_dir}"
-cat >"${dropin_dir}/disable.conf" <<EOF
-# Automatically generated by usr-fsck-generator
-
-[Unit]
-ConditionPathIsDirectory=/dev/null
-EOF
diff --git a/dracut/51usr-generator/module-setup.sh b/dracut/51usr-generator/module-setup.sh
deleted file mode 100755
index bb67798..0000000
--- a/dracut/51usr-generator/module-setup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-depends() {
-    echo systemd
-}
-
-install() {
-    inst_multiple tr
-    inst_simple "$moddir/usr-generator" \
-        "$systemdutildir/system-generators/usr-generator"
-    inst_simple "$moddir/remount-sysroot.service" \
-        "$systemdutildir/system/remount-sysroot.service"
-
-    # Overwrite systemd-fsck-usr.service because it wants After=local-fs-pre.target
-    # which prevents (the systemd-generated) sysusr-usr.mount from starting before Ignition
-    # but we need it because we want to start Ignition from /sysusr/usr/ already.
-   cat > "$initdir/etc/systemd/system/systemd-fsck-usr.service" <<EOF
-# Set up by 10usr-generator/module-setup.sh
-[Unit]
-DefaultDependencies=no
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=true
-EOF
-
-}
diff --git a/dracut/51usr-generator/remount-sysroot.service b/dracut/51usr-generator/remount-sysroot.service
deleted file mode 100644
index 0924ef1..0000000
--- a/dracut/51usr-generator/remount-sysroot.service
+++ /dev/null
@@ -1,14 +0,0 @@
-# Older bootloaders pass 'ro' on the kernel command line, which overrides
-# the 'rootflags=rw' argument built into the kernel image.
-
-[Unit]
-Description=Remount Root File System
-DefaultDependencies=no
-After=sysroot.mount
-Before=sysroot-usr.mount
-ConditionPathIsReadWrite=!/sysroot
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/mount -o remount,rw /sysroot
diff --git a/dracut/51usr-generator/testsuite.sh b/dracut/51usr-generator/testsuite.sh
deleted file mode 100755
index b2b0c7c..0000000
--- a/dracut/51usr-generator/testsuite.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-
-moddir=$(dirname "$0")
-failed=0
-
-run_test() {
-    local cmdline="$1"
-    local checkfunc="$2"
-    local unitdir=$(mktemp -d)
-    trap "rm -rf '${unitdir}'" EXIT
-
-    echo "Starting test ${checkfunc}"
-    export USR_GENERATOR_CMDLINE="${cmdline}"
-    if ! "${moddir}/usr-generator" "${unitdir}"; then
-        echo "FAILED ${checkfunc}"
-        failed=$((failed + 1))
-    elif ! "${checkfunc}" "${unitdir}"; then
-        echo "FAILED ${checkfunc}"
-        failed=$((failed + 1))
-    else
-        echo "PASSED ${checkfunc}"
-    fi
-
-    rm -rf "${unitdir}"
-    trap - EXIT
-}
-
-test_noop() {
-    if [[ -e "$1"/* ]]; then
-        echo "$1 not empty"
-        return 1
-    fi
-}
-run_test nothing test_noop
-
-
-test_simple() {
-    [[ $(readlink "$1/initrd-root-fs.target.requires/sysroot-usr.mount") \
-        == "../sysroot-usr.mount" ]] || return 1
-    diff -u "$1/sysroot-usr.mount" - <<EOF
-# Automatically generated by usr-generator
-
-[Unit]
-SourcePath=/proc/cmdline
-Before=initrd-root-fs.target
-Wants=remount-sysroot.service
-After=remount-sysroot.service
-
-[Mount]
-What=/foo
-Where=/sysroot/usr
-Type=auto
-Options=ro
-EOF
-    return $?
-}
-run_test usr=/foo test_simple
-
-test_multiple() {
-    diff -u "$1/sysroot-usr.mount" - <<EOF
-# Automatically generated by usr-generator
-
-[Unit]
-SourcePath=/proc/cmdline
-Before=initrd-root-fs.target
-Wants=remount-sysroot.service
-After=remount-sysroot.service
-
-[Mount]
-What=/two
-Where=/sysroot/usr
-Type=auto
-Options=ro
-EOF
-    return $?
-}
-run_test "usr=/one usr=/two" test_multiple
-
-test_opts() {
-    diff -u "$1/sysroot-usr.mount" - <<EOF
-# Automatically generated by usr-generator
-
-[Unit]
-SourcePath=/proc/cmdline
-Before=initrd-root-fs.target
-Wants=remount-sysroot.service
-After=remount-sysroot.service
-
-[Mount]
-What=/foo
-Where=/sysroot/usr
-Type=ext4
-Options=rw
-EOF
-    return $?
-}
-run_test "usr=/foo usrfstype=ext4 usrflags=rw" test_opts
-
-if [[ "${failed}" -ne 0 ]]; then
-    echo "${failed} test(s) failed!"
-    exit 1
-fi
diff --git a/dracut/51usr-generator/usr-generator b/dracut/51usr-generator/usr-generator
deleted file mode 100755
index f640d52..0000000
--- a/dracut/51usr-generator/usr-generator
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-# This script implements systemd-fstab-generator's add_root_mount()
-# function but for handling usr= cmdline args instead of root=
-# TODO(marineam): Write a patch to do this in systemd-fstab-generator
-#
-# grub passes mount.usr= instead of usr=, and mount.usr= is handled
-# by systemd-fstab-generator. This module is only needed for old
-# bootloaders that pass usr=.
-
-# NOTE: The usr mount is now done in /minimal-init but the systemd
-# "mount.usr=" generator also runs always (and should be a no-op
-# but we still make sure that it has the right norecovery option).
-# At the end is the sysroot/usr mount unit for the old "usr=" case
-# which we could probably drop.
-set -e
-
-UNIT_DIR="${1:-/tmp}"
-
-# env var for testing
-if [[ -n "${USR_GENERATOR_CMDLINE}" ]]; then
-    cmdline=( ${USR_GENERATOR_CMDLINE} )
-else
-    cmdline=( $(</proc/cmdline) )
-fi
-
-# Usage: cmdline_arg name default_value
-cmdline_arg() {
-    local name="$1" value="$2"
-    for arg in "${cmdline[@]}"; do
-        if [[ "${arg%%=*}" == "${name}" ]]; then
-            value="${arg#*=}"
-        fi
-    done
-    echo "${value}"
-}
-
-usr=$(cmdline_arg usr)
-usrfstype=$(cmdline_arg usrfstype auto)
-usrflags=$(cmdline_arg usrflags ro)
-if [[ "$(echo ",${usrflags}," | grep -v -F ',ro,')" != "" ]]; then
-  true # Don't set "norecovery" when mounting rw
-else
-  usrflags="${usrflags},rescue=nologreplay"
-fi
-
-case "${usr}" in
-    LABEL=*)
-        usr="$(echo $usr | sed 's,/,\\x2f,g')"
-        usr="/dev/disk/by-label/${usr#LABEL=}"
-        ;;
-    UUID=*)
-        usr="${usr#UUID=}"
-        usr="$(echo $usr | tr "[:upper:]" "[:lower:]")"
-        usr="/dev/disk/by-uuid/${usr}"
-        ;;
-    PARTUUID=*)
-        usr="${usr#PARTUUID=}"
-        usr="$(echo $usr | tr "[:upper:]" "[:lower:]")"
-        usr="/dev/disk/by-partuuid/${usr}"
-        ;;
-    PARTLABEL=*)
-        usr="/dev/disk/by-partlabel/${usr#PARTLABEL=}"
-        ;;
-esac
-
-# Only proceed if the source is a path.
-if [[ "${usr}" != /* ]]; then
-  # Here "$usr" does not contain the values of "mount.usr", hence the extra check not found in diskless-generator/ignition-generator
-  if [[ -z "${usr}" && -z "$(cmdline_arg mount.usr)" && -f /usr.squashfs ]]; then
-    # Don't set "norecovery" for squashfs
-    exit 0
-  fi
-  # Add "norecovery" to systemd-fstab-generator's unit and exit
-  mount_usrflags=$(cmdline_arg mount.usrflags ro)
-  if [[ "$(echo ",${mount_usrflags}," | grep -v -F ',ro,')" != "" ]]; then
-    # Don't set "norecovery" when mounting rw
-    exit 0
-  fi
-  mount_usrflags="${mount_usrflags},rescue=nologreplay"
-  # sysroot-usr.mount is a bind mount from /sysusr/usr
-  mkdir -p "${UNIT_DIR}/sysusr-usr.mount.d"
-  cat >"${UNIT_DIR}/sysusr-usr.mount.d/10-norecovery.conf" <<EOF
-[Unit]
-DefaultDependencies=no
-Wants=systemd-tmpfiles-setup-dev-early.service
-After=systemd-udevd.service systemd-tmpfiles-setup-dev-early.service
-[Mount]
-Options=${mount_usrflags}
-EOF
-  exit 0
-fi
-
-cat >"${UNIT_DIR}/sysroot-usr.mount" <<EOF
-# Automatically generated by usr-generator
-
-[Unit]
-SourcePath=/proc/cmdline
-Before=initrd-root-fs.target
-Wants=remount-sysroot.service
-After=remount-sysroot.service
-
-[Mount]
-What=${usr}
-Where=/sysroot/usr
-Type=${usrfstype}
-Options=${usrflags}
-EOF
-
-requires_dir="${UNIT_DIR}/initrd-root-fs.target.requires"
-mkdir -p "${requires_dir}"
-ln -sf "../sysroot-usr.mount" "${requires_dir}/sysroot-usr.mount"
diff --git a/dracut/51verity-generator/module-setup.sh b/dracut/51verity-generator/module-setup.sh
deleted file mode 100755
index db1f9d1..0000000
--- a/dracut/51verity-generator/module-setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-depends() {
-    echo systemd
-}
-
-install() {
-    # Device units default to a finite JobRunningTimeout, which would cause
-    # dev-mapper-usr.device to fail if its dependencies took too long to
-    # start. This was causing boot failures when Ignition was asked to
-    # format multiple large filesystems.
-    inst_simple "$moddir/no-job-timeout.conf" \
-        "$systemdsystemunitdir/dev-mapper-usr.device.d/no-job-timeout.conf"
-}
diff --git a/dracut/51verity-generator/no-job-timeout.conf b/dracut/51verity-generator/no-job-timeout.conf
deleted file mode 100644
index 7f83431..0000000
--- a/dracut/51verity-generator/no-job-timeout.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-JobRunningTimeoutSec=infinity
diff --git a/dracut/52tmpfiles-early/module-setup.sh b/dracut/52tmpfiles-early/module-setup.sh
deleted file mode 100755
index dc527f2..0000000
--- a/dracut/52tmpfiles-early/module-setup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# called by dracut
-depends() {
-    echo systemd-networkd
-}
-
-# called by dracut
-install() {
-    inst_simple "$moddir/systemd-tmpfiles-setup-dev-early.service" \
-        "$systemdsystemunitdir/systemd-tmpfiles-setup-dev-early.service"
-}
diff --git a/dracut/52tmpfiles-early/systemd-tmpfiles-setup-dev-early.service b/dracut/52tmpfiles-early/systemd-tmpfiles-setup-dev-early.service
deleted file mode 100644
index 847ca43..0000000
--- a/dracut/52tmpfiles-early/systemd-tmpfiles-setup-dev-early.service
+++ /dev/null
@@ -1,24 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1-or-later
-#
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Create Static Device Nodes in /dev gracefully
-Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
-
-DefaultDependencies=no
-Before=sysinit.target local-fs-pre.target systemd-udevd.service
-Wants=local-fs-pre.target
-Conflicts=shutdown.target initrd-switch-root.target
-Before=shutdown.target initrd-switch-root.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=systemd-tmpfiles --prefix=/dev --create --boot
-SuccessExitStatus=DATAERR CANTCREAT
diff --git a/dracut/53disk-uuid/disk-uuid.service b/dracut/53disk-uuid/disk-uuid.service
index 019d7c3..9c9c8f5 100644
--- a/dracut/53disk-uuid/disk-uuid.service
+++ b/dracut/53disk-uuid/disk-uuid.service
@@ -10,7 +10,7 @@ After=systemd-udevd.service dev-disk-by\x2dpartlabel-USR\x2dA.device
 
 # Run before services that use device nodes, preventing them from racing
 # with udev activity generated by sgdisk
-Before=ignition-disks.service verity-setup.service
+Before=boot.mount ignition-disks.service
 
 [Service]
 Type=oneshot
diff --git a/dracut/53ignition/boot.mount b/dracut/53ignition/boot.mount
new file mode 100644
index 0000000..61a3848
--- /dev/null
+++ b/dracut/53ignition/boot.mount
@@ -0,0 +1,8 @@
+[Unit]
+Description=Boot partition
+DefaultDependencies=no
+
+[Mount]
+What=/dev/disk/by-label/EFI-SYSTEM
+Where=/boot
+Type=vfat
diff --git a/dracut/53ignition/ignition-quench.service b/dracut/53ignition/ignition-quench.service
index 6460917..ae04834 100644
--- a/dracut/53ignition/ignition-quench.service
+++ b/dracut/53ignition/ignition-quench.service
@@ -9,11 +9,10 @@ After=ignition-disks.service
 Requires=ignition-files.service
 After=ignition-files.service
 
-Requires=sysroot-boot.service
-After=sysroot-boot.service
+RequiresMountsFor=/boot
 
 [Service]
 Type=oneshot
 # We will only run if GRUB detected this file. Fail if we are unable to
 # remove it, rather than risking rerunning Ignition at next boot.
-ExecStart=/bin/sh -c 'if [ ! -e /sysroot/boot/flatcar/first_boot ] && [ ! -e /sysroot/boot/coreos/first_boot ]; then echo "error: /sysroot/boot/(flatcar|coreos)/first_boot not found"; exit 1; else rm -f /sysroot/boot/flatcar/first_boot /sysroot/boot/coreos/first_boot; fi'
+ExecStart=/bin/sh -c 'if [ ! -e /boot/flatcar/first_boot ] && [ ! -e /boot/coreos/first_boot ]; then echo "error: /boot/(flatcar|coreos)/first_boot not found"; exit 1; else rm -f /boot/flatcar/first_boot /boot/coreos/first_boot; fi'
diff --git a/dracut/53ignition/ignition-remount-sysroot.service b/dracut/53ignition/ignition-remount-sysroot.service
index 47759ac..75280dd 100644
--- a/dracut/53ignition/ignition-remount-sysroot.service
+++ b/dracut/53ignition/ignition-remount-sysroot.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Remount /sysroot read-write for Ignition
-Documentation=https://github.com/coreos/ignition
+Documentation=https://coreos.github.io/ignition/
 ConditionPathExists=/etc/initrd-release
 # Some Linux Distributions don't pass a rw option on the kernel
 # commandline and thus mount the root filesystem ro by default. In
diff --git a/dracut/53ignition/module-setup.sh b/dracut/53ignition/module-setup.sh
index 61f818a..10dab7f 100755
--- a/dracut/53ignition/module-setup.sh
+++ b/dracut/53ignition/module-setup.sh
@@ -84,10 +84,6 @@ install() {
     inst_simple "$moddir/ignition-luks.conf" \
         "/etc/security/pwquality.conf.d/ignition-luks.conf"
 
-    # Flatcar: add retry-umount
-    inst_script "$moddir/retry-umount.sh" \
-        "/usr/sbin/retry-umount"
-
     # Ignition calls is-live-image.
     inst_script "$moddir/is-live-image.sh" \
         /bin/is-live-image
@@ -101,13 +97,13 @@ install() {
             "$systemdsystemunitdir/ignition-$x.target"
     done
 
-    # Flatcar: add ignition-quench.service, sysroot-boot.service,
+    # Flatcar: add ignition-quench.service, boot.mount,
     # flatcar-afterburn-network.service, flatcar-static-network.service,
     # flatcar-metadata-hostname.service, flatcar-openstack-hostname.service
     inst_simple "$moddir/ignition-quench.service" \
         "$systemdsystemunitdir/ignition-quench.service"
-    inst_simple "$moddir/sysroot-boot.service" \
-        "$systemdsystemunitdir/sysroot-boot.service"
+    inst_simple "$moddir/boot.mount" \
+        "$systemdsystemunitdir/boot.mount"
     inst_simple "$moddir/flatcar-afterburn-network.service" \
         "$systemdsystemunitdir/flatcar-afterburn-network.service"
     inst_simple "$moddir/flatcar-static-network.service" \
diff --git a/dracut/53ignition/retry-umount.sh b/dracut/53ignition/retry-umount.sh
deleted file mode 100755
index 4a62b33..0000000
--- a/dracut/53ignition/retry-umount.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Unmount $1, retrying a few times.
-
-set -e
-
-mp="$1"
-if [ -z "$mp" ] ; then
-    echo "Usage: $0 <mountpoint>"
-    exit 1
-fi
-
-if ! mountpoint -q "$mp"; then
-    exit 0
-fi
-
-tries=5
-while true; do
-    umount "$mp" ||:
-    # Apparently umount may return failure when it actually succeeded
-    if ! mountpoint -q "$mp"; then
-        exit 0
-    fi
-
-    tries=$(( $tries - 1 ))
-    if [[ $tries = 0 ]]; then
-        echo "Giving up." >&2
-        exit 1
-    fi
-
-    echo "Couldn't unmount $mp; retrying..." >&2
-    sleep 1
-done
diff --git a/dracut/53ignition/sysroot-boot.service b/dracut/53ignition/sysroot-boot.service
deleted file mode 100644
index 9d8fb6c..0000000
--- a/dracut/53ignition/sysroot-boot.service
+++ /dev/null
@@ -1,25 +0,0 @@
-[Unit]
-Description=/sysroot/boot
-DefaultDependencies=false
-
-BindsTo=dev-disk-by\x2dlabel-EFI\x2dSYSTEM.device
-After=dev-disk-by\x2dlabel-EFI\x2dSYSTEM.device
-
-RequiresMountsFor=/sysroot
-
-# Creates mountpoint
-Requires=initrd-setup-root.service
-After=initrd-setup-root.service
-
-# This is to make sure that /sysroot/boot is unmounted before we start
-# switching root in initrd-switch-root.target.
-Before=initrd-switch-root.target
-
-Conflicts=dracut-emergency.service emergency.service emergency.target
-Conflicts=initrd-switch-root.target umount.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/usr/bin/mount /dev/disk/by-label/EFI-SYSTEM /sysroot/boot
-ExecStop=/usr/sbin/retry-umount /sysroot/boot
diff --git a/test b/test
deleted file mode 100755
index 3bbb841..0000000
--- a/test
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-./dracut/10usr-generator/testsuite.sh