diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-boot-edit.service b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-boot-edit.service
index bc2d9ec9ea..ad9a66b34e 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-boot-edit.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-boot-edit.service
@@ -10,8 +10,13 @@ OnFailureJobMode=isolate
 
 # Since we are mounting /boot, require the device first. This isn't strictly
 # necessary since we run late, but on principle let's make clear the dependency.
-Requires=dev-disk-by\x2dlabel-boot.device
-After=dev-disk-by\x2dlabel-boot.device
+
+# Requires=dev-disk-by\x2dlabel-boot.device
+# After=dev-disk-by\x2dlabel-boot.device
+
+After=boot-part-discovered.target
+ConditionFileNotEmpty=/run/coreos/boot-partition-status
+
 # Start after Ignition has finished
 After=ignition-files.service
 # As above, this isn't strictly necessary, but on principle.
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-diskful-generator b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-diskful-generator
index b869866431..1d741853c3 100755
--- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-diskful-generator
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-diskful-generator
@@ -109,8 +109,8 @@ mkdir -p "${UNIT_DIR}/coreos-ignition-setup-user.service.d"
 mkdir -p "${UNIT_DIR}/coreos-copy-firstboot-network.service.d"
 cat > "${UNIT_DIR}/coreos-ignition-setup-user.service.d/diskful.conf" <<EOF
 [Unit]
-Requires=dev-disk-by\x2dlabel-boot.device
-After=dev-disk-by\x2dlabel-boot.device
+After=boot-part-discovered.target
+ConditionFileNotEmpty=/run/coreos/boot-partition-status
 EOF
 cp "${UNIT_DIR}/coreos-ignition-setup-user.service.d/diskful.conf" \
     "${UNIT_DIR}/coreos-copy-firstboot-network.service.d/diskful.conf"
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-gpt-setup.service b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-gpt-setup.service
index 629bb60f49..2c017a7657 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-gpt-setup.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-gpt-setup.service
@@ -9,8 +9,11 @@ Before=ignition-diskful.target
 # iSCSI, but we still run.
 After=coreos-copy-firstboot-network.service
 
-Requires=dev-disk-by\x2dlabel-boot.device
-After=dev-disk-by\x2dlabel-boot.device
+# Requires=dev-disk-by\x2dlabel-boot.device
+# After=dev-disk-by\x2dlabel-boot.device
+
+After=boot-part-discovered.target
+ConditionFileNotEmpty=/run/coreos/boot-partition-status
 
 # And since the boot device may be on multipath; optionally wait for it to
 # appear via the dynamic target.
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-ignition-unique-boot.service b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-ignition-unique-boot.service
index 81f099b6fb..f237bb622c 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-ignition-unique-boot.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-ignition-unique-boot.service
@@ -5,8 +5,12 @@ OnFailure=emergency.target
 OnFailureJobMode=isolate
 
 # That's a weak dependency, so service won't fail if boot dissaperears
-Wants=dev-disk-by\x2dlabel-boot.device
-After=dev-disk-by\x2dlabel-boot.device
+# Wants=dev-disk-by\x2dlabel-boot.device
+# After=dev-disk-by\x2dlabel-boot.device
+
+# TODO(Johan-Liebert1): We won't reach diskful.target
+After=boot-part-discovered.target
+ConditionFileNotEmpty=/run/coreos/boot-partition-status
 
 # Start after ignition has finished with disks but before mounting them
 After=ignition-disks.service
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-unique-boot.service b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-unique-boot.service
index e02d72e588..23c43c21f6 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-unique-boot.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-unique-boot.service
@@ -8,8 +8,12 @@ After=systemd-udevd.service
 # And since the boot device may be on multipath; optionally wait for it to
 # appear via the dynamic target.
 After=coreos-multipath-wait.target
-Requires=dev-disk-by\x2dlabel-boot.device
-After=dev-disk-by\x2dlabel-boot.device
+# Requires=dev-disk-by\x2dlabel-boot.device
+# After=dev-disk-by\x2dlabel-boot.device
+
+After=boot-part-discovered.target
+ConditionFileNotEmpty=/run/coreos/boot-partition-status
+
 # Run before services that modify/use `boot` partition
 Before=coreos-gpt-setup.service coreos-boot-edit.service
 
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/live-generator b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/live-generator
index c10fd1694b..571278d75d 100755
--- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/live-generator
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/live-generator
@@ -34,13 +34,12 @@ add_requires sysroot-var.mount initrd-root-fs.target
 # https://github.com/coreos/fedora-coreos-tracker/issues/1423
 add_requires coreos-enable-network.service initrd-root-fs.target
 
-mkdir -p "${UNIT_DIR}/ostree-prepare-root.service.d"
-cat > "${UNIT_DIR}/ostree-prepare-root.service.d/10-live.conf" <<EOF
-# With live PXE there's no ostree= argument on the kernel command line, so
-# we need to find the tree path and pass it to ostree-prepare-root.  But
-# ostree-prepare-root only knows how to read the path from
-# /proc/cmdline, so we need to synthesize the proper karg and bind-mount
-# it over /proc/cmdline.
+mkdir -p "${UNIT_DIR}/coreos-root-setup.service.d"
+cat > "${UNIT_DIR}/coreos-root-setup.service.d/10-live.conf" <<EOF
+# With live PXE there's no ostree=/composefs= argument on the kernel command line, so
+# we need to find the tree path and pass it to (ostree|bootc)-prepare-root.  But
+# they only knows how to read the path from /proc/cmdline, so we need to synthesize
+# the proper karg and bind-mount it over /proc/cmdline.
 # https://github.com/ostreedev/ostree/issues/1920
 
 [Unit]
@@ -210,8 +209,8 @@ RequiresMountsFor=/run/ephemeral
 ConditionPathExists=/usr/lib/initrd-release
 ConditionPathExists=!/run/ephemeral/var
 # We want to run after ostree is set up
-After=ostree-prepare-root.service
-Requires=ostree-prepare-root.service
+After=coreos-root-setup.service
+Requires=coreos-root-setup.service
 
 [Service]
 Type=oneshot
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/.gitignore b/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/.gitignore
new file mode 100644
index 0000000000..ce517be438
--- /dev/null
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/.gitignore
@@ -0,0 +1 @@
+bootc-initramfs-setup
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/coreos-root-setup.service b/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/coreos-root-setup.service
new file mode 100644
index 0000000000..44da8fb243
--- /dev/null
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/coreos-root-setup.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=CoreOS Root Setup
+Documentation=man:bootc(1)
+DefaultDependencies=no
+ConditionKernelCommandLine=|composefs
+ConditionKernelCommandLine=|ostree
+ConditionPathExists=/etc/initrd-release
+After=sysroot.mount
+Requires=sysroot.mount
+Before=initrd-root-fs.target
+
+OnFailure=emergency.target
+OnFailureJobMode=isolate
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/coreos-root-setup
+StandardInput=null
+StandardOutput=journal
+StandardError=journal+console
+RemainAfterExit=yes
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/coreos-root-setup.sh b/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/coreos-root-setup.sh
new file mode 100755
index 0000000000..34d54f6278
--- /dev/null
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/coreos-root-setup.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+have_karg() {
+    local arg="$1"
+    IFS=" " read -r -a cmdline <<< "$(</proc/cmdline)"
+    local i
+    for i in "${cmdline[@]}"; do
+        if [[ "$i" =~ "$arg=" ]]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+if have_karg composefs; then
+    /usr/lib/bootc/initramfs-setup setup-root
+elif have_karg ostree; then
+    /usr/lib/ostree/ostree-prepare-root /sysroot
+else
+    echo "Neither ostree nor composefs found in cmdline"
+    exit 1
+fi
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/module-setup.sh b/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/module-setup.sh
new file mode 100755
index 0000000000..cf4ebb5a87
--- /dev/null
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/37coreos-root-setup/module-setup.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+check() {
+    return 0
+}
+
+depends() {
+    return 0
+}
+
+install() {
+    local service=coreos-root-setup.service
+
+    inst_script "$moddir/coreos-root-setup.sh" /usr/libexec/coreos-root-setup
+
+    inst "$moddir/bootc-initramfs-setup" /usr/lib/bootc/initramfs-setup
+
+    inst_simple "$moddir/${service}" "${systemdsystemunitdir}/${service}"
+    mkdir -p "${initdir}${systemdsystemconfdir}/initrd-root-fs.target.wants"
+    ln_r "${systemdsystemunitdir}/${service}" \
+        "${systemdsystemconfdir}/initrd-root-fs.target.wants/${service}"
+}
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/boot-part-discovered.target b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/boot-part-discovered.target
new file mode 100644
index 0000000000..4a921a9831
--- /dev/null
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/boot-part-discovered.target
@@ -0,0 +1,7 @@
+[Unit]
+Description=Boot Partition Discovery Complete
+Documentation=man:systemd.special(7)
+ConditionPathExists=/etc/initrd-release
+# After=local-fs-pre.target
+# Before=local-fs.target
+Requires=boot-part-discovery.service
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/boot-part-discovery.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/boot-part-discovery.service
new file mode 100644
index 0000000000..ad2b742f14
--- /dev/null
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/boot-part-discovery.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Discover Boot Partition Availability
+ConditionPathExists=/etc/initrd-release
+Before=boot-part-discovered.target
+After=local-fs-pre.target
+Before=local-fs.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/boot-part-discovery.sh
+RemainAfterExit=yes
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/boot-part-discovery.sh b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/boot-part-discovery.sh
new file mode 100755
index 0000000000..63f23d7652
--- /dev/null
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/boot-part-discovery.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+XBOOTLDR_UUID="BC13C2FF-59E6-4262-A352-B275FD6F7172"
+BOOT_STATUS_DIR="/run/coreos"
+BOOT_STATUS_FILE="${BOOT_STATUS_DIR}/boot-partition-status"
+
+boot_part_exists() {
+    LSBLK_JSON="$(lsblk -o name,parttype,uuid,mountpoint,parttypename,label --json)"
+
+    while read -r part; do
+        parttype="$(jq -r '.parttype // empty' <<<"$part" | tr '[:lower:]' '[:upper:]')"
+        name="$(jq -r '.name' <<<"$part")"
+
+        [[ -n "$parttype" ]] || echo "Partition '$name' has no parttype"
+
+        if [[ "$parttype" == "$XBOOTLDR_UUID" ]]; then
+            return 0
+        fi
+    done < <(echo "$LSBLK_JSON" | jq -c '.blockdevices[].children[]?')
+
+    return 1
+}
+
+# Only run when executed directly, not when sourced
+if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
+    if boot_part_exists; then
+        mkdir -p "$BOOT_STATUS_DIR"
+        echo "available" > "$BOOT_STATUS_FILE"
+    else
+        echo "Boot partition not found"
+    fi
+fi
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-check-rootfs-size.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-check-rootfs-size.service
index 340b4d4251..9d29bdc5c1 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-check-rootfs-size.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-check-rootfs-size.service
@@ -2,11 +2,12 @@
 Description=Ignition OSTree: Check Root Filesystem Size
 Documentation=https://docs.fedoraproject.org/en-US/fedora-coreos/storage/
 DefaultDependencies=false
-ConditionKernelCommandLine=ostree
+ConditionKernelCommandLine=|ostree
+ConditionKernelCommandLine=|composefs
 ConditionPathExists=!/run/ostree-live
 After=ignition-ostree-growfs.service
-After=ostree-prepare-root.service
-Requires=ostree-prepare-root.service
+After=coreos-root-setup.service
+Requires=coreos-root-setup.service
 # Allow Ignition config to blank out the warning
 Before=ignition-files.service
 
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-growfs.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-growfs.service
index 3674431ff8..1ea3084b9f 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-growfs.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-growfs.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Ignition OSTree: Grow Root Filesystem
 DefaultDependencies=false
-ConditionKernelCommandLine=ostree
+ConditionKernelCommandLine=|ostree
+ConditionKernelCommandLine=|composefs
 ConditionPathExists=!/run/ostree-live
 Before=initrd-root-fs.target
 Before=sysroot.mount
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-var.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-var.service
index 09d6c15ab3..1cb3d39d14 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-var.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-var.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Mount OSTree /var
 DefaultDependencies=false
+# We do not need this for composefs
 ConditionKernelCommandLine=ostree
 ConditionPathExists=!/run/ostree-live
 
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-autosave-xfs.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-autosave-xfs.service
index e955c4a69a..8a5272b752 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-autosave-xfs.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-autosave-xfs.service
@@ -13,7 +13,8 @@ Before=ignition-ostree-transposefs-restore.service
 OnFailure=emergency.target
 OnFailureJobMode=isolate
 
-ConditionKernelCommandLine=ostree
+ConditionKernelCommandLine=|ostree
+ConditionKernelCommandLine=|composefs
 # only run if ignition-ostree-growfs ran since that's when pathological cases occur
 ConditionPathExists=/run/ignition-ostree-growfs.stamp
 
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-detect.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-detect.service
index 389dc9eedf..cde1efd379 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-detect.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-detect.service
@@ -5,7 +5,8 @@ After=ignition-fetch.service
 Before=ignition-disks.service
 Before=initrd-root-fs.target
 Before=sysroot.mount
-ConditionKernelCommandLine=ostree
+ConditionKernelCommandLine=|ostree
+ConditionKernelCommandLine=|composefs
 OnFailure=emergency.target
 OnFailureJobMode=isolate
 
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-restore.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-restore.service
index eef3c064c7..349155ce0d 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-restore.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-restore.service
@@ -12,7 +12,8 @@ Before=sysroot.mount
 OnFailure=emergency.target
 OnFailureJobMode=isolate
 
-ConditionKernelCommandLine=ostree
+ConditionKernelCommandLine=|ostree
+ConditionKernelCommandLine=|composefs
 ConditionPathIsDirectory=/run/ignition-ostree-transposefs
 
 [Service]
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-save.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-save.service
index bc03499ecb..02b8d5478a 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-save.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-save.service
@@ -3,7 +3,8 @@ Description=Ignition OSTree: Save Partitions
 DefaultDependencies=false
 After=ignition-ostree-transposefs-detect.service
 Before=ignition-disks.service
-ConditionKernelCommandLine=ostree
+ConditionKernelCommandLine=|ostree
+ConditionKernelCommandLine=|composefs
 ConditionPathIsDirectory=/run/ignition-ostree-transposefs
 # Any services looking at mounts need to order after this
 # because it causes device re-probing.
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs.sh b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs.sh
index 7bec45c936..e21c7bca5a 100755
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs.sh
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs.sh
@@ -306,9 +306,32 @@ case "${1:-}" in
         if [ -d "${saved_root}" ]; then
             echo "Restoring rootfs from RAM..."
             mount_and_restore_filesystem_by_label root /sysroot "${saved_root}"
+
             chcon -v --reference "${saved_root}" /sysroot  # the root of the fs itself
-            chattr +i $(ls -d /sysroot/ostree/deploy/*/deploy/*/)
+
+            cfs_digest=$(karg composefs)
+
+            if [[ "$cfs_digest" == "" ]]; then
+                chattr +i $(ls -d /sysroot/ostree/deploy/*/deploy/*/)
+            elif [[ ${cfs_digest:0:1} != "?" ]]; then
+                echo "Re-enabling fsverity on composefs repo..."
+                # tmpfs has no fsverity, so we need to reenable fsverity
+                hash_alg=""
+
+                if [[ $cfs_digest =~ ^[0-9a-fA-F]{64}$ ]]; then
+                    hash_alg="sha256"
+                elif [[ $cfs_digest =~ ^[0-9a-fA-F]{128}$ ]]; then
+                    hash_alg="sha512"
+                else
+                    echo "Bad verity in cmdline '$cfs_digest'"
+                    exit 1
+                fi
+
+                echo "Enabling fs-verity again..."
+                find /sysroot/composefs/objects -type f -exec fsverity enable {} --hash-alg $hash_alg \;
+            fi
         fi
+
         if [ -d "${saved_boot}" ]; then
             echo "Restoring bootfs from RAM..."
             mount_and_restore_filesystem_by_label boot /sysroot/boot "${saved_boot}"
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-uuid-boot.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-uuid-boot.service
index 85448c2a67..7ce368ad80 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-uuid-boot.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-uuid-boot.service
@@ -13,9 +13,14 @@ Before=ignition-kargs.service
 # If we're going to reprovision the bootfs, then there's no need to restamp
 ConditionKernelCommandLine=!bootfs.roothash
 
+# TODO(Johan-Lieber1): This
 Before=systemd-fsck@dev-disk-by\x2dlabel-boot.service
-Requires=dev-disk-by\x2dlabel-boot.device
-After=dev-disk-by\x2dlabel-boot.device
+# Requires=dev-disk-by\x2dlabel-boot.device
+# After=dev-disk-by\x2dlabel-boot.device
+
+# Make sure boot partition actually exists
+After=boot-part-discovered.target
+ConditionFileNotEmpty=/run/coreos/boot-partition-status
 
 [Service]
 Type=oneshot
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-uuid-root.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-uuid-root.service
index 80ecf9d42a..0198a81961 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-uuid-root.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-uuid-root.service
@@ -2,7 +2,8 @@
 Description=Ignition OSTree: Regenerate Filesystem UUID (root)
 # These conditions match those generated in coreos-diskful-generator
 DefaultDependencies=false
-ConditionKernelCommandLine=ostree
+ConditionKernelCommandLine=|ostree
+ConditionKernelCommandLine=|composefs
 ConditionPathExists=!/run/ostree-live
 Before=sysroot.mount initrd-root-fs.target
 After=ignition-disks.service
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh
index ba22090993..7cbcbce1a8 100755
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh
@@ -77,7 +77,8 @@ install() {
         rm        \
         sed       \
         sfdisk    \
-        find
+        find      \
+        fsverity
 
     # In some cases we had to vendor gdisk in Ignition.
     # If this is the case here use that one.
@@ -121,5 +122,11 @@ install() {
     inst_script "$moddir/ignition-ostree-mount-state-overlays.sh" \
         /usr/libexec/ignition-ostree-mount-state-overlays
 
+    inst_simple "$moddir/boot-part-discovery.target" "$systemdsystemunitdir/boot-part-discovery.target"
+
+    install_ignition_unit boot-part-discovery.service
+    inst_script "$moddir/boot-part-discovery.sh" \
+        /usr/libexec/boot-part-discovery.sh
+
     inst_script "$moddir/coreos-relabel" /usr/bin/coreos-relabel
 }
diff --git a/overlay.d/05core/usr/lib/systemd/system-generators/coreos-boot-mount-generator b/overlay.d/05core/usr/lib/systemd/system-generators/coreos-boot-mount-generator
index 7955f903ac..87fc29482f 100755
--- a/overlay.d/05core/usr/lib/systemd/system-generators/coreos-boot-mount-generator
+++ b/overlay.d/05core/usr/lib/systemd/system-generators/coreos-boot-mount-generator
@@ -3,6 +3,7 @@ export PATH="/usr/bin:/usr/sbin:${PATH}"
 set -euo pipefail
 
 . /usr/lib/coreos/generator-lib.sh
+. /usr/libexec/boot-part-discovery.sh
 
 # Turn out if you boot with "root=..." $UNIT_DIR is not writable.
 [ -w "${UNIT_DIR}" ] || {
@@ -31,6 +32,16 @@ if [ "${rootfstype}" = "virtiofs" ]; then
     exit 0
 fi
 
+# Do not create dynamic mount service for /boot if there
+# is no /boot partition
+#
+# Using just After=boot-part-discovery.target won't work
+# as we have What=/dev/disk/by-label/boot in the Mount section
+# which prompts systemd to wait for udev
+if ! boot_part_exists; then
+    exit 0
+fi
+
 add_wants() {
     local name="$1"; shift
     local wants_dir="${UNIT_DIR}/local-fs.target.wants"
diff --git a/overlay.d/05core/usr/lib/systemd/system/coreos-ignition-firstboot-complete.service b/overlay.d/05core/usr/lib/systemd/system/coreos-ignition-firstboot-complete.service
index be0456fa22..7f615b39ed 100644
--- a/overlay.d/05core/usr/lib/systemd/system/coreos-ignition-firstboot-complete.service
+++ b/overlay.d/05core/usr/lib/systemd/system/coreos-ignition-firstboot-complete.service
@@ -6,8 +6,6 @@ ConditionPathExists=!/run/ostree-live
 # This condition is required for cases where a soft-reboot is issued on the
 # firstboot. Soft reboot do not change the kernel or its command-line arguments,
 # which would cause this service to fail after the soft-reboot completes.
-ConditionPathExists=/boot/ignition.firstboot
-RequiresMountsFor=/boot
 
 [Service]
 Type=oneshot
diff --git "a/overlay.d/05core/usr/lib/systemd/system/systemd-fsck@dev-disk-by\\x2dlabel-boot.service.d/override.conf" "b/overlay.d/05core/usr/lib/systemd/system/systemd-fsck@dev-disk-by\\x2dlabel-boot.service.d/override.conf"
new file mode 100644
index 0000000000..b36c5fb9dd
--- /dev/null
+++ "b/overlay.d/05core/usr/lib/systemd/system/systemd-fsck@dev-disk-by\\x2dlabel-boot.service.d/override.conf"
@@ -0,0 +1,3 @@
+[Unit]
+After=boot-part-discovered.target
+ConditionFileNotEmpty=/run/coreos/boot-partition-status
diff --git a/overlay.d/05core/usr/libexec/coreos-ignition-firstboot-complete b/overlay.d/05core/usr/libexec/coreos-ignition-firstboot-complete
index e1963f08d8..40424c67b8 100755
--- a/overlay.d/05core/usr/libexec/coreos-ignition-firstboot-complete
+++ b/overlay.d/05core/usr/libexec/coreos-ignition-firstboot-complete
@@ -1,17 +1,127 @@
 #!/bin/bash
 set -euo pipefail
 
-mount -o remount,rw /boot
+ESP_MOUNT=/var/tmp/efi
 
-# We're done provisioning. Remove the whole /boot/ignition directory if present,
-# which may include a baked Ignition config. See
-# https://github.com/coreos/fedora-coreos-tracker/issues/889.
-rm -rf /boot/ignition
+BOOTC_STATUS="$(bootc status --json)"
 
-# Regarding the lack of `-f` for rm ; we should have only run if GRUB detected
-# this file. Fail if we are unable to remove it, rather than risking rerunning
-# Ignition at next boot.
-rm /boot/ignition.firstboot
+IS_COMPOSEFS=false
+BOOTLOADER=""
+BOOT_TYPE=""
+
+if [[ $(jq -r '.status.booted.composefs' <<< "$BOOTC_STATUS") != null ]]; then
+    IS_COMPOSEFS=true
+    BOOT_TYPE=$(jq -r '.status.booted.composefs.bootType' <<< "$BOOTC_STATUS" | tr '[:upper:]' '[:lower:]')
+    BOOTLOADER=$(jq -r '.status.booted.composefs.bootloader' <<< "$BOOTC_STATUS" | tr '[:upper:]' '[:lower:]')
+fi
+
+handle_ignition_grub() {
+    mount -o remount,rw /boot
+
+    # We're done provisioning. Remove the whole /boot/ignition directory if present,
+    # which may include a baked Ignition config. See
+    # https://github.com/coreos/fedora-coreos-tracker/issues/889.
+    rm -rf /boot/ignition
+
+    # Regarding the lack of `-f` for rm ; we should have only run if GRUB detected
+    # this file. Fail if we are unable to remove it, rather than risking rerunning
+    # Ignition at next boot.
+    rm /boot/ignition.firstboot
+}
+
+# Mounts ESP at /var/tmp/efi
+mount_esp() {
+    mkdir -p $ESP_MOUNT
+
+    local LSBLK_JSON
+    local ESP_DEV
+    LSBLK_JSON="$(lsblk -o path,parttype,name --json)"
+
+    while read -r part; do
+        parttype="$(jq -r '.parttype // empty' <<<"$part" | tr '[:lower:]' '[:upper:]')"
+        path="$(jq -r '.path // empty' <<<"$part")"
+
+        if [[ -z "$parttype" ]]; then
+            echo "Partition '$path' has no parttype"
+            continue
+        fi
+
+        if [[ "$parttype" == "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" ]]; then
+            ESP_DEV="$path"
+            break
+        fi
+    done < <(echo "$LSBLK_JSON" | jq -c '.blockdevices[].children[]?')
+
+    if [[ "$ESP_DEV" == "" ]]; then
+        echo "ESP not found"
+        exit 1
+    fi
+
+    mount "$ESP_DEV" $ESP_MOUNT
+}
+
+# Unounts ESP and deletes /var/tmp/efi
+unmount_esp() {
+    umount $ESP_MOUNT
+    rmdir $ESP_MOUNT
+}
+
+# simply remove the UKI addon
+# TODO: Maybe this can be done in bootc
+handle_ignition_uki() {
+    mount_esp
+
+    local verity
+    verity=$(jq -r '.status.booted.composefs.verity' <<< "$BOOTC_STATUS")
+
+    rm -rf "/var/tmp/efi/EFI/Linux/bootc/bootc_composefs-${verity}.efi.extra.d/ignition.addon.efi"
+
+    unmount_esp
+}
+
+handle_ignition_composefs() {
+    # We have a few cases here
+    # 1. systemd-boot + BLS
+    # 2. systemd-boot + UKI
+    # 3. grub + BLS
+    # 4. grub + UKI
+    #
+    # Both the UKI cases are the same and we just need to
+    # remove the UKI addon
+    #
+    # systemd-boot BLS doesn't accept variables in the config files
+    # so we handle it differently
+    #
+    # grub BLS should be the same as ostree
+    if [[ $BOOTLOADER == "grub" && $BOOT_TYPE == "bls" ]]; then
+        handle_ignition_grub
+        return
+    fi
+
+    # UKI
+    if [[ $BOOT_TYPE == "uki" ]]; then
+        handle_ignition_uki
+        return
+    fi
+
+    # systemd-boot BLS
+    # TODO: Maybe better to put this in bootc
+    mount_esp
+
+    local verity
+    verity=$(jq -r '.status.booted.composefs.verity' <<< "$BOOTC_STATUS")
+
+    boot_entry=$(ls "$ESP_MOUNT/loader/entries")
+    sed -i 's;ignition.firstboot;;' "$ESP_MOUNT/loader/entries/$boot_entry"
+
+    unmount_esp
+}
+
+if $IS_COMPOSEFS; then
+    handle_ignition_composefs
+else
+    handle_ignition_grub
+fi
 
 # rdcore zipl checks for /boot/ignition.firstboot
 if [[ $(uname -m) = s390x ]]; then
diff --git a/tests/kola/composefs/enabled b/tests/kola/composefs/enabled
index ce42cee0cc..ce014d73f2 100755
--- a/tests/kola/composefs/enabled
+++ b/tests/kola/composefs/enabled
@@ -19,6 +19,6 @@ if [ "${rootfs}" != "overlay" ]; then
     fatal "Error: Expected overlay on /, found: ${rootfs}"
 fi
 
-journalctl -u ostree-prepare-root.service | grep -q "composefs: mounted successfully"
+journalctl -u coreos-root-setup.service | grep -q "composefs: mounted successfully"
 
 ok "composefs is on"